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

201 commits

Author SHA1 Message Date
Marc Zinnschlag
5b6ec405e3 Merge branch 'script' 2011-04-28 10:30:32 +02:00
Marc Zinnschlag
f52e6bd5ef made toggle-type script instructions more verbose 2011-04-26 21:38:21 +02:00
Marc Zinnschlag
792de880cf another constness fix 2011-04-21 11:00:00 +02:00
Marc Zinnschlag
717b5e1784 fixed a constness problem 2011-04-21 10:49:45 +02:00
Marc Zinnschlag
190f77f6c9 added journal class 2011-04-04 11:16:56 +02:00
Jan-Peter Nilsson
a94de76801 Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline) 2011-04-03 13:20:42 +02:00
Pieter van der Kloet
833a61dd82 Fixed Boost errors with 1.46 caused by the deprecated name file_string() 2011-03-28 17:36:05 +02:00
Marc Zinnschlag
53e1d0e7e7 more cleanup 2011-03-23 23:05:15 +01:00
Marc Zinnschlag
c571148bef Merge branch 'collision' 2011-03-23 22:57:56 +01:00
Marc Zinnschlag
5661dc27c2 removed a leftover from physics debugging 2011-03-23 22:56:58 +01:00
gugus
3ad2b9986e fix actors not beeing deleted. Need the latest OEngine. 2011-03-23 19:16:51 +01:00
Marc Zinnschlag
7144657cfc Merge branch 'script' 2011-03-23 17:07:05 +01:00
gugus
7a28c9f3aa fix the door bug 2011-03-22 20:15:19 +01:00
gugus
0cc94c81d4 Merge remote branch 'upstream/collision' into collision 2011-03-22 14:14:56 +01:00
Marc Zinnschlag
7b5d24c853 fixed a bug in phyiscs update code 2011-03-22 13:48:31 +01:00
gugus
3dddcbd958 fix a camera problem and increase player speed 2011-03-22 13:01:23 +01:00
gugus
2aee958789 Not sure about this commit: the PhysicEngine was initialized twice... 2011-03-18 13:22:51 +01:00
Marc Zinnschlag
72a84356e2 added tcg/tcb instructions (toggle collision rendering); not fully working yet (problem in OpenEngine or MWScene) 2011-03-16 09:09:45 +01:00
Marc Zinnschlag
f1bfca7c7c player class cleanup 2011-03-13 22:37:54 +01:00
Marc Zinnschlag
eb93ef68f1 fixed collision mode interface and redirected collision mode script instruction from Player class to MWScene class 2011-03-13 22:33:55 +01:00
Marc Zinnschlag
1e9dc4b435 de-Windownizing and some build-fixes 2011-02-26 16:37:47 +01:00
gugus
ff941b5963 add physic 2011-02-19 17:59:40 +01:00
Marc Zinnschlag
ef7a06dea5 player was not registered at mwscene (for physics) 2011-02-11 09:51:11 +01:00
Marc Zinnschlag
9807e7dadc simplified actor-related physics interface to mwscene 2011-02-11 09:24:59 +01:00
Marc Zinnschlag
5c1aae3e26 added object movement code in mwscene (will be replaced by physics code later); does not work well, because OpenEngine manipulates camera instead of player node 2011-02-10 13:32:34 +01:00
Marc Zinnschlag
9c6bc4975c attached camera to a scene node 2011-02-10 12:56:19 +01:00
Marc Zinnschlag
9a3158675a reworked cell changing mechanism 2011-02-10 10:38:45 +01:00
Marc Zinnschlag
f773cf27cb replaced old movement input system 2011-02-03 12:16:59 +01:00
Marc Zinnschlag
4468a2b6a8 added movement data to MW references; added movement interface to MWWorld::Class 2011-02-03 11:37:17 +01:00
Marc Zinnschlag
ca44b3640a pasing movement data from mwmechanics to mwscene and fixed a very stupid interface bug 2011-02-01 10:11:41 +01:00
Marc Zinnschlag
40d772b33a call doPhysics function once per frame 2011-01-29 17:39:34 +01:00
Marc Zinnschlag
6a14ea8ec3 handle physics during player changing cells 2011-01-29 16:57:33 +01:00
Marc Zinnschlag
5486c70edf connected object-manipulator functions in world to physics interface 2011-01-27 09:46:54 +01:00
Marc Zinnschlag
9a5a6eac2b stop reporting changes originating from physics system back to physics system 2011-01-27 09:29:55 +01:00
Marc Zinnschlag
36cb10572a fixed tab problem 2011-01-18 15:20:36 +01:00
Marc Zinnschlag
eb5e4427c1 Merge remote branch 'star/master' into movement 2011-01-18 15:15:00 +01:00
Marc Zinnschlag
b48a5084be added NPC stances 2011-01-18 10:45:29 +01:00
Star-Demon
09023bb853 Toggle now toggles, conventions... 2011-01-18 00:16:01 -05:00
Star-Demon
962b8c9781 Cleaned up inputmanager, tightened up player.exectueAutoMove() 2011-01-17 16:36:44 -05:00
Star-Demon
1bc9a46c6b Cleaned up and changed executeAutoMove() 2011-01-17 15:48:12 -05:00
Star-Demon
90e6029bad Fixed object reference error in player gets 2011-01-16 13:45:54 -05:00
Star-Demon
81c0909dbf Player constructor now inits new variables. 2011-01-16 12:39:54 -05:00
Star-Demon
1a56ef9a67 More AutoMove, now including walking - ready for a look and then test 2011-01-16 11:05:03 -05:00
Star-Demon
5aec3815fd The player should now be able to run AND walk... 2011-01-16 10:47:03 -05:00
Star-Demon
f96f53484c More AutoMove stuff, Sneak bools, cleaning 2011-01-16 10:25:33 -05:00
Star-Demon
bfcfcecab6 Most of AutoMove finished - just needs some speed in Player class. 2011-01-14 09:52:28 -05:00
Jan-Peter Nilsson
429775d485 Store configuration in /etc/openmw/ and ~/.openmw/ on linux 
Requires new openengine version.
 2011-01-12 18:18:06 +01:00
