Fabian Klemp
|
acd904d443
|
Removing useless stuff.
|
2014-11-17 18:40:54 +01:00 |
|
sfroitzheim
|
a8e255e94d
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-11-17 18:31:48 +01:00 |
|
sfroitzheim
|
4b6d6f1a6d
|
Changing marble model.
|
2014-11-17 18:31:22 +01:00 |
|
Fabian Klemp
|
173a188467
|
Changing sand texture to a seamless sand texture.
|
2014-11-17 18:18:57 +01:00 |
|
Fabian Klemp
|
5966de6701
|
Removing update of the light at the center of the marble.
|
2014-11-17 18:18:15 +01:00 |
|
Fabian Klemp
|
e34e1ad04d
|
Removing light at the center of the marble.
|
2014-11-17 18:16:27 +01:00 |
|
Fabian Klemp
|
c87d62cae9
|
Added directional lighting.
|
2014-11-17 17:51:15 +01:00 |
|
Fabian Klemp
|
e3c8be4d0e
|
Added emtpy constructor.
|
2014-11-17 17:50:06 +01:00 |
|
Fabian Klemp
|
41ae3908ab
|
Removed rotation paramter from Light constructor as it is not used.
|
2014-11-17 16:54:17 +01:00 |
|
Fabian Klemp
|
048ab1ceaf
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-11-17 16:31:04 +01:00 |
|
Fabian Klemp
|
64f030765f
|
Changing a few spawning values.
|
2014-11-17 16:31:01 +01:00 |
|
Jasper
|
600b4edc60
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-11-17 16:29:10 +01:00 |
|
Jasper
|
6c32a0c35a
|
getting the sizes juuuuuuuust right
|
2014-11-17 16:28:31 +01:00 |
|
Fabian Klemp
|
f1a2aeb7ab
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-11-17 16:16:13 +01:00 |
|
Fabian Klemp
|
f87af894c1
|
Added alpha shading.
|
2014-11-17 16:15:56 +01:00 |
|
Jasper
|
362b4f0230
|
ich bin dumb
|
2014-11-17 16:14:01 +01:00 |
|
Jasper
|
678c6cf85f
|
merged level.cc
|
2014-11-17 16:11:39 +01:00 |
|
Jasper
|
1e7c7989de
|
further improving physics and interaction
|
2014-11-17 16:07:40 +01:00 |
|
sfroitzheim
|
d968277137
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-11-17 15:44:31 +01:00 |
|
Fabian Klemp
|
682a25a7ee
|
Adding column and block ruins.
|
2014-11-17 15:29:38 +01:00 |
|
Fabian Klemp
|
ba5df84895
|
Added light in the middle of the marble.
|
2014-11-17 15:19:36 +01:00 |
|
Fabian Klemp
|
976567fd97
|
Fixed normals.
|
2014-11-17 15:19:19 +01:00 |
|
Fabian Klemp
|
59c1798ea0
|
Removed middle Ring.
|
2014-11-17 15:04:59 +01:00 |
|
Fabian Klemp
|
8d082e203b
|
Basic Marble Model with Textures added.
|
2014-11-17 14:38:35 +01:00 |
|
Fabian Klemp
|
1b876b4c35
|
Adding torch.
|
2014-11-17 14:23:23 +01:00 |
|
Jasper
|
5bb35582a2
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-11-17 13:36:35 +01:00 |
|
Steffen Fündgens
|
fb04712bfb
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-11-17 13:36:09 +01:00 |
|
Steffen Fündgens
|
9024d29d12
|
Reorganizing file structure.
|
2014-11-17 13:36:05 +01:00 |
|
Fabian Klemp
|
0a0dcd90f8
|
Merge branch 'master' of github.com:Faerbit/swp
Conflicts:
camera.cc
graphics.cc
|
2014-11-17 13:31:01 +01:00 |
|
Fabian Klemp
|
a19039426c
|
Camera now returns a viewing vector.
|
2014-11-17 13:29:41 +01:00 |
|
Fabian Klemp
|
38b6d33aec
|
Changing getCamera to pointers.
|
2014-11-17 13:28:42 +01:00 |
|
Jasper
|
288d509316
|
Changed rollForward to accept vector going from camera to bball
|
2014-11-17 13:21:27 +01:00 |
|
Jasper
|
2558311844
|
fixed conflict
|
2014-11-17 13:17:28 +01:00 |
|
Jasper
|
24a812ed07
|
spelling fix
|
2014-11-17 13:14:48 +01:00 |
|
Jasper
|
e579fe1d75
|
added wasd recognition, prepared roll forward to accept vec3 pos instead of mat3 rot
|
2014-11-17 13:12:51 +01:00 |
|
Jasper
|
cac4672c7c
|
Implimented a basic version of Physics into level with a ball colliding with a static plain.
|
2014-11-17 12:57:16 +01:00 |
|
Steffen Fündgens
|
c0a730f58a
|
Merge branch 'terrain-test'
Conflicts:
level.cc
terrain.cc
|
2014-11-17 12:56:10 +01:00 |
|
Steffen Fündgens
|
caccff5c33
|
Removing editor backup files.
|
2014-11-17 12:53:38 +01:00 |
|
Steffen Fündgens
|
64fbceeef8
|
Rewriting terrain loading with lodepng and fixing a few bugs.
|
2014-11-17 12:51:30 +01:00 |
|
Steffen Fündgens
|
b27e7062f3
|
Changing a few position parameters.
|
2014-11-17 12:50:05 +01:00 |
|
Steffen Fündgens
|
51359d065f
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-11-17 11:25:49 +01:00 |
|
Steffen Fündgens
|
e2e31e11e4
|
Merging stuff.
|
2014-11-17 11:23:47 +01:00 |
|
Faerbit
|
3ddcb72d5a
|
Reenabling resizeCallback.
|
2014-11-15 15:19:48 +01:00 |
|
Faerbit
|
450fb12e1d
|
Mapping scroll wheel to camera distance.
|
2014-11-15 14:57:01 +01:00 |
|
Faerbit
|
4686f94082
|
Changing code to work with getCamera using pointers now.
|
2014-11-15 14:55:11 +01:00 |
|
Faerbit
|
3485299717
|
Changing getCamera to pointers.
|
2014-11-15 14:54:44 +01:00 |
|
Faerbit
|
1fb288b220
|
Setting max Camera distance to 30.
|
2014-11-15 14:54:01 +01:00 |
|
Faerbit
|
75c88681ee
|
Adding updateDistance to camera.
|
2014-11-15 14:26:17 +01:00 |
|
Faerbit
|
53ca8caf56
|
Adding simple test sphere.
|
2014-11-15 14:19:34 +01:00 |
|
Faerbit
|
5ca77ae3cc
|
Constructed a simple quad for debugging terrain generation.
|
2014-11-15 13:46:20 +01:00 |
|