mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:49:58 +00:00
Code Issues Releases Wiki Activity
7582 commits 38 branches 54 tags 122 MiB
Commit graph

289 commits

Author SHA1 Message Date
emoose
cadc753216 Fixed: engine: Bug #437 Stop animations when paused better fix; scene: Bug #430 Teleporting and using loading doors linking within the same cell reloads the cell 
Bug #437 fix only pauses the RenderingManager, and still updates the mOcclusionQuery
Bug #430 fix is only tested in interiors (ToddTest)
 2012-11-03 19:29:55 +00:00
scrawl
33361e6539 Merge branch 'master' into spellcreation 2012-10-23 10:38:53 +02:00
scrawl
d76522e7a4 searchPtrViaHandle 2012-10-19 19:48:02 +02:00
scrawl
28cc480ce1 fix some alchemy issues and make the gui use the new implementation 2012-10-18 22:21:39 +02:00
scrawl
c991f68a2d buying created spell 2012-10-15 21:54:19 +02:00
Mark Siewert
1f961d575e Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 
Conflicts:
	apps/openmw/mwrender/terrain.cpp
	components/esm/loadland.hpp
	components/esm_store/reclists.hpp
 2012-10-07 20:35:54 +02:00
Mark Siewert
28d4d7ea3f Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging. 
- Remove check for 255 master/plugin files.
 2012-10-07 20:00:55 +02:00
scrawl
dc33dee22e Merge branch 'master' into videoplayback 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	apps/openmw/mwscript/miscextensions.cpp
 2012-10-01 20:25:23 +02:00
greye
2fa4ac177a initial resolving 2012-10-01 00:23:49 +04:00
greye
721324c1db rm record inheritance, rework esmtool accordingly 2012-09-30 23:34:53 +04:00
scrawl
caef570c8a fix the weather not changing when sleeping/waiting 2012-09-25 21:49:34 +02:00
scrawl
73c69e8eda video playback 2012-09-25 02:35:50 +02:00
greye
807a56c9e4 fix dynamic potion id 2012-09-23 19:29:00 +04:00
scrawl
9f2668b45b Task #400 Review GMST access 2012-09-22 21:35:57 +02:00
scrawl
9106e5307c moved global map from RenderingManager to gui and removed world method 2012-09-21 14:11:01 +02:00
greye
18cc435aa1 resolving conflicts 2012-09-21 13:13:11 +04:00
scrawl
8214966d44 Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap 2012-09-20 17:41:14 +02:00
scrawl
86cfc91ef3 global map rendering 2012-09-20 13:56:37 +02:00
Marc Zinnschlag
a3c680d20a Merge remote-tracking branch 'scrawl/sleep_wait' into next 2012-09-19 09:41:32 +02:00
scrawl
bf5e30b24f everything done except health/mana restore 2012-09-19 02:53:06 +02:00
scrawl
ab698bb401 date time label 2012-09-18 20:53:32 +02:00
Marc Zinnschlag
4abb9a00da Merge remote-tracking branch 'jhooks/physicsaedra3' into next 2012-09-18 11:25:09 +02:00
Marc Zinnschlag
4469976be9 Merge remote-tracking branch 'gus/object_movement_creation' into object_movement_creation 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-09-18 10:44:25 +02:00
gugus
032ff7c879 Clean-up. There is still a little bug. 2012-09-17 13:36:48 +02:00
greye
7606ebafd6 resolving conflicts, minor update 2012-09-17 11:37:50 +04:00
Jason Hooks
f586f53a42 positioning 2012-09-15 16:45:50 -04:00
scrawl
2793096b50 Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/renderingmanager.hpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
 2012-09-15 00:57:29 +02:00