Marc Zinnschlag
46a8ccc2ff changed collision mode instruction from enable/disable to toggle 2011-01-09 21:07:27 +01:00
Marc Zinnschlag
42ef7a61a0 Merge branch 'script' 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwworld/world.cpp
	apps/openmw/mwworld/world.hpp
 2011-01-09 20:56:21 +01:00
Marc Zinnschlag
bb34f6e7fc added Enable/DisableCollision instructions 2011-01-09 20:44:17 +01:00
Marc Zinnschlag
f01a3d5e35 split Player class into a MWWorld and a MWRender component 2011-01-08 15:11:37 +01:00
Marc Zinnschlag
4f51391003 general player class cleanup 2011-01-06 10:07:01 +01:00
Pieter van der Kloet
dd4d022301 Converted all tabs to four spaces 2011-01-05 22:18:21 +01:00
Marc Zinnschlag
4a12be11bf moved PlayerPos class from MWRender to MWWorld and renamed it to Player 2011-01-04 15:58:22 +01:00
Jason Hooks
a038c67e5a Preliminary region sound framework2 2010-11-07 12:51:59 -05:00
Jason Hooks
cab2341259 Preliminary region sound framework 2010-11-06 13:11:09 -04:00
Jan Borsodi
1907aeb6c6 The game mode is now properly restored once a dialog is finished. Previously the game mode was only set in the window manager but it has to go through the input manager firs to get correct input state. Also updated the gui script commands to also use the input manager and not the window manager. 
At some point the gui mode code should be moved to a class that handles all game mode (engine?).
 2010-09-15 14:48:19 +02:00
Marc Zinnschlag
814d721e33 build external cell names from name of region instead of from internal region id 2010-09-11 15:12:42 +02:00
Marc Zinnschlag
db2b238328 adjusted coordinates for coc/coe for exteriors (place player in the middle of the cell instead of at the border) 2010-09-11 12:21:55 +02:00
Marc Zinnschlag
5f84b680af implemented exterior coc 2010-09-11 11:55:28 +02:00
Marc Zinnschlag
1dc805d0d4 Merge branch 'master' into exterior 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2010-09-08 15:38:19 +02:00
Nicolay Korslund
d911653846 Merge with athile's WIP windows build 2010-09-02 12:55:27 +02:00
Marc Zinnschlag
459dd82896 implemented locking/unlocking for doors (can not be invoked by user interaction yet) 2010-08-30 11:56:55 +02:00
athile
d955a0efc4 WIP Windows build 2010-08-30 02:12:54 +01:00
Marc Zinnschlag
07c06acc08 implemented loading of 3x3 exterior cell grid 2010-08-25 11:50:13 +02:00
Marc Zinnschlag
bdb5749b57 temporarily removed statics from raycast test (makes object activation easier by removing inactive obstacles, that overlap the AABB of the object) 2010-08-25 09:19:15 +02:00
Marc Zinnschlag
9e8251e6b4 finally got rid of the nasty coordinates bug 2010-08-22 21:30:48 +02:00
Marc Zinnschlag
0fce360908 more refactoring 2010-08-22 20:55:22 +02:00
Marc Zinnschlag
033c771be8 load/unload cells while player is moving around in the exteriors 2010-08-21 12:41:59 +02:00
Marc Zinnschlag
0d20719158 re-routed player movement through MWWorld::World 2010-08-21 12:31:04 +02:00
Marc Zinnschlag
fe3b6230fc refactored cell unloading 2010-08-21 11:43:07 +02:00
Marc Zinnschlag
bdd5e2f064 modified teleport action to support exteriors; coordinates are wrong here too 2010-08-20 14:56:26 +02:00
Marc Zinnschlag
0111631ee9 very early implementation of exterior rendering 2010-08-20 13:33:03 +02:00
Marc Zinnschlag
3b49d6c826 added NPC stats 2010-08-19 12:49:13 +02:00
Marc Zinnschlag
2cfe5f0697 Merge branch 'master' into dialogue 
Conflicts:
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/creature.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
	apps/openmw/mwworld/class.cpp
	apps/openmw/mwworld/class.hpp
 2010-08-18 09:25:07 +02:00
