39 commits

Author	SHA1	Message	Date
scrawl	04ead5eb42	make the no-clip mode move much faster	2012-05-01 21:22:15 +02:00
scrawl	6850f3945c	disable those physics debug prints	2012-05-01 21:13:41 +02:00
scrawl	a13f542396	disable snapping underwater	2012-05-01 21:01:18 +02:00
scrawl	86b6184f43	pMove in a seperate loop with fixed timestep to prevent frame-dependent movement	2012-04-30 23:55:22 +02:00
scrawl	4655ec94f0	Merge branch 'master' into physicsaedra2 & fix warnings ... Conflicts: apps/openmw/mwworld/scene.cpp	2012-04-30 18:46:51 +02:00
scrawl	2c89306306	Merge branch 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2	2012-04-22 00:33:37 +02:00
Jason Hooks	8ebae0b706	Solid trace	2012-04-21 16:57:46 -04:00
Jason Hooks	16855291a7	Implementing snapping	2012-04-21 16:21:30 -04:00
Jason Hooks	00260a24ce	Water corrections	2012-04-18 21:28:25 -04:00
scrawl	75b336baea	Merge branch 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2 ... Conflicts: apps/openmw/mwinput/inputmanager.cpp apps/openmw/mwworld/player.cpp libs/openengine/bullet/physic.cpp	2012-04-18 13:43:15 +02:00
Jason Hooks	4d07ae7fe0	Swimming working	2012-04-18 00:13:38 -04:00
Jason Hooks	5f9056c45d	Better no clip	2012-04-17 20:31:36 -04:00
Jason Hooks	1ce759af06	Merging in master	2012-04-17 18:12:05 -04:00
scrawl	75dd651205	Merge branch 'terraincollision' into physicsterrain ... Conflicts: apps/openmw/mwworld/physicssystem.cpp	2012-04-09 13:56:09 +02:00
scrawl	bc636f036c	made it compile	2012-04-08 18:25:50 +02:00
scrawl	9e1a9e5758	Merge branch 'master' into physicsaedra2 ... Conflicts: apps/openmw/mwinput/inputmanager.cpp libs/openengine/bullet/physic.cpp	2012-04-08 17:08:36 +02:00
Jason Hooks	57299571d5	Preparing for clothes/armor	2012-04-02 22:08:46 -04:00
scrawl	c0af3c7241	Merge branch 'master' into terraincollision ... Conflicts: apps/openmw/mwworld/scene.cpp	2012-04-02 19:57:58 +02:00
Jason Hooks	0021ccf862	Merge remote-tracking branch 'upstream/master'	2012-03-31 20:48:42 -04:00
Marc Zinnschlag	40310f3663	Merge remote branch 'scrawl/occlusionquery'	2012-03-31 22:09:47 +02:00
scrawl	a4576f043d	fixed the physics debug rendering now activates/deactivates properly	2012-03-30 16:02:41 +02:00
scrawl	58f7a03626	Merge branch 'terrain18' into terraincollision ... Conflicts: apps/openmw/mwworld/scene.cpp	2012-03-28 21:46:52 +02:00
scrawl	8bbb02a1bd	ogre 1.8 fixes	2012-03-28 21:30:59 +02:00
Jason Hooks	b9fabce9c4	Awesome, working	2012-03-27 20:17:54 -04:00
scrawl	72ff7ec030	Merge branch 'next' into occlusionquery ... Conflicts: apps/openmw/mwrender/sky.cpp	2012-03-27 23:46:48 +02:00
Jason Hooks	318355f1be	Bouncy effect gone	2012-03-26 21:35:20 -04:00
Lukasz Gromanowski	d3b88b9e34	Issue #225: Added cleanup of allocated memory in BulletNifLoader and BulletShapeLoader.	2012-03-26 19:09:55 +02:00
Lukasz Gromanowski	a7ac0e526e	Issue #225: Added cleanup of parts of PhysicEngine. ... Added cleanup of CMotionState inserted to RigidBody, and btSortedOverlappingPairCache inserted to btDbvtBroadphase in PhysicEngine.	2012-03-26 19:09:55 +02:00
Lukasz Gromanowski	633e80cded	Issue #225: Added cleanup of maps used in PhysicEngine.	2012-03-26 19:09:55 +02:00
scrawl	382fa6ac68	fixes	2012-03-25 22:53:00 +02:00
Jason Hooks	e4251be529	Down gravity	2012-03-25 15:16:02 -04:00
scrawl	53d4be5cf6	object pickup should work everywhere	2012-03-25 20:52:56 +02:00
scrawl	17a4adfe88	add raycast method that returns _all_ objects that were hit	2012-03-25 12:26:44 +02:00
Jason Hooks	18a139cd66	adding up and down move buttons	2012-03-24 22:03:08 -04:00
scrawl	99b2b6b648	ogre 1.8 fixes	2012-03-24 14:46:48 +01:00
Jason Hooks	2b3e75718c	Updating everything	2012-03-19 20:03:48 -04:00
Jason Hooks	ed7cb1dc67	restarting	2012-03-19 19:38:44 -04:00
scrawl	9612ce595b	Merge branch 'master' of https://github.com/zinnschlag/openmw into terraincollision ... Conflicts: CMakeLists.txt	2012-03-13 17:09:50 +01:00
Nikolay Kasyanov	b4343431c6	Merged openengine into openmw	2012-03-11 18:16:29 +04:00