Commit Graph

70 Commits

Author SHA1 Message Date
Steffen Fündgens
198f8054b7 Merging level.cc und level.hh. 2015-03-06 17:49:21 +01:00
Steffen Fündgens
dd94e6f63c Changed the camera so it is less likely to go through the heightmap. 2015-03-06 17:45:51 +01:00
Jasper
9346cadb0f fixed problem where pressing buttons while respawning would lead to overflow and segmentation fault 2015-03-06 16:56:20 +01:00
Jasper
25b8960b92 Added endgame. 2015-03-06 16:19:57 +01:00
Jasper
d234cafa3c Added smooth respawn in the forcePlayer function 2015-03-06 15:01:22 +01:00
Jasper
b46b718e2b resized camera object 2015-03-06 13:58:25 +01:00
Jasper
5dd03ef9e6 added playermove 2015-03-04 16:01:55 +01:00
Jasper
3710852841 fix 2015-03-04 15:33:31 +01:00
Jasper
d0b56e3cf1 modified camera to a directional camera as requested 2015-03-04 13:37:27 +01:00
Jasper
f6d57e22c5 added convextrianglemeshshape 2015-02-27 15:58:21 +01:00
Steffen
775f509464 Changed position constraints so they dont bounce the door up and down. 2015-02-15 16:12:11 +01:00
Faerbit
cc35f5c4fc Moved setting of sleepingThreshold of PositionConstraints. 2015-02-14 09:39:16 +01:00
Faerbit
ab155f7e48 Fixed first door not opening. 2015-02-14 00:40:52 +01:00
Jasper
c2a26cc3ad changed hight of camera and added camera move methode in physics 2015-02-13 17:47:21 +01:00
Jasper
664539b718 added move system and modified the camera for less bobidity 2015-02-13 17:22:01 +01:00
Jasper
851159828a Camera now with less jitter! 2015-02-13 16:34:39 +01:00
Jasper
8a273777a1 Fixed non rotating objects 2015-02-13 16:09:18 +01:00
Steffen Fündgens
22232ff7dc Undid something i did not want to include in the last commit. 2015-02-13 15:38:43 +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
b2398ba643 Reduced camera mass so the camera can practically not move objects anymore. Fixed the scaling of forces on the camera with the (no more inverted) mass. 2015-02-13 13:00:47 +01:00
Steffen Fündgens
cb6f535382 Made it possible again to move the camera upwards. 2015-02-13 12:47:34 +01:00
Steffen Fündgens
012d117c7e Changed position constraints to be less bouncy. 2015-02-13 12:15:54 +01:00
Steffen Fündgens
ff5bd0dae1 Merged physics.cc. 2015-02-06 18:04:20 +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
Jasper
644a4a3571 addede max camera speed 2015-02-06 17:31:52 +01:00
Jasper
72e3fdea69 got the marble to no longer jitter all over the place 2015-02-06 16:26:22 +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
Jasper
6536459359 prepare for peoples 2015-01-23 13:31:19 +01:00
Jasper
adf355cc46 constraints work. Why? because i said so! 2015-01-23 12:59:28 +01:00
Jasper
14462ac8df readding button -> box 2015-01-23 12:05:43 +01:00
Jasper
6056663dde some quick updates for the camera before working on buttons 2015-01-19 17:12:58 +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
Jasper
25c6c6b6e1 small changes to trimesh scaling 2015-01-19 15:33:44 +01:00
Jasper
1fdf8fabaf added trimesh back to collision 2015-01-19 15:24:44 +01:00
Jasper
7d9e65fe13 fixed small bug with balls 2015-01-19 14:57:20 +01:00
Jasper
94d766e11f added collision masks and button creator 2015-01-19 14:01:05 +01:00
Steffen
698d917d4c Created a moveObject function in the Level class. 2015-01-17 13:30:33 +01:00
Steffen
b3f11542d2 Removed the lua state from the physics. 2015-01-17 13:11:43 +01:00
Jasper
917008167e Added position Constraint structure, an add/remove function for them, and added their handeling to the update function 2015-01-16 16:17:26 +01:00
Steffen Fündgens
b09451092b 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
b8d45cc522 Moved all dampning parameters (except for the camera) to Compositions.xml. 2015-01-06 13:31:53 +01:00
Steffen Fündgens
3560957d67 Moved friction and player strength to Level.xml. 2015-01-06 13:14:30 +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
Jasper
326f038dcc Composition scales addapted
Physics added trimeshshapes
2014-12-15 16:02:04 +01:00