gugus
|
a711a3ebe1
|
Various fixes
|
2012-05-29 16:45:43 +02:00 |
|
gugus
|
09ec1da0f6
|
fix the latest commit: objects activation works again.
|
2012-05-17 16:12:55 +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
|
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
|
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
|
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 |
|
scrawl
|
c0af3c7241
|
Merge branch 'master' into terraincollision
Conflicts:
apps/openmw/mwworld/scene.cpp
|
2012-04-02 19:57:58 +02: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
|
72ff7ec030
|
Merge branch 'next' into occlusionquery
Conflicts:
apps/openmw/mwrender/sky.cpp
|
2012-03-27 23:46:48 +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 |
|
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
|
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 |
|