Commit graph

94 commits

Author SHA1 Message Date
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
Marc Zinnschlag
052d049a6c integrated name-lookup into ape's code; added missing implementation of a function 2010-08-03 22:06:48 +02:00
Marc Zinnschlag
5827591d05 Merge commit 'ape/master'
Conflicts:
	apps/openmw/mwworld/world.hpp
2010-08-03 21:52:19 +02:00
Marc Zinnschlag
69ea00455f Merge branch 'poly'
Conflicts:
	apps/openmw/mwworld/world.cpp
2010-08-03 21:43:05 +02:00
Armin Preiml
adc209d135 Implemented the faced handle method to the engine. Faced handles will
be written to stdout every 10th frame.
2010-08-03 20:40:45 +02:00
Marc Zinnschlag
d1c000313f added getPtr function that works via Ogre handle 2010-08-03 20:01:52 +02:00
Marc Zinnschlag
002345270b implemented teleport doors (only for the player for now) 2010-08-03 18:44:52 +02:00
Marc Zinnschlag
7e5ddae3b3 modified action interface to allow other actors besides the player 2010-08-03 18:22:01 +02:00