Marc Zinnschlag
b7c9285b24 added support for out of world rendering 2012-09-14 21:12:16 +02:00
scrawl
6ac2a12296 item selection working on the preview 2012-09-14 14:34:18 +02:00
scrawl
eef750e6b0 race selection preview 2012-09-13 19:03:31 +02:00
scrawl
4f3eb3c34a character preview WIP 2012-09-13 00:54:32 +02: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
scrawl
c27ff546e4 shader cache 2012-09-02 19:40:26 +02:00
gugus
95c27723f7 fixed a bug (see commit reverted) 2012-09-02 18:12:13 +02:00
Jason Hooks
0697c7f7f4 Finally merged in master 2012-09-01 17:28:12 -04:00
scrawl
d9276ca09d don't make copy of CellRefList in World::getNorthVector 2012-08-28 18:23:59 +02:00
scrawl
3c39c47e2f don't make copies of CellRefList & LiveCellRef 2012-08-28 18:23:01 +02:00
scrawl
5834b4baa5 door markers on the local map 2012-08-28 17:30:34 +02:00
Marc Zinnschlag
40d4dad15e Issue #378: Fix (record wasn't build fully) 2012-08-28 09:32:38 +02:00
greye
6961830efb using real player eye direction when moving 2012-08-17 15:19:44 +04:00
greye
392e6efcb5 initial player rendering 2012-08-17 15:19:43 +04:00
greye
c46eeaa100 initial 3d-person camera support 2012-08-17 15:19:43 +04:00
Jason Hooks
1f5bc229e0 Separate adjustRigidBody function 2012-08-14 18:04:58 -04:00
Marc Zinnschlag
88e70cb5bd Merge branch 'decouple' 2012-08-12 18:11:17 +02:00
Marc Zinnschlag
6534c2a55a Issue #107: WindowManager is accessed only through the interface class from now on 2012-08-12 18:11:09 +02:00
Marc Zinnschlag
b68f9d6a28 Issue #107: MechanicsManager is accessed only through the interface class from now on 2012-08-11 17:30:55 +02:00
greye
f7f8ac0a73 fix move/rotateObject code 2012-08-11 18:28:37 +04:00
Marc Zinnschlag
380defa52f Merge remote branch 'greye/cross_cell-borders' 2012-08-11 15:08:17 +02:00
greye
47f7a5e988 fix double pos/rot adjustment 2012-08-11 17:01:55 +04:00
Marc Zinnschlag
766e782aae Merge remote branch 'greye/cross_cell-borders' 2012-08-11 12:05:10 +02:00
greye
45306e4bc3 fixed rotation adjustment 2012-08-11 13:23:54 +04:00
scrawl
44ff31b50a removed world exit methods 2012-08-10 16:21:53 +02:00
scrawl
f72956b918 - added a simple main menu (with Return, Options and Exit buttons) 
- removed OEngine::ExitListener (what a terrible abuse of framelisteners)
 2012-08-10 15:15:48 +02:00
greye
38b06aee6c resolving conflicts 2012-08-09 21:49:00 +04:00
Marc Zinnschlag
aca08eb4c2 Merge branch 'decouple' into player_control 
Conflicts:
	apps/openmw/mwsound/soundmanagerimp.hpp
 2012-08-09 16:12:10 +02:00
Marc Zinnschlag
6bd48d12af Issue #107: SoundManager is accessed only through the interface class from now on 2012-08-09 14:33:21 +02:00
greye
ec9cf4d3c6 rotateObject() added, input system rewritten 2012-08-09 00:15:52 +04:00
greye
b6f7f21bcf fix player cell assertion fail, moveObject(Ptr&, CellStore&, f, f, f) added 2012-08-08 14:51:33 +04:00
greye
79b7487c87 fix using deleted objects 2012-08-07 22:21:46 +04:00
greye
d32a61b928 fix object moving 2012-08-06 18:20:48 +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
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
0e3f70413e a very little comments 2012-07-31 16:52:21 +04:00
greye
288b63350c fixed objects update, local script handling 2012-07-31 11:46:57 +04:00
greye
37990b5133 fix player update 2012-07-30 23:54:26 +04:00
greye
d6150b7482 high-level implementation, unstable 2012-07-30 23:28:14 +04: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
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
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
guidoj
0549e949ba Mostly removal of unnecessary #include's and a little clean up 2012-07-17 09:27:12 +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
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
Renamed from apps/openmw/mwworld/world.cpp (Browse further)