Steffen Fündgens
|
f21b837b1c
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-19 13:36:05 +01:00 |
|
Steffen Fündgens
|
136e4d07f0
|
Changed the default objectNum for triggers from 1 to 0. Moved blocks up so they dont spawn in the heightmap.
|
2014-12-19 13:35:17 +01:00 |
|
Steffen Fündgens
|
1cdca7b686
|
added comments to Compositions.xml and adjusted marble size.
|
2014-12-19 13:33:59 +01:00 |
|
Faerbit
|
b16a90bd15
|
Calulating fogEnd by farPlane.
|
2014-12-19 13:27:05 +01:00 |
|
Faerbit
|
5b2c4a6bbc
|
Fixed crashing if no lights are present.
|
2014-12-19 13:09:25 +01:00 |
|
Steffen Fündgens
|
ba847c80f0
|
Moved triggers into compositions.
|
2014-12-16 13:46:49 +01:00 |
|
Fabian Klemp
|
bf46f117b6
|
Moved trigger functions to trigger class.
|
2014-12-16 12:40:30 +01:00 |
|
Fabian Klemp
|
be4a61e65b
|
Fixed triggers. Now deletes a truly random object.
|
2014-12-16 12:19:48 +01:00 |
|
Fabian Klemp
|
d700564b37
|
Initialized pseudo random generator.
|
2014-12-16 12:17:30 +01:00 |
|
Faerbit
|
6db55f5622
|
Added slides.
|
2014-12-16 00:23:35 +01:00 |
|
Faerbit
|
104b8b4bbc
|
Made trigger more presentation friendly.
|
2014-12-15 23:36:22 +01:00 |
|
Faerbit
|
799f191485
|
Disabled point light shadows, because they look very wrong.
|
2014-12-15 22:59:13 +01:00 |
|
Faerbit
|
6b64ec7360
|
Made level more presentation friendly.
|
2014-12-15 22:58:48 +01:00 |
|
Faerbit
|
76053c5b2f
|
Removing debug output.
|
2014-12-15 22:03:04 +01:00 |
|
Faerbit
|
76dbdac70c
|
Revert "Not using pointlight shadows."
This reverts commit e00cb787c8.
|
2014-12-15 22:00:23 +01:00 |
|
Jasper
|
8072fd1cbb
|
Merge branch 'master' of github.com:Faerbit/swp
Conflicts:
level.cc
|
2014-12-15 19:13:25 +01:00 |
|
Jasper
|
9fd8ae5cd8
|
Tried to adjust box.
|
2014-12-15 19:11:28 +01:00 |
|
Steffen Fündgens
|
2a7404e7d1
|
Adding *.db files to gitignore.
|
2014-12-15 19:00:40 +01:00 |
|
Steffen Fündgens
|
32f8683367
|
Fixing texture file name of marble.
|
2014-12-15 19:00:07 +01:00 |
|
Steffen Fündgens
|
895d69fc66
|
Changed to Lvl1.
|
2014-12-15 18:58:32 +01:00 |
|
Steffen Fündgens
|
adde6fd162
|
Implemented simple triggers.
|
2014-12-15 18:43:10 +01:00 |
|
Steffen Fündgens
|
e099c231c7
|
Not using pointlight shadows.
|
2014-12-15 16:48:42 +01:00 |
|
Steffen Fündgens
|
04e5b3a5ac
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 16:34:54 +01:00 |
|
Steffen Fündgens
|
5454a7ddeb
|
Doubled heightmap scale.
|
2014-12-15 16:34:44 +01:00 |
|
Fabian Klemp
|
a20da59e4a
|
Adding torch blenderfile.
|
2014-12-15 16:27:04 +01:00 |
|
Jasper
|
7013f7cf71
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 16:04:36 +01:00 |
|
Jasper
|
00716b63bd
|
Composition scales addapted
Physics added trimeshshapes
|
2014-12-15 16:02:04 +01:00 |
|
Faerbit
|
a3cc265927
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 15:59:12 +01:00 |
|
Faerbit
|
7e31717124
|
Point light shadows for the first point light does something. Seems pretty broken.
|
2014-12-15 15:58:55 +01:00 |
|
sfroitzheim
|
f19b1ddeb1
|
Version 1.1 of the heightmap
|
2014-12-15 15:45:56 +01:00 |
|
sfroitzheim
|
b6e6ee2d24
|
Added Heightmap prototype(could be garbage)
|
2014-12-15 15:13:29 +01:00 |
|
Faerbit
|
371f56695a
|
Reducing OpenGL version number to 3.2 again.
|
2014-12-15 15:10:19 +01:00 |
|
Steffen Fündgens
|
60c5275e50
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 14:59:09 +01:00 |
|
Steffen Fündgens
|
a393fb688d
|
Implemented half the loading of triggers.
|
2014-12-15 14:59:03 +01:00 |
|
Faerbit
|
7d4d322fd1
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 14:57:50 +01:00 |
|
sfroitzheim
|
efc0ac8938
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-12-15 14:25:33 +01:00 |
|
sfroitzheim
|
ea587dc26b
|
Added a simple wall to models/textures
|
2014-12-15 14:24:11 +01:00 |
|
Steffen Fündgens
|
a65bfdde84
|
Fixed the trigger skeleton
|
2014-12-15 13:39:24 +01:00 |
|
Steffen Fündgens
|
f499203f93
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 13:36:13 +01:00 |
|
Steffen Fündgens
|
1b1d06294b
|
Startet implementing a trigger skeleton.
|
2014-12-15 13:36:04 +01:00 |
|
Faerbit
|
f108b64acc
|
Now using OpenGL 4.0.
|
2014-12-15 13:31:31 +01:00 |
|
sfroitzheim
|
f03274082e
|
Fixed Poles of Marble
|
2014-12-15 13:28:05 +01:00 |
|
Faerbit
|
5640bf137e
|
MVPs are only needed for directional shadows and not for point light shadows (forgot one thing.
|
2014-12-15 13:23:35 +01:00 |
|
Faerbit
|
0979c51ed0
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 13:16:36 +01:00 |
|
Faerbit
|
ad567157c4
|
MVPs are only needed for directional shadows and not for point light shadows.
|
2014-12-15 13:16:27 +01:00 |
|
Steffen Fündgens
|
acdf1b3285
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 13:08:47 +01:00 |
|
Steffen Fündgens
|
f681987358
|
Moved mass from objectType to singular objects. Now loading physics from xml, but with a dummy-box instead of meshes.
|
2014-12-15 13:08:35 +01:00 |
|
Faerbit
|
cc93cf7259
|
Removing commented code.
|
2014-12-15 12:55:48 +01:00 |
|
Faerbit
|
36f7217288
|
Moved calculation of shadowMVP to the CPU side.
|
2014-12-15 12:41:30 +01:00 |
|
Faerbit
|
21009d0032
|
Fixed a parenthesis.
|
2014-12-15 11:53:31 +01:00 |
|