Commit Graph

66 Commits

Author SHA1 Message Date
Jasper
1399f6ad7a Added smooth respawn in the forcePlayer function 2015-03-06 15:01:22 +01:00
Jasper
522e2f0db5 resized camera object 2015-03-06 13:58:25 +01:00
Jasper
aa2ed3083a added playermove 2015-03-04 16:01:55 +01:00
Jasper
d827bb8197 fix 2015-03-04 15:33:31 +01:00
Jasper
b7718d73e8 modified camera to a directional camera as requested 2015-03-04 13:37:27 +01:00
Jasper
d49baa2a8c added convextrianglemeshshape 2015-02-27 15:58:21 +01:00
Steffen
2c699590e2 Changed position constraints so they dont bounce the door up and down. 2015-02-15 16:12:11 +01:00
Faerbit
f05e3d301c Moved setting of sleepingThreshold of PositionConstraints. 2015-02-14 09:39:16 +01:00
Faerbit
12099cb4a1 Fixed first door not opening. 2015-02-14 00:40:52 +01:00
Jasper
760a7c9d86 changed hight of camera and added camera move methode in physics 2015-02-13 17:47:21 +01:00
Jasper
d4fe5e1ae1 added move system and modified the camera for less bobidity 2015-02-13 17:22:01 +01:00
Jasper
818178e665 Camera now with less jitter! 2015-02-13 16:34:39 +01:00
Jasper
98718b517e Fixed non rotating objects 2015-02-13 16:09:18 +01:00
Steffen Fündgens
3fc8e9c11a Undid something i did not want to include in the last commit. 2015-02-13 15:38:43 +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
1585195779 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
6ee8af58e3 Made it possible again to move the camera upwards. 2015-02-13 12:47:34 +01:00
Steffen Fündgens
d02a7fa02f Changed position constraints to be less bouncy. 2015-02-13 12:15:54 +01:00
Steffen Fündgens
21d94a420f Merged physics.cc. 2015-02-06 18:04:20 +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
Jasper
c4bed4c506 addede max camera speed 2015-02-06 17:31:52 +01:00
Jasper
017c96bd55 got the marble to no longer jitter all over the place 2015-02-06 16:26:22 +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
Jasper
4c1860429a prepare for peoples 2015-01-23 13:31:19 +01:00
Jasper
47b386296a constraints work. Why? because i said so! 2015-01-23 12:59:28 +01:00
Jasper
d1a3c3ac3d readding button -> box 2015-01-23 12:05:43 +01:00
Jasper
65a826f2af some quick updates for the camera before working on buttons 2015-01-19 17:12:58 +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
Jasper
bcdbb2534c small changes to trimesh scaling 2015-01-19 15:33:44 +01:00
Jasper
2edbb196c2 added trimesh back to collision 2015-01-19 15:24:44 +01:00
Jasper
7cb3e3d620 fixed small bug with balls 2015-01-19 14:57:20 +01:00
Jasper
c2634543dc added collision masks and button creator 2015-01-19 14:01:05 +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
Jasper
913e862a88 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
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
70e2ebb605 Moved all dampning parameters (except for the camera) to Compositions.xml. 2015-01-06 13:31:53 +01:00
Steffen Fündgens
76b6be0beb Moved friction and player strength to Level.xml. 2015-01-06 13:14:30 +01:00
Steffen Fündgens
20b0c66a17 Tweaked ball physics. 2014-12-19 15:20:49 +01:00
Steffen Fündgens
7d3d7927fe Fixed bug with created too many faces. 2014-12-19 15:20:05 +01:00
Jasper
00716b63bd Composition scales addapted
Physics added trimeshshapes
2014-12-15 16:02:04 +01:00
Jasper
76307f751f Reduced memory usage of trianglemesh 2014-11-28 17:01:56 +01:00
Jasper
3fcd677dd5 Added basic Triangle Mesh, pending reading out of .obj and then testing. 2014-11-28 16:46:35 +01:00
Jasper
13e08945df Added a constraint for distances, as such a constraint did not exist in bullet.Why, IDK. 2014-11-28 13:52:03 +01:00
Faerbit
669e9e0334 Removing global variables from physics, because they are not needed. 2014-11-25 13:38:28 +01:00