Fabian Klemp
|
2a229dfefd
|
Fixing waterPlane not being rendered last, leading to incorrect alpha.
|
2015-03-09 14:59:22 +01:00 |
|
Fabian Klemp
|
d129989b5f
|
Do not render shadows for waterPlane.
|
2015-03-09 14:28:09 +01:00 |
|
Faerbit
|
dd914a555c
|
Gave sun rise more different colors.
|
2015-03-09 00:39:59 +01:00 |
|
SteffenFuendgens
|
79d14461e6
|
Added lights that get created and deleted from lua. Scripts dont crash but i cant test it further until monday.
|
2015-03-07 13:41:35 +01:00 |
|
Steffen Fündgens
|
198f8054b7
|
Merging level.cc und level.hh.
|
2015-03-06 17:49:21 +01:00 |
|
Steffen Fündgens
|
15671202e8
|
Added a reset for the second moveable box.
|
2015-03-06 17:44:34 +01:00 |
|
Jasper
|
25b8960b92
|
Added endgame.
|
2015-03-06 16:19:57 +01:00 |
|
Jasper
|
35dc67b14a
|
modified run amounts
|
2015-03-06 14:00:59 +01:00 |
|
Steffen Fündgens
|
a843d00f1c
|
Finished lua script for the sunrise and added triggers to call it.
|
2015-03-06 13:22:04 +01:00 |
|
Faerbit
|
f3cbfe6133
|
Gave the skydome it's own class which contains the nightTexture and changed the loader and the level XML.
|
2015-03-04 21:28:46 +01:00 |
|
Steffen Fündgens
|
deb70240d1
|
Added 'Safepoints' to the resetPlayer script.
|
2015-03-04 18:10:49 +01:00 |
|
Fabian Klemp
|
95fef2448e
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-04 16:08:11 +01:00 |
|
Fabian Klemp
|
1ec7f05eca
|
Gave skydome it's own shader.
|
2015-03-04 16:08:03 +01:00 |
|
Steffen Fündgens
|
6f0e0997e3
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-04 15:52:39 +01:00 |
|
Steffen Fündgens
|
47bd2d29df
|
Added a trigger that resets the player when his z value is below 15.
|
2015-03-04 15:52:28 +01:00 |
|
Jasper
|
3710852841
|
fix
|
2015-03-04 15:33:31 +01:00 |
|
Jasper
|
d03bfb61bc
|
modified the update in level.cc. Now the ball no longer goes bouncy.
|
2015-03-04 15:04:46 +01:00 |
|
Steffen Fündgens
|
1ad25ef8cb
|
Ignored first two seconds of triggering to give switches time to position themselves.
|
2015-03-02 14:28:19 +01:00 |
|
Steffen Fündgens
|
8773ac8f52
|
Solved jittering by moving physics update in the level update.
|
2015-02-27 12:56:02 +01:00 |
|
Faerbit
|
a2d0133acd
|
Removing flame class and integrate it into light class because it was unpractical.
|
2015-02-24 12:56:40 +01:00 |
|
Steffen Fündgens
|
aa1287cdaa
|
Added vector of flames to the level.
|
2015-02-17 12:41:15 +01:00 |
|
Faerbit
|
f6b2cc938f
|
Removed commented code.
|
2015-02-15 19:20:21 +01:00 |
|
Steffen Fündgens
|
9e987fdbdf
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-13 17:14:38 +01:00 |
|
Steffen Fündgens
|
60543a301e
|
Added resetPlayer function to the level.
|
2015-02-13 17:14:29 +01:00 |
|
Jasper
|
818af2769b
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-13 15:46:46 +01:00 |
|
Jasper
|
dc628f3fc8
|
added debug Camear (keys L and K to switch)
|
2015-02-13 15:46:00 +01:00 |
|
Steffen Fündgens
|
7a7b8d07c6
|
Reenabled zooming with the mouse wheel.
|
2015-02-13 15:20:32 +01:00 |
|
Steffen Fündgens
|
47fded52ce
|
Code rework. Basically cleaned up a mess of tabs and whitespaces.
|
2015-02-13 13:46:41 +01:00 |
|
Steffen Fündgens
|
2bfad25510
|
Added loading from config.xml, then debuged it for more than three hours...
|
2015-02-06 18:00:14 +01:00 |
|
Steffen Fündgens
|
df7c5ffe3d
|
Moved loading of the terrain to the loader, now also reading parameters for it from xml.
|
2015-02-06 12:51:53 +01:00 |
|
Faerbit
|
d50f624004
|
Moved loading functionality to loader class.
|
2015-02-04 17:16:06 +01:00 |
|
Steffen Fündgens
|
df884666b5
|
Scaling of the player ball is now possible.
|
2015-02-03 12:36:42 +01:00 |
|
Steffen Fündgens
|
c57d73317c
|
Added scaling to the physic of Box and Button. Adjusted the objectData for block.obj perfectly.
|
2015-02-03 12:29:35 +01:00 |
|
Steffen Fündgens
|
1d89537a33
|
Changed trigger indices to match physicObjects instead of objects, adjusted removeObject function.
|
2015-02-02 12:43:32 +01:00 |
|
Jasper
|
a49f4509b1
|
added inital rotation to physics, had the springs fixed (was NOT my fault)
|
2015-01-30 17:29:48 +01:00 |
|
Jasper
|
7f87d56b0e
|
fine tuned the camera nad added more comments to physics.cc
|
2015-01-30 13:32:16 +01:00 |
|
Jasper
|
477da05464
|
implimented a rough version of a physics driven camera
|
2015-01-29 14:10:28 +01:00 |
|
Jasper
|
ecff8b5cf7
|
added a scaling factor to triangle meshes to compensate for diffrent scaling (somehow from bullet, idk) and started adding comments to physics.cc
|
2015-01-29 13:15:45 +01:00 |
|
Steffen Fündgens
|
688a4e6114
|
Rotate parameter for physics.add should now be false if the object has a positionConstraint.
|
2015-01-23 16:51:09 +01:00 |
|
Steffen Fündgens
|
f3580555cd
|
Added more exits after errors.
|
2015-01-23 16:02:10 +01:00 |
|
Jasper
|
6536459359
|
prepare for peoples
|
2015-01-23 13:31:19 +01:00 |
|
Jasper
|
4b63dc0664
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-23 12:06:26 +01:00 |
|
Faerbit
|
a5b69a23ca
|
Made progress on point light shadows. Not quite sure what is happening.
|
2015-01-22 21:21:09 +01:00 |
|
Jasper
|
bea8436a8d
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-19 18:30:12 +01:00 |
|
Jasper
|
bc4b08426b
|
Added physics type button.
|
2015-01-19 18:30:07 +01:00 |
|
Steffen Fündgens
|
92a144d8bb
|
Mirrored rendering of pointlight shadows, so that they are at the correct positions now, but occlude everything. -- Fabian
|
2015-01-19 18:22:25 +01:00 |
|
Jasper
|
1a736dd095
|
prepared camera, level and physics for the new camera
|
2015-01-19 16:51:35 +01:00 |
|
Jasper
|
393e29c083
|
prepareing modified camera in physics
|
2015-01-19 16:30:11 +01:00 |
|
Steffen Fündgens
|
3f33d6cf86
|
Added rotation in Compompositions.xml.
|
2015-01-19 15:55:03 +01:00 |
|
Steffen
|
36ea806c4f
|
Added the option to define initial position constraints in the Level.xml file.
|
2015-01-17 14:07:12 +01:00 |
|