Steffen Fündgens
|
f1526fd389
|
Finished lua script for the sunrise and added triggers to call it.
|
2015-03-06 13:22:04 +01:00 |
|
Faerbit
|
3e86b70778
|
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
|
79faa2edea
|
Added 'Safepoints' to the resetPlayer script.
|
2015-03-04 18:10:49 +01:00 |
|
Fabian Klemp
|
98e8d10cdd
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-04 16:08:11 +01:00 |
|
Fabian Klemp
|
01a61f43ac
|
Gave skydome it's own shader.
|
2015-03-04 16:08:03 +01:00 |
|
Steffen Fündgens
|
afae5ccd68
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-04 15:52:39 +01:00 |
|
Steffen Fündgens
|
12f76ddd5a
|
Added a trigger that resets the player when his z value is below 15.
|
2015-03-04 15:52:28 +01:00 |
|
Jasper
|
d827bb8197
|
fix
|
2015-03-04 15:33:31 +01:00 |
|
Jasper
|
ef9c089d91
|
modified the update in level.cc. Now the ball no longer goes bouncy.
|
2015-03-04 15:04:46 +01:00 |
|
Steffen Fündgens
|
9555786a09
|
Ignored first two seconds of triggering to give switches time to position themselves.
|
2015-03-02 14:28:19 +01:00 |
|
Steffen Fündgens
|
abeab11875
|
Solved jittering by moving physics update in the level update.
|
2015-02-27 12:56:02 +01:00 |
|
Faerbit
|
97a315661f
|
Removing flame class and integrate it into light class because it was unpractical.
|
2015-02-24 12:56:40 +01:00 |
|
Steffen Fündgens
|
f92c7bf6c3
|
Added vector of flames to the level.
|
2015-02-17 12:41:15 +01:00 |
|
Faerbit
|
ae1d04b5ee
|
Removed commented code.
|
2015-02-15 19:20:21 +01:00 |
|
Steffen Fündgens
|
1492a312ed
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-13 17:14:38 +01:00 |
|
Steffen Fündgens
|
265c0b2ce5
|
Added resetPlayer function to the level.
|
2015-02-13 17:14:29 +01:00 |
|
Jasper
|
9049458ad5
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-13 15:46:46 +01:00 |
|
Jasper
|
75792a5723
|
added debug Camear (keys L and K to switch)
|
2015-02-13 15:46:00 +01:00 |
|
Steffen Fündgens
|
d55bb3465c
|
Reenabled zooming with the mouse wheel.
|
2015-02-13 15:20:32 +01:00 |
|
Steffen Fündgens
|
e91d045a37
|
Code rework. Basically cleaned up a mess of tabs and whitespaces.
|
2015-02-13 13:46:41 +01:00 |
|
Steffen Fündgens
|
d2cf4f0003
|
Added loading from config.xml, then debuged it for more than three hours...
|
2015-02-06 18:00:14 +01:00 |
|
Steffen Fündgens
|
320c1cb152
|
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
|
7e8b0d4c58
|
Moved loading functionality to loader class.
|
2015-02-04 17:16:06 +01:00 |
|
Steffen Fündgens
|
e7ff009482
|
Scaling of the player ball is now possible.
|
2015-02-03 12:36:42 +01:00 |
|
Steffen Fündgens
|
9ffe3cd886
|
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
|
08e5492b4f
|
Changed trigger indices to match physicObjects instead of objects, adjusted removeObject function.
|
2015-02-02 12:43:32 +01:00 |
|
Jasper
|
5e2d2d4e57
|
added inital rotation to physics, had the springs fixed (was NOT my fault)
|
2015-01-30 17:29:48 +01:00 |
|
Jasper
|
198dc0614f
|
fine tuned the camera nad added more comments to physics.cc
|
2015-01-30 13:32:16 +01:00 |
|
Jasper
|
9c6cd7c59d
|
implimented a rough version of a physics driven camera
|
2015-01-29 14:10:28 +01:00 |
|
Jasper
|
8620e16681
|
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
|
9088bb4561
|
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
|
5a860f68c3
|
Added more exits after errors.
|
2015-01-23 16:02:10 +01:00 |
|
Jasper
|
4c1860429a
|
prepare for peoples
|
2015-01-23 13:31:19 +01:00 |
|
Jasper
|
1687a56f87
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-23 12:06:26 +01:00 |
|
Faerbit
|
d41149e29e
|
Made progress on point light shadows. Not quite sure what is happening.
|
2015-01-22 21:21:09 +01:00 |
|
Jasper
|
099e0c17c7
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-19 18:30:12 +01:00 |
|
Jasper
|
650d505e4e
|
Added physics type button.
|
2015-01-19 18:30:07 +01:00 |
|
Steffen Fündgens
|
cf836b151a
|
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
|
25bd4ba64e
|
prepared camera, level and physics for the new camera
|
2015-01-19 16:51:35 +01:00 |
|
Jasper
|
8306f7ff19
|
prepareing modified camera in physics
|
2015-01-19 16:30:11 +01:00 |
|
Steffen Fündgens
|
4c71dbfbea
|
Added rotation in Compompositions.xml.
|
2015-01-19 15:55:03 +01:00 |
|
Steffen
|
75440f919f
|
Added the option to define initial position constraints in the Level.xml file.
|
2015-01-17 14:07:12 +01:00 |
|
Steffen
|
3e78b4f4bb
|
Created a moveObject function in the Level class.
|
2015-01-17 13:30:33 +01:00 |
|
Steffen
|
aca199cd1b
|
Removed the lua state from the physics.
|
2015-01-17 13:11:43 +01:00 |
|
Steffen
|
a128c947b1
|
Added ignoreHeightmap option to compositions in Compositions.xml.
|
2015-01-17 12:24:54 +01:00 |
|
sfroitzheim
|
073000d097
|
Additional changes with the heightmap
|
2015-01-16 16:37:00 +01:00 |
|
Steffen Fündgens
|
a137d2544a
|
Triggers now adapt if the object they want to do something with gets deleted or changes its index.
|
2015-01-13 18:18:13 +01:00 |
|
Steffen Fündgens
|
72d1009007
|
Now passing the Lua State to the physics, so that Lua can directly access physics functions.
|
2015-01-13 17:50:15 +01:00 |
|
Steffen Fündgens
|
d936d1f269
|
Lua script works now, worked around the bug by saving the name as a std::string.
|
2015-01-13 17:21:15 +01:00 |
|
Steffen Fündgens
|
fe58023458
|
Moved triggering to lua, got a strange bug with the const char* holding the name of the lua script.
|
2015-01-13 13:52:22 +01:00 |
|