Fabian Klemp
|
5533d4e4ba
|
Removing update of the light at the center of the marble.
|
2014-11-17 18:18:15 +01:00 |
|
Fabian Klemp
|
9fc515ec24
|
Removing light at the center of the marble.
|
2014-11-17 18:16:27 +01:00 |
|
Fabian Klemp
|
ca3928e232
|
Added directional lighting.
|
2014-11-17 17:51:15 +01:00 |
|
Fabian Klemp
|
39b1ee85b0
|
Added emtpy constructor.
|
2014-11-17 17:50:06 +01:00 |
|
Fabian Klemp
|
94b12ae614
|
Removed rotation paramter from Light constructor as it is not used.
|
2014-11-17 16:54:17 +01:00 |
|
Fabian Klemp
|
6f89c406f1
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-11-17 16:31:04 +01:00 |
|
Fabian Klemp
|
d11a2820d6
|
Changing a few spawning values.
|
2014-11-17 16:31:01 +01:00 |
|
Jasper
|
d4e38b7a41
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-11-17 16:29:10 +01:00 |
|
Jasper
|
dbce8c229f
|
getting the sizes juuuuuuuust right
|
2014-11-17 16:28:31 +01:00 |
|
Fabian Klemp
|
c22ae2c244
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-11-17 16:16:13 +01:00 |
|
Fabian Klemp
|
3086f98ecd
|
Added alpha shading.
|
2014-11-17 16:15:56 +01:00 |
|
Jasper
|
bcb594c4cf
|
ich bin dumb
|
2014-11-17 16:14:01 +01:00 |
|
Jasper
|
429223a08e
|
merged level.cc
|
2014-11-17 16:11:39 +01:00 |
|
Jasper
|
abe9513aa3
|
further improving physics and interaction
|
2014-11-17 16:07:40 +01:00 |
|
sfroitzheim
|
8f64f75b67
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-11-17 15:44:31 +01:00 |
|
Fabian Klemp
|
29f24d6f05
|
Adding column and block ruins.
|
2014-11-17 15:29:38 +01:00 |
|
Fabian Klemp
|
f6b2bd776a
|
Added light in the middle of the marble.
|
2014-11-17 15:19:36 +01:00 |
|
Fabian Klemp
|
6f7486b3f8
|
Fixed normals.
|
2014-11-17 15:19:19 +01:00 |
|
Fabian Klemp
|
4dc7897f8c
|
Removed middle Ring.
|
2014-11-17 15:04:59 +01:00 |
|
Fabian Klemp
|
48691338ba
|
Basic Marble Model with Textures added.
|
2014-11-17 14:38:35 +01:00 |
|
Fabian Klemp
|
0b7f8e95d3
|
Adding torch.
|
2014-11-17 14:23:23 +01:00 |
|
Jasper
|
a77ed38625
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-11-17 13:36:35 +01:00 |
|
Steffen Fündgens
|
0c4184477b
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-11-17 13:36:09 +01:00 |
|
Steffen Fündgens
|
29f4cf6279
|
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 |
|
Faerbit
|
213a936fbb
|
Changing how Attribute locations are looked up.
|
2014-11-15 13:45:05 +01:00 |
|
Faerbit
|
47ca5c9108
|
Ignoring Qtcreator files.
|
2014-11-15 13:42:12 +01:00 |
|
Faerbit
|
b32bf02b21
|
Fixing call for hiding mouse cursor.
|
2014-11-15 11:02:22 +01:00 |
|
Faerbit
|
98270e919d
|
Changed how the rotation of objects is saved to better work with bullet together.
|
2014-11-15 00:03:52 +01:00 |
|