mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 13:56:38 +00:00
Code Issues Releases Wiki Activity
13541 commits 115 branches 76 tags 128 MiB
Commit graph

155 commits

Author SHA1 Message Date
gus
565cbe146d function declaration 2013-07-31 10:04:09 +02:00
scrawl
aa555b3086 Doors no longer get hindered by actors that have collision disabled 2013-07-31 02:39:42 +02:00
scrawl
04b90b7d14 Other actors no longer collide with an actor that has collision disabled 2013-07-30 22:00:48 +02:00
Chris Robinson
dbdfa624e1 Don't start the player with collision disabled 
Since we spawn properly at the door now, there's no reason
to start with tcl on.
 2013-07-08 13:12:12 -07:00
Vincent Heuken
f43b48015e remove actor's collisionbox on death 2013-06-27 19:42:27 -07:00
scrawl
0c4a963132 Container UI rewrite 2013-05-11 18:38:27 +02:00
gus
603af21715 little interface improvement 2013-05-07 19:42:21 +01:00
gus
a328a03bd3 more fix. Fargoth quest almost work as in vanilla now. 2013-05-07 19:35:10 +01:00
gus
006f25d1c0 First try to improve AI. Does not work yet due to strange bug in physicsystem 2013-05-06 00:46:50 +01:00
Marc Zinnschlag
95eeea2a27 Revert "Merge remote-tracking branch 'glorf/acrobatics'" 
This reverts commit 089ef7a2a0, reversing
changes made to 67422c397c.
 2013-05-01 16:56:16 +02:00
Marc Zinnschlag
089ef7a2a0 Merge remote-tracking branch 'glorf/acrobatics' 2013-05-01 13:44:23 +02:00
Glorf
236ec3409f Finished acrobatics 2013-05-01 12:21:59 +02:00
scrawl
627c3fdb6b Added GetStandingPC, GetStandingActor; Fixed GetStartingPos 2013-05-01 11:15:43 +02:00
scrawl
91c89e5db4 Use sphere cast instead of ray for camera distance adjustment; use the box orientation value in newtrace 2013-04-30 20:26:59 +02:00
scrawl
2e1dda9010 Fix old bullet versions 2013-04-28 16:19:40 +02:00
scrawl
208f9ca8c5 Fix problem with newer (or older?) bullet version (thanks travis) 2013-04-28 15:56:09 +02:00
scrawl
9343b4459e Opening doors 2013-04-28 14:59:15 +02:00
scrawl
b34caccd2e Fix moving NPCs not getting their collision box moved 2013-04-18 16:46:38 +02:00
scrawl
b98063bba0 Fix deleted pointer access (getPosition, getRotation) 2013-04-11 18:02:44 +02:00
scrawl
ebaf80d539 Trace actors onto the ground after load, when moved to a different cell by the console or on player cell change. 2013-04-03 23:55:57 +02:00
scrawl
af6409b9f5 Fix NPC physics scale problem 2013-03-31 13:50:57 +02:00
Marc Zinnschlag
b2f6f67d53 Merge remote-tracking branch 'scrawl/master' into next 2013-03-21 22:07:37 +01:00
scrawl
3277ef26da Fix a crash when dropping objects without a collision shape 2013-03-21 21:08:23 +01:00
scrawl
84afd87321 Placeable objects should not collide unless they have a NiRootCollisionNode 2013-03-14 03:04:02 +01:00
scrawl
d7c4a622cf Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack 2013-03-08 23:46:25 +01:00
Marc Zinnschlag
7e100c36b5 Merge remote-tracking branch 'gus/AI' 2013-03-06 19:05:55 +01:00
gus
5938e19362 Clean up 2013-03-06 17:31:57 +00:00
gus
48b3f1e0cf Clean up. But still a little hacky 2013-03-04 12:08:35 +00:00
Nathan Jeffords
109dff2d29 renamed high level NIF files... 2013-03-02 13:23:09 -08:00
scrawl
2e7bc1a368 Z-up conversion: local map, fix tcg 2013-02-26 13:39:10 +01:00
Chris Robinson
86f6491bc8 Remove unused pmove code 2013-02-19 06:38:48 -08:00
Chris Robinson
89fabdb3a9 Update the PhysicActor's RigidBody when moving 
This works, but is less than ideal. As it is now, the rigid body gets updated
twice as the position and rotation are set separately. They should instead be
updated together.
 2013-02-19 04:18:15 -08:00
Chris Robinson
5a1a0b7338 Add and use an MWWorld::isFlying method 2013-02-18 22:39:43 -08:00
scrawl
5d403ebdd3 Fix collision debug drawer (tcg) 2013-02-19 04:03:24 +01:00
Chris Robinson
6356d3a385 Start actors with collision enabled 
NPCs are now affected by gravity. The player still starts in no-collision mode
though, since they start in the void rather than a door marker.
 2013-02-17 06:02:57 -08:00