Marc Zinnschlag
5543c84586 bug-fixes: actors were registered twice at cell change; disabled references were rendered at cell change 2010-08-14 21:58:54 +02:00
Marc Zinnschlag
6f28bd9adf handle sounds when enabling/disabling 2010-08-14 11:39:32 +02:00
Marc Zinnschlag
d57c984517 added enable and disable functions to class hierarchy; fixed a bug regarding actors in cellings being actived 2010-08-14 11:27:13 +02:00
Marc Zinnschlag
4649d7fa41 stop sounds on cell change 2010-08-14 09:29:38 +02:00
Marc Zinnschlag
de2eeb4cde integrated insertObject function into class hierarchy 2010-08-14 09:20:47 +02:00
Marc Zinnschlag
2acfe22975 added test for actor ID 2010-08-08 14:28:35 +02:00
Marc Zinnschlag
8086933282 Merge branch 'master' into dialogue 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/creature.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
 2010-08-08 14:14:43 +02:00
Marc Zinnschlag
8d85211fa1 modified Npc and Creature class to let them store a copy of their own ID 2010-08-08 14:09:09 +02:00
Marc Zinnschlag
7afc8ffd2e Merge branch 'container' 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/creature.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
 2010-08-07 20:33:07 +02:00
Marc Zinnschlag
2eee3d32f1 fixed World::disable function 2010-08-07 20:29:10 +02:00
Marc Zinnschlag
a7fe28ecbe implemented take action 2010-08-07 20:25:17 +02:00
Marc Zinnschlag
589f8b5ede added GetItemCount 2010-08-07 16:21:07 +02:00
Marc Zinnschlag
3ea85b4619 added AddItem instruction 2010-08-07 15:11:31 +02:00
Marc Zinnschlag
0a60bde834 added insertIntoContainer function to class hierarchy 2010-08-06 22:20:20 +02:00
Marc Zinnschlag
b5d59edd44 re-routed talk action from gui to dialogue manager (master branch should not incooperate this change, because the dialogue window implementer will need the original code for testing) 2010-08-06 19:25:26 +02:00
Marc Zinnschlag
d42747e85b Merge branch 'master' into dialogue 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/creature.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
 2010-08-06 19:20:05 +02:00
Marc Zinnschlag
c806415f08 changed namespace, class and function names to ensure consistent spelling 2010-08-06 19:16:44 +02:00
Marc Zinnschlag
09c42589cc implemented npc/creature activation (enters dialog gui mode for now) 2010-08-06 18:15:46 +02:00
Marc Zinnschlag
8045320ac9 added dialog manager 2010-08-06 18:01:34 +02:00
Marc Zinnschlag
10a63b10b5 Merge branch 'master' into container 
Conflicts:
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/container.hpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/creature.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
	apps/openmw/mwworld/class.cpp
	apps/openmw/mwworld/class.hpp
 2010-08-06 14:37:53 +02:00
Marc Zinnschlag
c883921af3 minor cell change fix 2010-08-05 15:57:06 +02:00
Marc Zinnschlag
7a313f24ab integrated activation into script system 2010-08-05 15:40:03 +02:00
Marc Zinnschlag
87c84e6fcd limited activation range according to GMST settings 2010-08-05 13:29:49 +02:00
Marc Zinnschlag
ee7570f7e7 added containerstore 2010-08-04 14:37:23 +02:00
Marc Zinnschlag
e0a3b1b1db implemented item count 2010-08-04 14:04:22 +02:00