1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 10:49:57 +00:00
Commit graph

611 commits

Author SHA1 Message Date
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
Marc Zinnschlag
1db7978361 silenced a warning 2012-08-04 22:03:14 +02:00
Marc Zinnschlag
0c5f886683 Merge remote branch 'greye/player_control' 2012-08-04 21:55:13 +02:00
Jason Hooks
cacf0bd10d Basic collision with npcs 2012-08-04 15:43:33 -04:00
greye
16ad97610d add support for some scripting player control switches 2012-08-04 11:54:42 +04:00
Marc Zinnschlag
994e33e3d2 fixed object rotation code 2012-08-04 09:34:49 +02:00
greye
ff62770657 World::isUnderwater(), World::isSwimming() 2012-08-03 14:42:09 +04:00
greye
f2a2e5f57d remove MWWorld::Player::setPos() 2012-07-31 19:30:24 +04:00
Marc Zinnschlag
8b08928dae Issue #351: Added sound playing to Action 2012-07-27 12:19:25 +02:00
Marc Zinnschlag
78fe6fdce5 Issue #351: Refactoring Action class 2012-07-27 12:00:10 +02:00
Marc Zinnschlag
7725190f89 removed some redundant code 2012-07-26 19:09:45 +02:00
greye
aa5f63ffcc disabled items placing handling 2012-07-26 19:06:48 +04:00
greye
26595f22f6 float* -> Vector3, moveToCell -> copyToCell, fixed placeObject() 2012-07-26 16:14:11 +04:00
greye
cd04911f3c dropping on the ground 2012-07-25 20:31:39 +04:00
greye
49b1d5e127 fix object placing 2012-07-25 20:31:39 +04:00
greye
e7666d3a7f move responsibility for cell changing from CellStore::insertObject to Class::moveToCell 2012-07-25 20:31:39 +04:00
greye
bcc47cd5fb local scripts, move placing to World::placeObject(Ptr, CellStore, Position) 2012-07-25 20:31:39 +04:00
greye
d5fe378a66 Revert "local script registration"
This reverts commit 0686399a306319a4c49e1009d10215a9c0e65ec2.
2012-07-25 20:31:39 +04:00
greye
aff05b9d36 local script registration 2012-07-25 20:31:39 +04:00
greye
e1c7d1f529 fixed item sinking 2012-07-25 20:31:39 +04:00
greye
6a3a728a56 Class::getModel implementation 2012-07-25 20:31:39 +04:00
greye
87050e48c8 physics getObjectHeight(), MWWorld::Class::getModel() definition 2012-07-25 20:31:39 +04:00
greye
71253c64ab moving part 2, adding position parameter, stable 2012-07-25 20:31:39 +04:00
greye
61cb012ee7 moving Scene::insertObject to CellStore::insertObject, part 1 2012-07-25 20:31:39 +04:00
greye
b760225179 wrong branch
This reverts commit d36d6aacf4.
2012-07-24 00:00:10 +04:00
greye
d36d6aacf4 move Scene::insertObject to CellStore::insertObject, part 1 2012-07-23 23:56:20 +04:00
greye
9a2690f849 Revert "wrong"
This reverts commit 3aa53fea32.
2012-07-23 23:07:28 +04:00
greye
3aa53fea32 wrong 2012-07-23 23:06:53 +04:00
scrawl
acc5c3bbbf some fixes 2012-07-20 17:08:15 +02:00
scrawl
4434fb640e Merge branch 'master' into shadersystem 2012-07-17 19:12:02 +02:00
Marc Zinnschlag
6744375636 fixed a logic error in the auto equip code 2012-07-17 18:35:01 +02:00
Marc Zinnschlag
beb18282bb Issue #342: various fixes 2012-07-17 16:44:55 +02:00
Marc Zinnschlag
2c70a93553 Merge branch 'master' into potions
Conflicts:
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
2012-07-17 10:32:18 +02:00
guidoj
0549e949ba Mostly removal of unnecessary #include's and a little clean up 2012-07-17 09:27:12 +02:00
scrawl
7d5b94709d Merge branch 'master' into shadersystem
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
2012-07-14 11:16:35 +02:00
Marc Zinnschlag
29b4a5e5f7 Issue #314: added apply actions 2012-07-13 09:41:38 +02:00
scrawl
7731e9a6fa finished cleaning up sky 2012-07-13 09:13:12 +02:00
Marc Zinnschlag
805b81bf6e Issue #314: added skillUsageSucceeded function to Class 2012-07-13 09:03:17 +02:00
Marc Zinnschlag
7a2d613043 Issue #314: extended Class::apply function to cover the actor 2012-07-13 08:50:46 +02:00
Marc Zinnschlag
ec9ebe6b58 Merge branch 'skillgain' into potions
Conflicts:
	apps/openmw/mwmechanics/activespells.cpp
2012-07-10 14:08:30 +02:00
Marc Zinnschlag
f11bf49a90 cmake fix; silenced some warnings 2012-07-10 13:23:41 +02:00
gugus
164a5c8fe4 rotation now also work with the physic representation 2012-07-10 12:10:50 +02:00
gugus
70c74ede05 changed rotation order 2012-07-10 11:53:12 +02:00
gugus
410b693555 setAngle improvement 2012-07-10 11:15:46 +02:00
gugus
557e114992 clean-up + getScale/Angle script instructions 2012-07-09 19:28:44 +02:00
gugus
0a67f60a6e Clean-up 2012-07-09 18:47:59 +02:00
gugus
e6716c25c3 little correction. 2012-07-09 15:41:19 +02: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