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 |
|
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 |
|
Marc Zinnschlag
|
c38b02bd5c
|
added action interface
|
2010-08-03 18:20:15 +02:00 |
|
Marc Zinnschlag
|
239498bcd4
|
added getName function
|
2010-08-03 17:11:41 +02:00 |
|
Marc Zinnschlag
|
f50ced4616
|
added missing record classes
|
2010-08-03 15:24:44 +02:00 |
|
Marc Zinnschlag
|
0851044fa6
|
removed superfluous includes
|
2010-08-03 14:43:14 +02:00 |
|
Marc Zinnschlag
|
bfc282779b
|
added item health interface
|
2010-08-03 14:14:04 +02:00 |
|
Marc Zinnschlag
|
93754b2851
|
moved some includes around
|
2010-08-03 13:32:37 +02:00 |
|
Marc Zinnschlag
|
33b6a0b800
|
moved concrete record classes to separate sub-system (mwclass)
|
2010-08-03 13:17:31 +02:00 |
|
Marc Zinnschlag
|
9d6e658e05
|
previous commit was missing some files
|
2010-08-03 13:03:08 +02:00 |
|
Marc Zinnschlag
|
ca842d1b4d
|
reimplemented access to creature stats via new class interface
|
2010-08-03 11:49:12 +02:00 |
|
Marc Zinnschlag
|
a70c3876a2
|
added foundation for esm record class hierarchy
|
2010-08-03 11:14:57 +02:00 |
|
Armin Preiml
|
389a28a836
|
Added const reference to esmstore to some methods down to CellRenderImp.
Body part mesh names will be now obtained by the bodypart id.
|
2010-08-02 09:59:59 +02:00 |
|
Marc Zinnschlag
|
455bcf3b01
|
added get, set and mod instructions for health, magicka and fatigue
|
2010-07-28 18:27:46 +02:00 |
|
Marc Zinnschlag
|
63f686ffab
|
update attribute values in stats window
|
2010-07-27 15:59:41 +02:00 |
|
Marc Zinnschlag
|
1d9df6cf40
|
implemented handling of disabled actors
|
2010-07-27 14:43:46 +02:00 |
|
Marc Zinnschlag
|
3d987f1b7a
|
register actors in active cells with MechanicsManager
|
2010-07-27 14:05:05 +02:00 |
|
Marc Zinnschlag
|
8bbcbc05d5
|
removed duplicate code from World class
|
2010-07-27 13:09:35 +02:00 |
|
Marc Zinnschlag
|
5d40055b44
|
added comparison operators for Ptr class
|
2010-07-27 12:04:52 +02:00 |
|
Marc Zinnschlag
|
77a0215d53
|
added get-, set- and mod-instructions for attributes
|
2010-07-26 23:09:37 +02:00 |
|
Marc Zinnschlag
|
e43b475ade
|
changed PlayerPos::getPlayer return type from CellRef to Ptr
|
2010-07-26 13:09:44 +02:00 |
|
Marc Zinnschlag
|
fa50bbc77b
|
added a CellStore pointer to PlayerPos
|
2010-07-26 12:59:50 +02:00 |
|
Marc Zinnschlag
|
04b86f7e1e
|
added first set of character and creature stats (attributes)
|
2010-07-26 12:52:32 +02:00 |
|
Marc Zinnschlag
|
61d09c4768
|
read attribute names from GMST instead of using hard-coded names (doesn't fully work yet, because of encoding issues)
|
2010-07-26 11:15:38 +02:00 |
|
Marc Zinnschlag
|
0e641f1246
|
implemented coc instruction
|
2010-07-22 12:29:23 +02:00 |
|
Marc Zinnschlag
|
2d8fbc6e55
|
implemented month variable and fixed some day/gamehour bugs
|
2010-07-22 11:48:27 +02:00 |
|
Marc Zinnschlag
|
77e03f0f31
|
fixed global variable search to properly handle injected variables (DaysPassed)
|
2010-07-21 15:01:35 +02:00 |
|
Marc Zinnschlag
|
e670753497
|
fixed handling of global variables of type short
|
2010-07-21 14:48:03 +02:00 |
|
Marc Zinnschlag
|
c8a18b7d70
|
use global variable timescale instead of fixed factor
|
2010-07-21 14:10:52 +02:00 |
|
Marc Zinnschlag
|
f3b70e05a9
|
added sky-related script functions and instructions
|
2010-07-18 19:48:02 +02:00 |
|
Marc Zinnschlag
|
d27c548710
|
implemented passing of time
|
2010-07-18 18:29:16 +02:00 |
|
Marc Zinnschlag
|
083b11c740
|
moved global variable handling into a separate class
|
2010-07-18 16:48:01 +02:00 |
|
Nicolay Korslund
|
c84672a560
|
Added MyGUI to OpenMW, fully working (with events and script hooks)
|
2010-07-17 19:38:32 +02:00 |
|
Nicolay Korslund
|
13d3f9c87e
|
Integrated OpenEngine, replaces entire components/engine/ directory.
|
2010-07-16 14:56:14 +02:00 |
|
Marc Zinnschlag
|
8134c5b760
|
integrated CellStore pointer into Ptr class
|
2010-07-10 13:19:04 +02:00 |
|
Marc Zinnschlag
|
592fa84e2d
|
added Enable, Disable, GetDisabled
|
2010-07-09 16:07:03 +02:00 |
|
Marc Zinnschlag
|
2c63d67ceb
|
added gui manager skeleton and a cmake fix
|
2010-07-07 18:48:06 +02:00 |
|
Nicolay Korslund
|
359f2903d7
|
Merged athile and zinnschlag
|
2010-07-07 09:46:11 +02:00 |
|
Marc Zinnschlag
|
9d73718ec1
|
added GetSecondsPassed
|
2010-07-06 12:06:50 +02:00 |
|
Marc Zinnschlag
|
cc0c21cf35
|
added function to retrieve a live cell ref via name
|
2010-07-05 12:09:04 +02:00 |
|
athile
|
5fe4313b95
|
Various Windows fixes to CMake, compile errors, and a few warnings. Also made the command server optional and disabled by default since it is not currently working correctly on Linux.
|
2010-07-04 20:17:10 -07:00 |
|
Marc Zinnschlag
|
a61b2c39f0
|
added scriptrunning/startscript/stopscript; sorted out more case problems
|
2010-07-04 16:00:32 +02:00 |
|
Marc Zinnschlag
|
df8f8a315c
|
added missing part of global variable implementation (storage and interpreter context)
|
2010-07-04 13:33:33 +02:00 |
|
Marc Zinnschlag
|
4482884eb5
|
implemented global script execution
|
2010-07-04 10:43:34 +02:00 |
|
Marc Zinnschlag
|
3fae68b403
|
added unifying LiveCellRef pointer class
|
2010-07-03 17:46:55 +02:00 |
|
Marc Zinnschlag
|
d51e6fb7c4
|
second part of refactoring
|
2010-07-03 15:41:20 +02:00 |
|