Chris Robinson
d47d2216f2 Use some const references where appropriate 2013-02-07 16:33:44 -08:00
Chris Robinson
cbdd459500 Remove unneeded playerMove from PhysicActor 2013-02-07 15:48:41 -08:00
Chris Robinson
e577ee2de8 Add a method to set/retrieve being on the ground 2013-02-06 21:44:58 -08:00
Chris Robinson
a782a9109b Store the vertical velocity in the physic actor 2013-02-05 09:24:22 -08:00
Chris Robinson
82e4da4e64 Get the half-extents from the physicactor 2013-02-05 07:41:57 -08:00
scrawl
867fb620c3 part 2 2012-11-08 19:25:06 +01:00
scrawl
4ca0eb93ee fix markers used for raycasting and blocking activation 2012-10-24 17:47:03 +02:00
Marc Zinnschlag
35d099a638 disabling gcc extensions 2012-10-09 17:10:25 +02:00
scrawl
1cb1259e18 fixing some unrelated warnings 2012-09-23 19:36:37 +02:00
Jason Hooks
f01aae138f Removing void 2012-09-17 17:23:26 -04:00
Jason Hooks
05687c120f protection for null cast 2012-09-16 17:48:18 -04:00
Jason Hooks
0fa1dea6c1 Box size set; Set speed 2012-09-16 17:29:16 -04:00
Jason Hooks
192d634098 Movement keys; View angles 2012-09-16 13:19:38 -04:00
Jason Hooks
76f2a82884 More pmove stuff; Turned off broadphase, we could not fall in exteriors 2012-09-15 22:48:24 -04:00
Jason Hooks
f6384574da Starting to introduce pmove 2012-09-15 18:17:42 -04:00
Jason Hooks
f586f53a42 positioning 2012-09-15 16:45:50 -04:00
Jason Hooks
02bca98e9f Setrotate working 2012-09-15 13:23:49 -04:00
Jason Hooks
a1a7733730 Set scale implemented 2012-09-12 18:30:32 -04:00
Jason Hooks
c5b25ef70b Very basic actor physics (no set scale/rotate functions) 2012-09-10 20:29:24 -04:00
Jason Hooks
3e3437f9c3 Revised create and adjust rigid body functions 2012-09-06 20:11:59 -04:00
Jason Hooks
23777033fd Starting to implement new PhysicActor 2012-09-05 17:44:11 -04:00
Jason Hooks
2efceba1fc Tearing apart PhysicActor 2012-09-03 20:32:20 -04:00
Jason Hooks
8762f4a47a boxrotation nif field; commented functions 2012-08-15 16:47:26 -04:00
Jason Hooks
7b8b4c366d Set angle now working for npcs and creatures 2012-08-14 20:29:48 -04:00
Jason Hooks
1f5bc229e0 Separate adjustRigidBody function 2012-08-14 18:04:58 -04:00
Jason Hooks
e7329d5f8b Creatures now have a properly positioned box shape 2012-08-12 00:36:49 -04:00
Jason Hooks
083e3537b4 post merge 2012-08-09 17:21:59 -04:00
Jason Hooks
cacf0bd10d Basic collision with npcs 2012-08-04 15:43:33 -04:00
greye
d5e63a767e replace sprintf() with boost::format 2012-07-26 19:38:33 +04:00
greye
26595f22f6 float* -> Vector3, moveToCell -> copyToCell, fixed placeObject() 2012-07-26 16:14:11 +04:00
greye
9f813aa26c update resource naming in getObjectAABB() 2012-07-25 23:28:42 +04:00
greye
49b1d5e127 fix object placing 2012-07-25 20:31:39 +04:00
greye
87050e48c8 physics getObjectHeight(), MWWorld::Class::getModel() definition 2012-07-25 20:31:39 +04:00
Chris Robinson
386ac56bda Remove the NIF loader and code to manually transform the vertices 
This currently breaks just about everything. They should come back as it's all
reimplemented, though.
 2012-07-12 20:12:18 -07:00
gugus
feec67094f Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwworld/physicssystem.cpp
 2012-07-09 15:23:26 +02:00
gugus
03f7740474 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwworld/worldimp.hpp
 2012-07-09 10:39:57 +02:00
Jason Hooks
b5edad790d merge 2012-07-07 15:27:04 -04:00
Marc Zinnschlag
4c39fefd1e Issue #107: World is accessed only through the interface class from now on; some include cleanup 2012-07-03 12:30:50 +02:00
scrawl
01d1995164 fix compilation against latest bullet svn 2012-06-20 18:22:18 +02:00
Jason Hooks
86d8a07fc7 Switching back to old scaling 2012-06-19 13:28:06 -04:00
Jason Hooks
4d55ecfdbe Deleting scaled shapes; scaleObject() 2012-06-18 13:03:00 -04:00
Jason Hooks
33fe80723c btScaledBvhTriangleMeshShapes 2012-06-17 20:56:10 -04:00
gugus
5397b9dba6 Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling 2012-06-16 11:38:07 +02:00
gugus
01fefca0a3 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-06-15 14:53:19 +02:00
scrawl
0b850a2cb5 fix crash introduced by last commit 2012-06-15 09:15:37 +02:00
scrawl
e498495589 fix a leak: physics heightfield was only destroyed on cell change and not on exit 2012-06-14 21:27:55 +02:00
Jason Hooks
c4c8288af8 Seven digit scales 2012-06-13 19:34:13 -04:00
Jason Hooks
5028f9926d Bullet scale solution 2012-06-12 18:09:58 -04:00
Jason Hooks
10810ee311 Outputting formatted string with scale 2012-06-11 19:55:10 -04:00
scrawl
42e44ac1b5 fixed some leaks 2012-06-06 21:08:20 +02:00
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