Steffen Fündgens
|
6bec8fc01d
|
Added the option to give a trigger a target composition. The position the trigger activates at is the old manually set position + the position of the target composition.
|
2014-12-19 16:15:29 +01:00 |
|
Steffen Fündgens
|
8a66bade63
|
Ignoring blender backup files.
|
2014-12-19 15:22:34 +01:00 |
|
Steffen Fündgens
|
bc348aef35
|
Also increased strength of the player ball.
|
2014-12-19 15:21:38 +01:00 |
|
Steffen Fündgens
|
74294d79e9
|
Tweaked ball physics.
|
2014-12-19 15:20:49 +01:00 |
|
Steffen Fündgens
|
75568ff54f
|
Fixed bug with created too many faces.
|
2014-12-19 15:20:05 +01:00 |
|
Steffen Fündgens
|
a7c3ad0138
|
Triangulated block.
|
2014-12-19 15:14:33 +01:00 |
|
Steffen Fündgens
|
8d12f676db
|
Triangulated faces of the torch and added it to the Level again.
|
2014-12-19 15:09:00 +01:00 |
|
Steffen Fündgens
|
346f4b221c
|
Removing useless mtl file.
|
2014-12-19 15:07:43 +01:00 |
|
Steffen Fündgens
|
83591e046f
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-19 13:36:05 +01:00 |
|
Steffen Fündgens
|
f8215284af
|
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
|
f0a64f9a3a
|
added comments to Compositions.xml and adjusted marble size.
|
2014-12-19 13:33:59 +01:00 |
|
Faerbit
|
e23b53e4a2
|
Calulating fogEnd by farPlane.
|
2014-12-19 13:27:05 +01:00 |
|
Faerbit
|
2347a4d417
|
Fixed crashing if no lights are present.
|
2014-12-19 13:09:25 +01:00 |
|
Steffen Fündgens
|
053c645012
|
Moved triggers into compositions.
|
2014-12-16 13:46:49 +01:00 |
|
Fabian Klemp
|
1ebccbf325
|
Moved trigger functions to trigger class.
|
2014-12-16 12:40:30 +01:00 |
|
Fabian Klemp
|
64f3518dc3
|
Fixed triggers. Now deletes a truly random object.
|
2014-12-16 12:19:48 +01:00 |
|
Fabian Klemp
|
f801ce6d3d
|
Initialized pseudo random generator.
|
2014-12-16 12:17:30 +01:00 |
|
Faerbit
|
8a9eb87e9a
|
Added slides.
|
2014-12-16 00:23:35 +01:00 |
|
Faerbit
|
0d57bf65ef
|
Made trigger more presentation friendly.
|
2014-12-15 23:36:22 +01:00 |
|
Faerbit
|
bd4ae93846
|
Disabled point light shadows, because they look very wrong.
|
2014-12-15 22:59:13 +01:00 |
|
Faerbit
|
4561145495
|
Made level more presentation friendly.
|
2014-12-15 22:58:48 +01:00 |
|
Faerbit
|
5ca7626ec0
|
Removing debug output.
|
2014-12-15 22:03:04 +01:00 |
|
Faerbit
|
6f91e959b6
|
Revert "Not using pointlight shadows."
This reverts commit e00cb787c8.
|
2014-12-15 22:00:23 +01:00 |
|
Jasper
|
33173a4db4
|
Merge branch 'master' of github.com:Faerbit/swp
Conflicts:
level.cc
|
2014-12-15 19:13:25 +01:00 |
|
Jasper
|
7bfc171459
|
Tried to adjust box.
|
2014-12-15 19:11:28 +01:00 |
|
Steffen Fündgens
|
d5307c0dd2
|
Adding *.db files to gitignore.
|
2014-12-15 19:00:40 +01:00 |
|
Steffen Fündgens
|
652728b9e3
|
Fixing texture file name of marble.
|
2014-12-15 19:00:07 +01:00 |
|
Steffen Fündgens
|
405d3bb505
|
Changed to Lvl1.
|
2014-12-15 18:58:32 +01:00 |
|
Steffen Fündgens
|
b26d904023
|
Implemented simple triggers.
|
2014-12-15 18:43:10 +01:00 |
|
Steffen Fündgens
|
c593d93ef0
|
Not using pointlight shadows.
|
2014-12-15 16:48:42 +01:00 |
|
Steffen Fündgens
|
c225326a4c
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 16:34:54 +01:00 |
|
Steffen Fündgens
|
18047e5704
|
Doubled heightmap scale.
|
2014-12-15 16:34:44 +01:00 |
|
Fabian Klemp
|
22643390a5
|
Adding torch blenderfile.
|
2014-12-15 16:27:04 +01:00 |
|
Jasper
|
2cd5351b06
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 16:04:36 +01:00 |
|
Jasper
|
326f038dcc
|
Composition scales addapted
Physics added trimeshshapes
|
2014-12-15 16:02:04 +01:00 |
|
Faerbit
|
fe8e69fa71
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 15:59:12 +01:00 |
|
Faerbit
|
153a619035
|
Point light shadows for the first point light does something. Seems pretty broken.
|
2014-12-15 15:58:55 +01:00 |
|
sfroitzheim
|
4e28d7c21b
|
Version 1.1 of the heightmap
|
2014-12-15 15:45:56 +01:00 |
|
sfroitzheim
|
928898b1ca
|
Added Heightmap prototype(could be garbage)
|
2014-12-15 15:13:29 +01:00 |
|
Faerbit
|
fd0a5386e5
|
Reducing OpenGL version number to 3.2 again.
|
2014-12-15 15:10:19 +01:00 |
|
Steffen Fündgens
|
5c9a1bfb84
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 14:59:09 +01:00 |
|
Steffen Fündgens
|
0a2d0c2f75
|
Implemented half the loading of triggers.
|
2014-12-15 14:59:03 +01:00 |
|
Faerbit
|
2f5887ec0b
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 14:57:50 +01:00 |
|
sfroitzheim
|
aa3ad20ffb
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-12-15 14:25:33 +01:00 |
|
sfroitzheim
|
4c4ac76c4c
|
Added a simple wall to models/textures
|
2014-12-15 14:24:11 +01:00 |
|
Steffen Fündgens
|
0351745376
|
Fixed the trigger skeleton
|
2014-12-15 13:39:24 +01:00 |
|
Steffen Fündgens
|
f0add86f42
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 13:36:13 +01:00 |
|
Steffen Fündgens
|
3450abd970
|
Startet implementing a trigger skeleton.
|
2014-12-15 13:36:04 +01:00 |
|
Faerbit
|
a707c6c2bf
|
Now using OpenGL 4.0.
|
2014-12-15 13:31:31 +01:00 |
|
sfroitzheim
|
762f466f14
|
Fixed Poles of Marble
|
2014-12-15 13:28:05 +01:00 |
|