gugus
|
7a28c9f3aa
|
fix the door bug
|
14 years ago |
gugus
|
0cc94c81d4
|
Merge remote branch 'upstream/collision' into collision
|
14 years ago |
Marc Zinnschlag
|
7b5d24c853
|
fixed a bug in phyiscs update code
|
14 years ago |
gugus
|
3dddcbd958
|
fix a camera problem and increase player speed
|
14 years ago |
gugus
|
2aee958789
|
Not sure about this commit: the PhysicEngine was initialized twice...
|
14 years ago |
Marc Zinnschlag
|
72a84356e2
|
added tcg/tcb instructions (toggle collision rendering); not fully working yet (problem in OpenEngine or MWScene)
|
14 years ago |
Marc Zinnschlag
|
f1bfca7c7c
|
player class cleanup
|
14 years ago |
Marc Zinnschlag
|
eb93ef68f1
|
fixed collision mode interface and redirected collision mode script instruction from Player class to MWScene class
|
14 years ago |
Marc Zinnschlag
|
1e9dc4b435
|
de-Windownizing and some build-fixes
|
14 years ago |
gugus
|
ff941b5963
|
add physic
|
14 years ago |
Marc Zinnschlag
|
ef7a06dea5
|
player was not registered at mwscene (for physics)
|
14 years ago |
Marc Zinnschlag
|
9807e7dadc
|
simplified actor-related physics interface to mwscene
|
14 years ago |
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
|
14 years ago |
Marc Zinnschlag
|
9c6bc4975c
|
attached camera to a scene node
|
14 years ago |
Marc Zinnschlag
|
9a3158675a
|
reworked cell changing mechanism
|
14 years ago |
Marc Zinnschlag
|
f773cf27cb
|
replaced old movement input system
|
14 years ago |
Marc Zinnschlag
|
4468a2b6a8
|
added movement data to MW references; added movement interface to MWWorld::Class
|
14 years ago |
Marc Zinnschlag
|
ca44b3640a
|
pasing movement data from mwmechanics to mwscene and fixed a very stupid interface bug
|
14 years ago |
Marc Zinnschlag
|
40d772b33a
|
call doPhysics function once per frame
|
14 years ago |
Marc Zinnschlag
|
6a14ea8ec3
|
handle physics during player changing cells
|
14 years ago |
Marc Zinnschlag
|
5486c70edf
|
connected object-manipulator functions in world to physics interface
|
14 years ago |
Marc Zinnschlag
|
9a5a6eac2b
|
stop reporting changes originating from physics system back to physics system
|
14 years ago |
Marc Zinnschlag
|
36cb10572a
|
fixed tab problem
|
14 years ago |
Marc Zinnschlag
|
eb5e4427c1
|
Merge remote branch 'star/master' into movement
|
14 years ago |
Marc Zinnschlag
|
b48a5084be
|
added NPC stances
|
14 years ago |
Star-Demon
|
09023bb853
|
Toggle now toggles, conventions...
|
14 years ago |
Star-Demon
|
962b8c9781
|
Cleaned up inputmanager, tightened up player.exectueAutoMove()
|
14 years ago |
Star-Demon
|
1bc9a46c6b
|
Cleaned up and changed executeAutoMove()
|
14 years ago |
Star-Demon
|
90e6029bad
|
Fixed object reference error in player gets
|
14 years ago |
Star-Demon
|
81c0909dbf
|
Player constructor now inits new variables.
|
14 years ago |
Star-Demon
|
1a56ef9a67
|
More AutoMove, now including walking - ready for a look and then test
|
14 years ago |
Star-Demon
|
5aec3815fd
|
The player should now be able to run AND walk...
|
14 years ago |
Star-Demon
|
f96f53484c
|
More AutoMove stuff, Sneak bools, cleaning
|
14 years ago |
Star-Demon
|
bfcfcecab6
|
Most of AutoMove finished - just needs some speed in Player class.
|
14 years ago |
Jan-Peter Nilsson
|
429775d485
|
Store configuration in /etc/openmw/ and ~/.openmw/ on linux
Requires new openengine version.
|
14 years ago |
Marc Zinnschlag
|
46a8ccc2ff
|
changed collision mode instruction from enable/disable to toggle
|
14 years ago |
Marc Zinnschlag
|
42ef7a61a0
|
Merge branch 'script'
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwworld/world.cpp
apps/openmw/mwworld/world.hpp
|
14 years ago |
Marc Zinnschlag
|
bb34f6e7fc
|
added Enable/DisableCollision instructions
|
14 years ago |
Marc Zinnschlag
|
f01a3d5e35
|
split Player class into a MWWorld and a MWRender component
|
14 years ago |
Marc Zinnschlag
|
4f51391003
|
general player class cleanup
|
14 years ago |
Pieter van der Kloet
|
dd4d022301
|
Converted all tabs to four spaces
|
14 years ago |
Marc Zinnschlag
|
4a12be11bf
|
moved PlayerPos class from MWRender to MWWorld and renamed it to Player
|
14 years ago |
Jason Hooks
|
a038c67e5a
|
Preliminary region sound framework2
|
14 years ago |
Jason Hooks
|
cab2341259
|
Preliminary region sound framework
|
14 years ago |
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?).
|
15 years ago |
Marc Zinnschlag
|
814d721e33
|
build external cell names from name of region instead of from internal region id
|
15 years ago |
Marc Zinnschlag
|
db2b238328
|
adjusted coordinates for coc/coe for exteriors (place player in the middle of the cell instead of at the border)
|
15 years ago |
Marc Zinnschlag
|
5f84b680af
|
implemented exterior coc
|
15 years ago |
Marc Zinnschlag
|
1dc805d0d4
|
Merge branch 'master' into exterior
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
|
15 years ago |
Nicolay Korslund
|
d911653846
|
Merge with athile's WIP windows build
|
15 years ago |
Marc Zinnschlag
|
459dd82896
|
implemented locking/unlocking for doors (can not be invoked by user interaction yet)
|
15 years ago |
athile
|
d955a0efc4
|
WIP Windows build
|
15 years ago |
Marc Zinnschlag
|
07c06acc08
|
implemented loading of 3x3 exterior cell grid
|
15 years ago |
Marc Zinnschlag
|
bdb5749b57
|
temporarily removed statics from raycast test (makes object activation easier by removing inactive obstacles, that overlap the AABB of the object)
|
15 years ago |
Marc Zinnschlag
|
9e8251e6b4
|
finally got rid of the nasty coordinates bug
|
15 years ago |
Marc Zinnschlag
|
0fce360908
|
more refactoring
|
15 years ago |
Marc Zinnschlag
|
033c771be8
|
load/unload cells while player is moving around in the exteriors
|
15 years ago |
Marc Zinnschlag
|
0d20719158
|
re-routed player movement through MWWorld::World
|
15 years ago |
Marc Zinnschlag
|
fe3b6230fc
|
refactored cell unloading
|
15 years ago |
Marc Zinnschlag
|
bdd5e2f064
|
modified teleport action to support exteriors; coordinates are wrong here too
|
15 years ago |
Marc Zinnschlag
|
0111631ee9
|
very early implementation of exterior rendering
|
15 years ago |
Marc Zinnschlag
|
3b49d6c826
|
added NPC stats
|
15 years ago |
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
|
15 years ago |
Marc Zinnschlag
|
5543c84586
|
bug-fixes: actors were registered twice at cell change; disabled references were rendered at cell change
|
15 years ago |
Marc Zinnschlag
|
6f28bd9adf
|
handle sounds when enabling/disabling
|
15 years ago |
Marc Zinnschlag
|
d57c984517
|
added enable and disable functions to class hierarchy; fixed a bug regarding actors in cellings being actived
|
15 years ago |
Marc Zinnschlag
|
4649d7fa41
|
stop sounds on cell change
|
15 years ago |
Marc Zinnschlag
|
de2eeb4cde
|
integrated insertObject function into class hierarchy
|
15 years ago |
Marc Zinnschlag
|
2acfe22975
|
added test for actor ID
|
15 years ago |
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
|
15 years ago |
Marc Zinnschlag
|
8d85211fa1
|
modified Npc and Creature class to let them store a copy of their own ID
|
15 years ago |
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
|
15 years ago |
Marc Zinnschlag
|
2eee3d32f1
|
fixed World::disable function
|
15 years ago |
Marc Zinnschlag
|
a7fe28ecbe
|
implemented take action
|
15 years ago |
Marc Zinnschlag
|
589f8b5ede
|
added GetItemCount
|
15 years ago |
Marc Zinnschlag
|
3ea85b4619
|
added AddItem instruction
|
15 years ago |
Marc Zinnschlag
|
0a60bde834
|
added insertIntoContainer function to class hierarchy
|
15 years ago |
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)
|
15 years ago |
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
|
15 years ago |
Marc Zinnschlag
|
c806415f08
|
changed namespace, class and function names to ensure consistent spelling
|
15 years ago |
Marc Zinnschlag
|
09c42589cc
|
implemented npc/creature activation (enters dialog gui mode for now)
|
15 years ago |
Marc Zinnschlag
|
8045320ac9
|
added dialog manager
|
15 years ago |
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
|
15 years ago |
Marc Zinnschlag
|
c883921af3
|
minor cell change fix
|
15 years ago |
Marc Zinnschlag
|
7a313f24ab
|
integrated activation into script system
|
15 years ago |
Marc Zinnschlag
|
87c84e6fcd
|
limited activation range according to GMST settings
|
15 years ago |
Marc Zinnschlag
|
ee7570f7e7
|
added containerstore
|
15 years ago |
Marc Zinnschlag
|
e0a3b1b1db
|
implemented item count
|
15 years ago |
Marc Zinnschlag
|
052d049a6c
|
integrated name-lookup into ape's code; added missing implementation of a function
|
15 years ago |
Marc Zinnschlag
|
5827591d05
|
Merge commit 'ape/master'
Conflicts:
apps/openmw/mwworld/world.hpp
|
15 years ago |
Marc Zinnschlag
|
69ea00455f
|
Merge branch 'poly'
Conflicts:
apps/openmw/mwworld/world.cpp
|
15 years ago |
Armin Preiml
|
adc209d135
|
Implemented the faced handle method to the engine. Faced handles will
be written to stdout every 10th frame.
|
15 years ago |
Marc Zinnschlag
|
d1c000313f
|
added getPtr function that works via Ogre handle
|
15 years ago |
Marc Zinnschlag
|
002345270b
|
implemented teleport doors (only for the player for now)
|
15 years ago |
Marc Zinnschlag
|
7e5ddae3b3
|
modified action interface to allow other actors besides the player
|
15 years ago |
Marc Zinnschlag
|
c38b02bd5c
|
added action interface
|
15 years ago |
Marc Zinnschlag
|
239498bcd4
|
added getName function
|
15 years ago |
Marc Zinnschlag
|
f50ced4616
|
added missing record classes
|
15 years ago |
Marc Zinnschlag
|
0851044fa6
|
removed superfluous includes
|
15 years ago |
Marc Zinnschlag
|
bfc282779b
|
added item health interface
|
15 years ago |
Marc Zinnschlag
|
93754b2851
|
moved some includes around
|
15 years ago |
Marc Zinnschlag
|
33b6a0b800
|
moved concrete record classes to separate sub-system (mwclass)
|
15 years ago |
Marc Zinnschlag
|
9d6e658e05
|
previous commit was missing some files
|
15 years ago |
Marc Zinnschlag
|
ca842d1b4d
|
reimplemented access to creature stats via new class interface
|
15 years ago |
Marc Zinnschlag
|
a70c3876a2
|
added foundation for esm record class hierarchy
|
15 years ago |
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.
|
15 years ago |
Marc Zinnschlag
|
455bcf3b01
|
added get, set and mod instructions for health, magicka and fatigue
|
15 years ago |
Marc Zinnschlag
|
63f686ffab
|
update attribute values in stats window
|
15 years ago |
Marc Zinnschlag
|
1d9df6cf40
|
implemented handling of disabled actors
|
15 years ago |
Marc Zinnschlag
|
3d987f1b7a
|
register actors in active cells with MechanicsManager
|
15 years ago |
Marc Zinnschlag
|
8bbcbc05d5
|
removed duplicate code from World class
|
15 years ago |
Marc Zinnschlag
|
5d40055b44
|
added comparison operators for Ptr class
|
15 years ago |
Marc Zinnschlag
|
77a0215d53
|
added get-, set- and mod-instructions for attributes
|
15 years ago |
Marc Zinnschlag
|
e43b475ade
|
changed PlayerPos::getPlayer return type from CellRef to Ptr
|
15 years ago |
Marc Zinnschlag
|
fa50bbc77b
|
added a CellStore pointer to PlayerPos
|
15 years ago |
Marc Zinnschlag
|
04b86f7e1e
|
added first set of character and creature stats (attributes)
|
15 years ago |
Marc Zinnschlag
|
61d09c4768
|
read attribute names from GMST instead of using hard-coded names (doesn't fully work yet, because of encoding issues)
|
15 years ago |
Marc Zinnschlag
|
0e641f1246
|
implemented coc instruction
|
15 years ago |
Marc Zinnschlag
|
2d8fbc6e55
|
implemented month variable and fixed some day/gamehour bugs
|
15 years ago |
Marc Zinnschlag
|
77e03f0f31
|
fixed global variable search to properly handle injected variables (DaysPassed)
|
15 years ago |
Marc Zinnschlag
|
e670753497
|
fixed handling of global variables of type short
|
15 years ago |
Marc Zinnschlag
|
c8a18b7d70
|
use global variable timescale instead of fixed factor
|
15 years ago |
Marc Zinnschlag
|
f3b70e05a9
|
added sky-related script functions and instructions
|
15 years ago |
Marc Zinnschlag
|
d27c548710
|
implemented passing of time
|
15 years ago |
Marc Zinnschlag
|
083b11c740
|
moved global variable handling into a separate class
|
15 years ago |
Nicolay Korslund
|
c84672a560
|
Added MyGUI to OpenMW, fully working (with events and script hooks)
|
15 years ago |
Nicolay Korslund
|
13d3f9c87e
|
Integrated OpenEngine, replaces entire components/engine/ directory.
|
15 years ago |
Marc Zinnschlag
|
8134c5b760
|
integrated CellStore pointer into Ptr class
|
15 years ago |
Marc Zinnschlag
|
592fa84e2d
|
added Enable, Disable, GetDisabled
|
15 years ago |
Marc Zinnschlag
|
2c63d67ceb
|
added gui manager skeleton and a cmake fix
|
15 years ago |
Nicolay Korslund
|
359f2903d7
|
Merged athile and zinnschlag
|
15 years ago |
Marc Zinnschlag
|
9d73718ec1
|
added GetSecondsPassed
|
15 years ago |
Marc Zinnschlag
|
cc0c21cf35
|
added function to retrieve a live cell ref via name
|
15 years ago |
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.
|
15 years ago |
Marc Zinnschlag
|
a61b2c39f0
|
added scriptrunning/startscript/stopscript; sorted out more case problems
|
15 years ago |
Marc Zinnschlag
|
df8f8a315c
|
added missing part of global variable implementation (storage and interpreter context)
|
15 years ago |
Marc Zinnschlag
|
4482884eb5
|
implemented global script execution
|
15 years ago |
Marc Zinnschlag
|
3fae68b403
|
added unifying LiveCellRef pointer class
|
15 years ago |
Marc Zinnschlag
|
d51e6fb7c4
|
second part of refactoring
|
15 years ago |