Commit Graph

22796 Commits (master)

Author SHA1 Message Date
Marc Zinnschlag 594d3cef4f added test for actor class 15 years ago
Marc Zinnschlag 11bc131417 added test for global variables 15 years ago
Marc Zinnschlag fbe11956a6 added dummy test for select type '1' (Function); always yields false for now 15 years ago
Marc Zinnschlag c7fab9aad6 added test for actor race 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 8f4359db08 added test for select type '3' (Local) 15 years ago
Marc Zinnschlag a25c7bb2c0 added test for cell name 15 years ago
Marc Zinnschlag 9d25e74a05 on dialogue start run through the info records of dialogue record 'hello'; currently no testing done -> the first info recrod will match 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 aa637cb9d4 added RemoveItem 15 years ago
Marc Zinnschlag db24a55e36 added sanity check for AddItem arguments 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 d6541d4f3c changed file 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 8e6a765603 fixed a stats bug (reducing modified stats via setModified didn't work correctly 15 years ago
Marc Zinnschlag c883921af3 minor cell change fix 15 years ago
Marc Zinnschlag 1902dfb7b2 added activate instruction 15 years ago
Marc Zinnschlag 15124601aa stop local scripts from being run twice in case of activation 15 years ago
Marc Zinnschlag 7a313f24ab integrated activation into script system 15 years ago
Marc Zinnschlag f630157bf8 implemented basic object activation 15 years ago
Marc Zinnschlag 2d695cc806 routed activate signal from input sub-system to engine-class 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 7ba6bdb56c prepared InterpreterContext for activation implementation 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
Armin Preiml c000bfb43d moved object focus code to mwscene 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
Armin Preiml b50c7e0788 Some experimental implementation of a RaySceneQuery. 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
Nicolay Korslund 69cc88bcaf Merge branch 'master' of http://github.com/apreiml/openmw 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
Armin Preiml fb3bf91dfb Added inserting of NPC meshes. Only heads and bodys and not well placed for now. 15 years ago
Marc Zinnschlag b584215680 moved stats label <-> GMST text mapping from mwmechanics to mwgui; added missing stats window labels 15 years ago
Marc Zinnschlag 9fafac1ef8 removed encoding workaround for attribute names 15 years ago
Marc Zinnschlag 00c0a50f7f Merge commit 'ape/master' 15 years ago
Armin Preiml f3ee9ced5c Added cmake file for the iconv library and extended relevant
cmake files to use it.
Added convertToUTF8 to esm_reader. getString(int size) uses this
method now.
15 years ago
Marc Zinnschlag ebedef49c9 removed a special case, that wasn't a special case (MW Scripting for Dummies seems to be wrong here) 15 years ago
Marc Zinnschlag 6e3fdc5816 added special case implementation for GetHealth (max weapon and armor health) 15 years ago
Marc Zinnschlag 913d55a44e added GetHealthGetRatio 15 years ago
Marc Zinnschlag a542ca22fd added ModCurrentHealth, ModCurrentMagicka, ModCurrentFatigue 15 years ago
Marc Zinnschlag 3b6b343c9b added GUI update for health, magicka and fatigue 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 335425bb12 added MechanicsManager::update function (doesn't update anything yet) 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 aa4e79c0de fixed a reclist bug induced a couple of commits ago 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 ecd05fd15e fixed an include guard 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
Nicolay Korslund 532ccbd1f8 Killed clientconsole, mwcompiler, mwinterpreter and command server 15 years ago
Marc Zinnschlag f693a2942e fixed handling of cell changes during local and global script execution 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
Nicolay Korslund ff64c1fbf0 Merge branch 'master' of http://github.com/zinnschlag/openmw 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 74f3eb6ad4 stop time while GUI is up 15 years ago
Marc Zinnschlag c8a18b7d70 use global variable timescale instead of fixed factor 15 years ago
Nicolay Korslund f87810ce7a Moved esmtool to apps/ 15 years ago
Marc Zinnschlag cf7150e585 implemented naked expressions in lineparser (used in console; result is send through messagebox interface) 15 years ago
Marc Zinnschlag a87175446c disable windows on startup when --new-game is used 15 years ago
Marc Zinnschlag 6e3aacca08 CMakeLists fix 15 years ago
Marc Zinnschlag 281f2d1136 added script interpreter for console 15 years ago
Marc Zinnschlag d72ed19460 implemented script compiler for console 15 years ago
Nicolay Korslund 5ff9344a87 Finished console GUI window 15 years ago
Nicolay Korslund c61212202b Moved mwgui/ back to apps/openmw/. Fixed mouse position bug. 15 years ago
Marc Zinnschlag a9825f92ee moved installOpcodes function from scriptmanager to extensions 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 608ddd0a58 Splitt inputmanager into hpp/cpp 15 years ago
Nicolay Korslund 5472a8c760 Killed mygui_dev 15 years ago
Nicolay Korslund c84672a560 Added MyGUI to OpenMW, fully working (with events and script hooks) 15 years ago
Nicolay Korslund 4d74f85ae0 Moved mwgui manager to components, ready for testing 15 years ago
Nicolay Korslund 4eb2863db4 Added input to apps/mygui_dev/ 15 years ago
Nicolay Korslund 13d3f9c87e Integrated OpenEngine, replaces entire components/engine/ directory. 15 years ago
Nicolay Korslund 186bf8c1a1 Merge branch 'master' into oengine 15 years ago
Nicolay Korslund 259908013e Started integrating OE (NO-COMPILE) 15 years ago
Marc Zinnschlag c9a6335918 replaced flat Type_Data stack with a union 15 years ago
Marc Zinnschlag 8134c5b760 integrated CellStore pointer into Ptr class 15 years ago
Nicolay Korslund 064e3e2e23 Merge branch 'master' of http://github.com/zinnschlag/openmw 15 years ago
Marc Zinnschlag 7f48c64efe implemented sound related script instructions and functions with explicit references 15 years ago
Marc Zinnschlag 31b4d83fac moved sound extensions from mwsound to mwscript (reduces coupling between openmw components) 15 years ago
Marc Zinnschlag d8c99c6ce3 Merge commit 'upstream/master' 15 years ago
Marc Zinnschlag 69e607e140 implemented getdistance with explicit references 15 years ago
Marc Zinnschlag c37b007be0 added verification for explicit references (check if the given ID exists) 15 years ago
Marc Zinnschlag d4ac3b506e implemented enable, disable and getdisabled with explicit references 15 years ago
Marc Zinnschlag 592fa84e2d added Enable, Disable, GetDisabled 15 years ago
Nicolay Korslund 6966c66091 Gave apps/openmw/ its own CMakeLists.txt 15 years ago
Nicolay Korslund 9c839e220e Moved GUI stuff into components 15 years ago
Nicolay Korslund b2d54a619e Implemented all MW window layouts 15 years ago
Nicolay Korslund 3896fd218a Added stand-alone GUI test, compiles and runs 15 years ago
Nicolay Korslund 4f170b14ea Applied clientconsole build fix from GWater 15 years ago
Marc Zinnschlag 6b3ff8a516 constness fixes 15 years ago
Marc Zinnschlag 0efe4742a6 added script-gui interface and gui-related script instructions 15 years ago
Marc Zinnschlag 2c63d67ceb added gui manager skeleton and a cmake fix 15 years ago
Nicolay Korslund b97def39b3 Minor fixes to Mac stuff 15 years ago
Nicolay Korslund 97ad6592ea Fixed innocent compiler warning in engine.cpp 15 years ago
Nicolay Korslund 2ec96ed7de Merge branch 'master' of http://github.com/ardekantur/openmw 15 years ago
Nicolay Korslund 359f2903d7 Merged athile and zinnschlag 15 years ago
athile a638c330ec Add one more command server fix so it still works correctly on Windows and reeanble the command server by default. 15 years ago
Marc Zinnschlag 9d73718ec1 added GetSecondsPassed 15 years ago
Marc Zinnschlag f5a70abd4b added OnActivate 15 years ago
Marc Zinnschlag b2731c5e26 fix uninitialised variables 15 years ago
Marc Zinnschlag 3df5d377f2 added xbox function 15 years ago
Marc Zinnschlag 34b824cb70 implemented GetDistance function 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
Ardekantur ee6c933156 Merge branch 'master' of git://github.com/korslund/openmw
Conflicts:
	CMakeLists.txt
	apps/openmw/main.cpp
	game/engine.cpp
15 years ago
Marc Zinnschlag a61b2c39f0 added scriptrunning/startscript/stopscript; sorted out more case problems 15 years ago
Marc Zinnschlag 185f8bd56d added random function; global variable fix 15 years ago
Marc Zinnschlag df8f8a315c added missing part of global variable implementation (storage and interpreter context) 15 years ago
Marc Zinnschlag d57e67e722 added global variable handling to compiler context (not working yet because of case problems) 15 years ago
Marc Zinnschlag f9c1548f80 added menumode script function; added global variable handling in compiler and interpreter (openmw context still ignores global variables) 15 years ago
Marc Zinnschlag cdcc244fc5 automatically start start scripts at startup 15 years ago
Marc Zinnschlag 4482884eb5 implemented global script execution 15 years ago
Marc Zinnschlag 530caac39b merged CompilerScriptContext into base class 15 years ago
Marc Zinnschlag 5174679864 another bug-fix and missing documentation added 15 years ago
Marc Zinnschlag 5d46fc869c added missing sound script functionality; various script-related bug-fixes 15 years ago
Marc Zinnschlag eeeb9b09f8 identify LiveCellRefs by ptr instead of render handle 15 years ago
Marc Zinnschlag 3fae68b403 added unifying LiveCellRef pointer class 15 years ago
Marc Zinnschlag d51e6fb7c4 second part of refactoring 15 years ago
Marc Zinnschlag f8cb4c2502 moved sound manager from world to engine (first step of another round of refactoring) 15 years ago
Marc Zinnschlag c12752df4d added sound manager skeleton and sound script functions 15 years ago
Marc Zinnschlag f0c492ae22 added CellChanged script function 15 years ago
Marc Zinnschlag 474b412b47 implemented local script execution 15 years ago
Marc Zinnschlag 8e2732c60e local scripts are now run every frame (running scripts itself is not implemented yet) 15 years ago
Marc Zinnschlag 076b01559f added local script compiling 15 years ago
Marc Zinnschlag 2064c43d89 added script manager (doesn't do anything yet); local scriptes for active cells are passed on to the script manager 15 years ago
Marc Zinnschlag a06b84ac86 added local variables to ref data 15 years ago
Marc Zinnschlag 5c91ba74b8 store ogre handle in ref data 15 years ago
Marc Zinnschlag def0a773bd replaced void * entry in cell store with a generic type 15 years ago
Marc Zinnschlag c7f76f51fb added --debug option and finally cleaned up the merge mess 15 years ago
Marc Zinnschlag 417df63302 partial fix for merge problems 15 years ago
Nicolay Korslund 4a3f6b0ff1 Various fixes to get openmw to compile and run properly 15 years ago
Nicolay Korslund 0de4bb9d6c Merged athile's work 15 years ago
Marc Zinnschlag f8a1a0ab8c improved cell handling; added world.* files (should have been added a few commits ago) 15 years ago
Marc Zinnschlag ea6d342a24 split CellRender into CellRender and CellRenderImp 15 years ago
athile 450542b4b9 Fix Windows line feeds and chdmod 15 years ago
Marc Zinnschlag ce37666dbc factored world class out of main engine class 15 years ago
athile 9b2fa58b88 Add separate CMakeLists.txt files for mwcompiler and mwinterpreter 15 years ago
athile 7cc27d9b66 Add command output string and client/server response. 15 years ago
athile 056194baa2 Merge upstream 15 years ago
athile 7357ea2102 Add simple external console server/client 15 years ago
Marc Zinnschlag 1ad9b234f0 Merge branch 'mwscript'
Conflicts:
	CMakeLists.txt
15 years ago
athile de7087caf4 Move prepareMaster logic into addMaster. Having these separate only introduces the possibility for a bug. 15 years ago
Marc Zinnschlag fac8fb8fcb added return and messagebox statements (messagebox does neither formating nor buttons yet) 15 years ago
Marc Zinnschlag c6a37b2e18 added first batch of opcodes 15 years ago
athile 59a2e8dcf7 Merge upstream 15 years ago
Marc Zinnschlag 770eb14d95 added context for standalone interpreter 15 years ago
Marc Zinnschlag 487a70388f added interpreter framework 15 years ago
Marc Zinnschlag ba847ae9d8 write local variable declarations into a separate file 15 years ago
Marc Zinnschlag a3ad61b4d0 write code file after successfull parsing 15 years ago
Marc Zinnschlag bff0855af0 added parsing for local variable declarations 15 years ago
athile 819c146ad1 Project clean-up: move 'misc' into the platform lib, update CMake to build 'platform' as a lib, and various fixes for Visual Studio compiler warnings 15 years ago
athile 82bbc69453 Only push the far clip plane out if the sky is enabled 15 years ago
athile 7db274f1c5 Sky rendering clean-up and correct resource configuration 15 years ago
Marc Zinnschlag de8a651df4 improved error handling 15 years ago
Marc Zinnschlag a068ca78d7 replaced dummy parser with top level file parser 15 years ago
Marc Zinnschlag d02257ca88 read file to be compiled from command line arguments 15 years ago
athile d67f0c74b0 Merge remote branch 'upstream/master' 15 years ago
Marc Zinnschlag ddcbc8cd62 added tokenizing of MW scripts 15 years ago
Marc Zinnschlag 31e22186ef added mwscript compiler standalone-executable (doesn't do anything yet) 15 years ago
Marc Zinnschlag e4f85cb3e6 directory structure reorganisation (still missing the mangle stuff) 15 years ago