Commit Graph

1947 Commits (loadfix)

Author SHA1 Message Date
greye b4950509bc use converted widechars in ini importer 11 years ago
greye eafdefe999 using WindowsPath implies utf-8 for boost fs::path 11 years ago
greye 584c121f33 fix windows unicode path handling 11 years ago
scrawl a872c9f83a Feature #1323: handle restocking levelled items 11 years ago
cc9cii b36bb58e8c Bug #1324: Artem's solution 11 years ago
Marc Zinnschlag f7c89015f9 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl ae66d28c87 Feature #32: Implement respawn for containers, creatures and NPCs 11 years ago
scrawl e266aff561 Savegame: store projectiles 11 years ago
scrawl b3735981d6 Remove unused file_finder 11 years ago
Marc Zinnschlag 3b2ba4f6cd Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl a76e391ad0 Savegame: store door movement state (Closes #747) 11 years ago
scrawl 471bbd0021 Savegame: store levelled creature state and move to actorIds
(Closes #1332)
11 years ago
Marc Zinnschlag d08869a25d Merge remote-tracking branch 'slothlife/msvc_warning_cleanup'
Conflicts:
	apps/openmw/mwrender/localmap.cpp
11 years ago
slothlife f33559fead Fixes for MSVC warnings, less overall changes
Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets.
11 years ago
scrawl 9b67fcc4d7 Merge branch 'master' of https://github.com/OpenMW/openmw 11 years ago
scrawl 9052cc4a57 Savegame: store ActiveSpells 11 years ago
scrawl 61187c2fef Savegame: store actorIds 11 years ago
scrawl 51020fdb5f Fix a bug for NpcStats::mUsedIds in savegames, and added a compile-time guard to prevent similar errors in the future. 11 years ago
Thomas cbcf0f6039 Changed AiEScort to use new PathTo function 11 years ago
slothlife c160a04ede Revert "Fixes for warnings when building with MSVC"
This reverts commit 46eb20b98c.
11 years ago
Thomas 085fb2c5a2 Simplified documentation a bit 11 years ago
Thomas a61d804de6 now that I've found the documentation, fixed some stuff for extensions 11 years ago
Thomas 77d365e196 Forced some function arguments to take in a specific array size 11 years ago
Thomas 9dbe53c722 Merge remote-tracking branch 'upstream/master' 11 years ago
Thomas 2c74ea381e Moved pathfinding code to aiPackage, implemented it's use with aiFollow and aiPursue 11 years ago
scrawl 6cc691115b Savegame: store most of CreatureStats 11 years ago
Thomas 645d174a96 Merge remote-tracking branch 'upstream/master'
Conflicts:
	apps/openmw/mwmechanics/aisequence.hpp
11 years ago
scrawl a4a9794417 Savegame: store fog of war (Closes #1177) 11 years ago
scrawl 041319c43e Fixes #1234: Store dynamic record counter in savegame to prevent name clashes 11 years ago
slothlife 46eb20b98c Fixes for warnings when building with MSVC
Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp.
11 years ago
Thomas dbf06d8c8b Merge remote-tracking branch 'upstream/master'
Conflicts:
	apps/openmw/mwmechanics/aipursue.hpp
	apps/openmw/mwmechanics/aisequence.hpp
11 years ago
scrawl 7bddfc0025 Fix some spelling mistakes. 11 years ago
scrawl 122e606e30 Crime: improvement to arrest on sight for large bounties
iCrimeThreshold controls the needed bounty to have guards run to the player and force dialogue. In vanilla, the greeting dialogue is scripted to either arrest the player (< 5000 bounty) or present a death sentence and attack (>= 5000 bounty).
11 years ago
scrawl 8560b43464 Move to esm component 11 years ago
scrawl 17bb8d7f9a Fixes #1252: Add item/magic keybindings to savegame 11 years ago
scrawl 6f7fbc867f Fix several leaks 11 years ago
Thomas 8f90dd43ec Changed things to use typedef ScriptARgs/ScriptReturn, which makes finding out what those weird strings meant much much easier 11 years ago
Thomas 885228ec02 Merge remote-tracking branch 'upstream/master'
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
11 years ago
scrawl 27a05027f4 Fixes #1172: Added basic loading/saving progress bar
The progress is not particularly accurate. It simply uses the current / total number of records written/read as indication. Cell records are currently the largest by far, but there is a good chance that could be optimized using a change tracking system.
11 years ago
Thomas c2127845af Added onKnockdown command 11 years ago
scrawl 30666f2cce Fixes #1297: Store global map markers in savegame 11 years ago
scrawl f921f2e7db Make PcRaiseRank, PcLowerRank and PcJoinFaction properly accept references instead of using the actor that the player talked to last.
This also solves a potential crash when no actor has been talked to yet, e.g. immediately after loading a savegame.
11 years ago
scrawl 45d2a00717 Fixes #1293: Allow interpolation type 0 in case of 0 keys 11 years ago
Thomas f6deca7c80 Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors 11 years ago
Thomas 61341d4206 Removed mLocked, kept it as "Negative lock level means unlocked" 11 years ago
Thomas 420163d35f Small changes to lock command (If no valid lockLevel exists, defaults to 100) 11 years ago
scrawl 6929e541dd Fix texture name issue with Vality's Bitter Coast Mod 11 years ago
scrawl 2cb9f38a45 Changed crime IDs for legacy savegames. Not an issue, but it was inconsistent. 11 years ago
scrawl 262e959699 Remove unused slice_array 11 years ago
pvdk aa07a33906 Fixed most of the memory leaks and started working on correctly exiting the thread 11 years ago
scrawl d3d0b7362f Fix older savegame compatibility regarding new crime feature. 11 years ago
pvdk a2c129f655 Merge remote-tracking branch 'upstream/master' into wizard 11 years ago
pvdk 21c406316f Working on the Settings tab: start the importer/wizard 11 years ago
Marc Zinnschlag 86e65944b8 Merge remote-tracking branch 'jeffreyhaines/master'
Conflicts:
	apps/openmw/CMakeLists.txt
11 years ago
Marc Zinnschlag 300eb6f444 make FNAM sub-record optional for all record types 11 years ago
Jeffrey Haines a274b48f2f States are saved. Crime is reacted to.
Issues where some crime is ignored. Needs a lot more work
11 years ago
megaton 50af9bc0d3 General perfomance optimizations. 11 years ago
pvdk ef38fae09d Merge remote-tracking branch 'upstream/master' into wizard 11 years ago
Marc Zinnschlag 2c2106205d Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl d7df9cae21 Bug #1224: Changed fix to potentially allow for language independent saves 11 years ago
scrawl 53ba23e303 Fixes #1224: Store class name instead of id in savegame header 11 years ago
Marc Zinnschlag 1b6b4e3442 Merge remote-tracking branch 'slothlife/weather_save' 11 years ago
scrawl 452b522bc3 Fix typos 11 years ago
slothlife 00eac7d53a Fixed header include guard to match filename 11 years ago
slothlife 6eab9c5179 Move weather state save/load to a new class 11 years ago
slothlife 1acd1bd913 Feature #1173: Saved Game: include weather state
Removed some unused state in and changed Ogre::String to std::string in
WeatherManager.
11 years ago
Marek Kochanowicz 6416ae90d2 Merge branch 'preview' of https://github.com/zinnschlag/openmw into Editor-Dialog
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/view/world/subviews.cpp
11 years ago
scrawl c8c0e5de38 Fixed code issues found with unity build. Missing include guards, duplicated functions, ... 11 years ago
pvdk 8fe837ae6e Merge remote-tracking branch 'upstream/master' into wizard 11 years ago
scrawl b0a1e1198a Yet another terrain fix 11 years ago
scrawl a9dcc90970 Another terrain fix 11 years ago
Marc Zinnschlag 2de862126a moved resources group creation from Engine to bsa component 11 years ago
scrawl b8ca067730 Small fix for terrain 11 years ago
Marc Zinnschlag f1353dc84f Merge branch 'scene' 11 years ago
scrawl d0f98103e4 Terrain: re-added "distant land=off" path
Still a hack, but the overhead of building and traversing the quad tree appears negligible.
11 years ago
scrawl 1d926816b5 Terrain: background load blendmaps & layer textures. Refactor QuadTree update. 11 years ago
scrawl 4328e08162 Terrain: get rid of unneeded members 11 years ago
scrawl 6a002d19b3 Terrain: destroy no longer used materials 11 years ago
scrawl 97c3efb3ba Terrain: decoupled Chunk from QuadTreeNode. 11 years ago
scrawl edb5a54092 Include some more required Ogre headers explicitely. 11 years ago
scrawl 195071efc7 Terrain: geometry is now loaded in background threads.
TODO: background load layer textures and blendmaps.
"Distant land" setting has been removed for now (i.e. always enabled).
11 years ago
scrawl b3fed853ae Terrain: take cell world size into account for LOD selection 11 years ago
scrawl 6c863486e1 Terrain: fix an embarrassing copy&paste mistake. 11 years ago
scrawl 64c9932597 Terrain: remove hard dependency on shiny - can now be compiled without it (fixed function) 11 years ago
scrawl c9e349f60f Terrain: support alternate coordinate systems. Get rid of LoadingListener for now 11 years ago
Bret Curtis ab224f93c9 remove our stdint.h version that uses boost and force usage of system stdint.h 11 years ago
Marc Zinnschlag f9d2fde783 Merge branch 'openmw-29'
Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
11 years ago
Marc Zinnschlag 6e8b9c88b2 changed name of default worldspace (should reduce chance of a name conflict) 11 years ago
cc9cii 46867ec0cf Fix file handles being left open on windows builds 11 years ago
cc9cii 2421f23c2f cleanup the mess... 11 years ago
pvdk 3792b301e9 Wizard now runs the ini-importer to import settings from Morrowind.ini 11 years ago
pvdk fb59112b74 Merge remote-tracking branch 'upstream/master' into wizardhead 11 years ago
Marc Zinnschlag bfcd768078 various bits of cleanup 11 years ago
cc9cii 1ab5948f19 merge upstream changes 11 years ago
Marc Zinnschlag d780364842 fixed record size type 11 years ago
Marc Zinnschlag b0ae5b8ab7 Merge remote-tracking branch 'cc9cii/windows-save-fix' into openmw-29 11 years ago
cc9cii fcfc8fcccb Revert "Allow MinGW64 compilation in Windows/msys"
This reverts commit c3f350e3fb.

Conflicts:
	libs/platform/string.h
11 years ago
cc9cii c241405d91 Fix Windows save & load. 11 years ago
cc9cii c3f350e3fb Allow MinGW64 compilation in Windows/msys 11 years ago
Marc Zinnschlag c5b2c154f8 another esm writer fix 11 years ago
Marc Zinnschlag 72b29ddb79 fix broken esm writer header code 11 years ago
pvdk c54217d008 Merge remote-tracking branch 'upstream/master' into HEAD
Conflicts:
	CMakeLists.txt
	components/CMakeLists.txt
	components/config/gamesettings.cpp
11 years ago
scrawl 1fba5d1bb9 Terrain: change world bounds from AABB to 4 floats 11 years ago
scrawl 90f6cda4cc Moved includes to appropriate place 11 years ago
Marc Zinnschlag 44f6f79bf5 Merge remote-tracking branch 'corristo/osx-ogre-19' 11 years ago
Marc Zinnschlag 9788bbcab9 partially store creature state in saved game files (only attributes and dynamics for now) 11 years ago
Marc Zinnschlag b0532e0c85 store NPC state in saved game files 11 years ago
Marc Zinnschlag 9f721fd144 store list of known topics in saved game files 11 years ago
Marc Zinnschlag 6ac64bbe15 Merge branch 'script'
Conflicts:
	readme.txt
11 years ago
Nikolay Kasyanov 8f99da084b OS X: plugins are now in Frameworks dir, not in Plugins 11 years ago
Marc Zinnschlag 0d84adb2c6 allow x->(y) instead of (x->y) 11 years ago
Marc Zinnschlag fd665a1994 ignore conditions after an else (only works if condition is put in parentheses) 11 years ago
Marc Zinnschlag d213c6c36a fixed a constness-issue 11 years ago
Marc Zinnschlag 451e1f413b instead of using pre-compiled variable lists for remote member access get the variable list from the remote script on the fly 11 years ago
Marc Zinnschlag e76ef92669 also allow the use of keywords as remote local variables in set statements 11 years ago
Marc Zinnschlag 2086ebe410 fix for inappropriate disable (2nd attempt) 11 years ago
Marc Zinnschlag b01c6dad37 Revert "allow disable as an alias for getDisabled (in most cases)"
This reverts commit f7ff4fbd51.
11 years ago
Nikolay Kasyanov c2fe0d480a Merge remote-tracking branch 'upstream/master' into osx-ogre-19
Conflicts:
	CMakeLists.txt
11 years ago
Marc Zinnschlag 053b3dc371 Merge branch 'openmw-28'
Conflicts:
	CMakeLists.txt
11 years ago
Nikolay Kasyanov 58add97676 Merge branch 'master' into osx-ogre-19
Conflicts:
	CMakeLists.txt
11 years ago
Marc Zinnschlag f7ff4fbd51 allow disable as an alias for getDisabled (in most cases) 11 years ago
Marc Zinnschlag d6e212a02b Merge branch 'master' into script 11 years ago
Marc Zinnschlag 309573a3ac allow the use of the keyword end as a variable name in an expression 11 years ago
Marc Zinnschlag d73097c2e4 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl d4a755d1aa Fix some hardcoded literals 11 years ago
Marc Zinnschlag 9c52820754 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl c6fb0f2d9b Removed terrain component's dependency on ESM 11 years ago
Marc Zinnschlag ac8290c4d3 fixed problem with line endings in case of a local variable redeclaration 11 years ago
Marc Zinnschlag dde4fbd818 allow one more integer argument in RemoveSoulGem and up to 6 more in AiFollow and then throw them all away 11 years ago
Marc Zinnschlag 87b51e47a9 fixed another case issue in remote member access 11 years ago
Marc Zinnschlag c03bd8ebb6 allow [] as aliases for () 11 years ago
Marc Zinnschlag 0313876d88 allow leaving out if in a top-level if-statement 11 years ago
Marc Zinnschlag 2eeb0eb4f3 allow lines to continue with other instructions after an legit else 11 years ago
Marc Zinnschlag 749136bf33 ignore attempts to set non-existing variables 11 years ago
Marc Zinnschlag a85d3c7dcb ignore unused explicit references for functions 11 years ago
Marc Zinnschlag 6e2e4d1adf ignore stray begin 11 years ago
Marc Zinnschlag 93d4743012 interpret instruction keywords as names within expressions 11 years ago
Marc Zinnschlag c0a6acfe6c allow the use of keywords as variable names in more places 11 years ago
Marc Zinnschlag b1b0877122 allow additional numeric argument for AiFollow and ignore it 11 years ago
Marc Zinnschlag bfb0e62c4a ignore additional string argument after enable/disable 11 years ago
Marc Zinnschlag 61626e90da allow additional string argument for stopcombat and addspell (ignored) 11 years ago
Marc Zinnschlag 6a5d88b640 ignore stray else and endif in scripts 11 years ago
Marc Zinnschlag 697bda6371 allow (and discard) explicit reference on instructions that do not accept explicit references 11 years ago
Marc Zinnschlag f26aa4f645 fixed while loop implementation 11 years ago
Emanuel Guevel 8c8f4cd420 Fix typo 11 years ago
Marc Zinnschlag 5c0071f320 fixed spelling of an error message 11 years ago
Marc Zinnschlag 3b990795c4 added access to remote access of local variables of global scripts 11 years ago
Marc Zinnschlag 3147aebf75 factored out declaration parser 11 years ago
scrawl 0cc1cd8f7e Fix message box formatting bug 11 years ago
scrawl 2c0d46525b Fast-forward particle systems to make cell loads less obvious. 11 years ago
scrawl cf3812188f Fix bounding box assertions due to negative particle life time
Other parts of the code could not deal with negative life times and produced negative particle sizes as a result (which Ogre could not handle)
11 years ago
pvdk f263acdac6 Merge remote-tracking branch 'upstream/master' into versioninfo 11 years ago
Marc Zinnschlag 2b2ac6f62b allow declaration of local variables with keywords as names 11 years ago
Marc Zinnschlag 32860a05e3 added dummy implementations for getPcInJail and getPcTraveling 11 years ago
Marc Zinnschlag 914ab1b8ab allow 'x' instead of 'getjournalindex x' 11 years ago
Marc Zinnschlag cd9b137129 allow elseif without matching if (grrrrr) 11 years ago
Marc Zinnschlag 8bcdf54570 added warning mode to script compiler error handler 11 years ago
scrawl f89b3cac02 Feature #764: Store the actor that gave the dialog response 11 years ago
Marc Zinnschlag 1b5301eec0 Merge branch 'savedgame'
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwbase/soundmanager.hpp
	apps/openmw/mwgui/mapwindow.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwsound/soundmanagerimp.hpp
	components/esm/loadcell.cpp
11 years ago
Marc Zinnschlag 5b04c10e1d added creature/NPC state to saved games (only container/inventory for now) 11 years ago
Marc Zinnschlag dd674566a2 store content of containers in saved game files 11 years ago
scrawl bbd15b185d Skip inactive controllers. Fixes those bloody bone boots again. 11 years ago
scrawl 5b300c1052 Handle controllers for the root node. Fixes #1147 (incorrect dwemer crossbow rotation) 11 years ago
scrawl 305a471c5a Fix VisController in ascended sleeper's death animation 11 years ago
Marc Zinnschlag 900532a6ca store additional state of lights in saved game files 11 years ago
Marc Zinnschlag e0537a3253 made object state polymorphic 11 years ago
Marc Zinnschlag a623f03850 reduced object state for objects in containers 11 years ago
mrcheko e50e94af0b remove CreatureStats::mAttackType, set/getAttackType() 11 years ago
Marc Zinnschlag 29c3a288e3 load and save of reference in cells (without CustomData state) 11 years ago
scrawl e0de76a6f7 Save/load global map 11 years ago
scrawl 9c0ed69550 Fix CellRef loading issue causing a startup script failure when TR_Mainland.esm is loaded. 11 years ago
scrawl a1ac99463f Fix an uninitialized value 11 years ago
scrawl 03cf383be7 Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame
Conflicts:
	apps/openmw/mwgui/referenceinterface.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwscript/cellextensions.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.cpp
	apps/openmw/mwworld/worldimp.cpp
11 years ago
scrawl 295aed3533 Implement savegame screenshots 11 years ago
scrawl 786ed6ca5b Include some required Ogre headers explicitely 11 years ago
pvdk 19bef4fce8 Distinguish between release and development builds 11 years ago
Marc Zinnschlag 419e3a7d30 write references in cells to saved game file 11 years ago
Marc Zinnschlag dd7d80ffbc removed a redundant field from object state 11 years ago
Marc Zinnschlag 22cb4784b5 store cell state in saved game files (no references yet) 11 years ago
pvdk d92ded3bcd Forgot adding the version header CMake file 11 years ago
pvdk c95b8bcb39 Moved the generated version header stuff into components 11 years ago
scrawl f89c400305 Don't complain about greetings with no sound 11 years ago
scrawl bd34b61f2a Set all keyframe-controlled bones as manually controlled 11 years ago
scrawl 4c0045b418 Bug #1109: Do not reset water level when loading a plugin with no water level record (for real this time) 11 years ago
scrawl 805843d7ff Closes #1086: Implement blood effects 11 years ago
Marc Zinnschlag ce00639d31 added missing birthsign field to player state record 11 years ago
Marc Zinnschlag d8d4f1a15e some fixes to record structs 11 years ago
scrawl d544551f61 Added getSkill to Class interface, since creatures also have skills (which are provided by generalized Combat, Magic and Stealth attributes which substitute for the specific skills, in the same way as specialization)
Information provided by Hrnchamd.
11 years ago
scrawl 0a8c61a7fe Bug #1107: Reverted previous fix, which caused problems with some actors not using a box shape as expected. Instead, do not create a bounding box collision shape for hidden nodes. 11 years ago
scrawl 79a6ffd216 Closes #1107: Do not create box shapes unless the box collision flag is enabled 11 years ago
scrawl 3ea1407ed3 Closes #1109: Don't reset water level when loading a plugin that does include water level records 11 years ago
scrawl 264736c139 Remove hopelessly outdated nifogre tests 11 years ago
scrawl d0500e8124 Some unneeded includes cleanup 11 years ago
Marc Zinnschlag bf1a37dc38 Merge remote-tracking branch 'sirherrbatka/referencables_verifer' 11 years ago
Marc Zinnschlag 8c5f313546 added savedgame-specifc record structs for objects state 11 years ago
scrawl 52b9ebff9d Closes #1092: Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell. 11 years ago
scrawl 26d972280f Fix a few text defines 11 years ago
Marc Zinnschlag 3e58eb34e4 Merge remote-tracking branch 'sergeyshambir/startcombat'
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
11 years ago
Marc Zinnschlag e453468eff moved CellRef loading code to the CellRef class 11 years ago
Marc Zinnschlag 9025210965 Merge branch 'refnum' into savedgame
Conflicts:
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/manualref.hpp
	components/esm/cellref.hpp
11 years ago
scrawl 1d19d36bd6 Remove unused magic effect flags and update esmtool output 11 years ago
scrawl ce6aab89cf Fix a possible permutation issue 11 years ago
scrawl c64dc2c831 Terrain specular mapping: use a "_diffusespec" postfix to indicate specular information is present in the alpha channel. Use alpha directly instead of 1-alpha. 11 years ago
scrawl bfdca3b738 Fix needTangents not being set for cached/shared materials 11 years ago
scrawl aa855e9524 Include some required Ogre headers explicitely 11 years ago
scrawl 6f9113fe88 Add preliminary implementation of PayFine, PayFineThief and GoToJail instructions 11 years ago
Marc Zinnschlag 7c8f735004 Merge remote-tracking branch 'corristo/osx-fixes' into openmw-28 11 years ago
scrawl 7b33f6f2ac Detect crime of sleeping in other NPC's beds. ShowRestMenu needs to support an explicit/implicit reference for this. 11 years ago
scrawl 0285d18fc2 Respect items belonging to a faction 11 years ago
Sergey Shambir d5a0ff17fd MWScript: updated vmformat.txt, changed opcodes to fix sequence.
Opcodes for StartCombat, StopCombat, GetTarget now follow the last
previous opcode.
11 years ago
Sergey Shambir 5c7e39a92f Implemented script commands StartCombat, StopCombat, GetTarget.
Also renamed one field of AIWander class because it's not longer
unknown.
11 years ago
Marc Zinnschlag fefaec5804 Merge remote-tracking branch 'scrawl/savedgame' into savedgame 11 years ago
scrawl 4ad43fdf92 Closes #1088: Quick&dirty fix for NIF filters not working properly with some mods 11 years ago
Marc Zinnschlag 43dd3b8ef2 removed redundant deletion flag from CellRef 11 years ago
scrawl 62774fcc4a Merge branch 'master' into HEAD
Conflicts:
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/loadtes3.cpp
11 years ago
scrawl b3764c504a Implement GetPcJumping instruction 11 years ago
scrawl c004fb778f Get rid of underscore defines. They are reserved by the standard. 11 years ago
scrawl b8e9343764 Extend NifOverrides to allow material overrides, useful for texture modding e.g. adding normal maps without having to edit the affected meshes 11 years ago
scrawl 14b70a3ce6 Implement AI related magic effects (calm, frenzy, rally, demoralize, turn undead) 11 years ago
scrawl 2a7d610f87 Implement GetSpellReadied instruction 11 years ago
scrawl 55c5d7cee4 Implement Resurrect instruction 11 years ago
scrawl b4230f716e Implement RemoveEffects instruction 11 years ago
scrawl 7d8ca91286 Implement RemoveSpellEffects instruction 11 years ago
scrawl 366801f3d5 Implement explodeSpell instruction (like Cast, with caster = target) 11 years ago
scrawl 93e1a2df73 Implement Cast script instruction (shrines work now) 11 years ago
scrawl 29acc3f722 Fix particles being too small. Looks like this should actually be size*2. 11 years ago
Marc Zinnschlag a6e6411686 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl 783c501d70 Some checks to prevent bound item abuse 11 years ago
Marc Zinnschlag e1355be47c Merge remote-tracking branch 'lgro/valgrind_warnings' 11 years ago
Lukasz Gromanowski 1ce4663065 Updated compiler opcodes for COE, and setHello.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
scrawl 86b2211932 Don't warn about NiFlipController (already implemented) 11 years ago
scrawl 764ec9bc5f Closes #716: Use the particle controller's size instead of NiAutoNormalParticlesData particle radius. Same as NifSkope now. 11 years ago
scrawl 07a9b7623a Enable skeleton-based bounding boxes added in Ogre 1.10 11 years ago
scrawl 254eba350e Not handling interpolation type should be an error, since it will fail reading the next record if it hasn't read the previous one completely. 11 years ago
Lukasz Gromanowski 50b6e828cc Added asserts in Interpreter::installSegmentX methods.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
scrawl f3a7321a43 Closes #856: More aggressive supression of skeleton base: only create for keyframe controllers, not any controllers 11 years ago
Lukasz Gromanowski 60fb75b03a Fixed valgrind warning about uninitialized variable:
==16814== Conditional jump or move depends on uninitialised value(s)
==16814==    at 0xA945B8: Terrain::QuadTreeNode::update(Ogre::Vector3 const&, Loading::Listener*) (quadtreenode.cpp:269)
==16814==    by 0xA94A77: Terrain::QuadTreeNode::update(Ogre::Vector3 const&, Loading::Listener*) (quadtreenode.cpp:354)
==16814==    by 0xA77541: Terrain::World::update(Ogre::Vector3 const&) (world.cpp:159)
==16814==    by 0x6EBA17: MWRender::RenderingManager::requestMap(MWWorld::CellStore*) (renderingmanager.cpp:649)
==16814==    by 0x8A25C4: MWWorld::Scene::loadCell(MWWorld::CellStore*, Loading::Listener*) (scene.cpp:157)
==16814==    by 0x8A2CEA: MWWorld::Scene::changeCell(int, int, ESM::Position const&, bool) (scene.cpp:296)
==16814==    by 0x8A2DE0: MWWorld::Scene::changeToExteriorCell(ESM::Position const&) (scene.cpp:440)
==16814==    by 0x85AC17: MWWorld::World::changeToExteriorCell(ESM::Position const&) (worldimp.cpp:761)
==16814==    by 0x927E38: OMW::Engine::prepareEngine(Settings::Manager&) (engine.cpp:436)
==16814==    by 0x92843D: OMW::Engine::go() (engine.cpp:483)
==16814==    by 0x6C6B3F: main (main.cpp:279)
==16814==  Uninitialised value was created by a heap allocation
==16814==    at 0x4C27CC2: operator new(unsigned long) (in /usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==16814==    by 0xA93E60: Terrain::QuadTreeNode::createChild(Terrain::ChildDirection, float, Ogre::Vector2 const&) (quadtreenode.cpp:178)
==16814==    by 0xA7733E: Terrain::World::buildQuadTree(Terrain::QuadTreeNode*) (world.cpp:139)
==16814==    by 0xA76B18: Terrain::World::World(Loading::Listener*, Ogre::SceneManager*, Terrain::Storage*, int, bool, bool) (world.cpp:94)
==16814==    by 0x6EC6EB: MWRender::RenderingManager::enableTerrain(bool) (renderingmanager.cpp:1013)
==16814==    by 0x8A2A00: MWWorld::Scene::changeCell(int, int, ESM::Position const&, bool) (scene.cpp:206)
==16814==    by 0x8A2DE0: MWWorld::Scene::changeToExteriorCell(ESM::Position const&) (scene.cpp:440)
==16814==    by 0x85AC17: MWWorld::World::changeToExteriorCell(ESM::Position const&) (worldimp.cpp:761)
==16814==    by 0x927E38: OMW::Engine::prepareEngine(Settings::Manager&) (engine.cpp:436)
==16814==    by 0x92843D: OMW::Engine::go() (engine.cpp:483)
==16814==    by 0x6C6B3F: main (main.cpp:279)

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
Marc Zinnschlag 56a80da70c Merge remote-tracking branch 'ace/win-fix' 11 years ago
Marc Zinnschlag 456b41f05b Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl c0dba2834b Closes #855: Don't try to look up bone if there's no skeleton 11 years ago
Alexander "Ace" Olofsson b50151cb38 Quick build fix for windows 11 years ago
Marc Zinnschlag f1be4656ec Merge remote-tracking branch 'lgro/issue1042_TES3_header_data_wrong_encoding' 11 years ago
Marc Zinnschlag 60a8a9e684 Merge remote-tracking branch 'scrawl/master' 11 years ago
Lukasz Gromanowski 9b73d23139 Fix warning about uninitialized variable inside stream.peak():
openmw/mwgui/bookpage.cpp:394:13: warning: ‘*((void*)& stream +24)’ may be used uninitialized in this function [-Wmaybe-uninitialized]

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
scrawl 6d47d710a0 Reimplement NiGeomMorpherController using Ogre's pose animation system 11 years ago
Marek Kochanowicz 03235bf0a2 NPC. Still WIP. 11 years ago
scrawl a9526622b1 Particle improvements: particle systems now move with the particle bone, not the scene node. This difference is not noticable if the particle bone is static, but it makes the code *much* nicer and mirrors more closely what NifSkope does. 11 years ago
scrawl 9877db413c Connect particle systems to the particle node, not the emitter node 11 years ago
scrawl eab2c89346 Issue #983: Fix controllers to affect objects attached to the base node 11 years ago
scrawl 5931fdcbde Implement NiBillboardNode. Flags not handled yet. 11 years ago
scrawl 33389b9b63 XDG compliant paths 11 years ago
scrawl aef0fd1460 Rename some path methods 11 years ago
scrawl e68e2f82a2 Implement DarkTexture slot. Fix an issue with incorrect transparency override when base texture is empty. 11 years ago
scrawl 0050e6e67b Support materials with no base (diffuse) texture (should be white). Support alternate UV set for diffuse texture. 11 years ago
scrawl c5c3248376 Compile fixes for Ogre 1.10 11 years ago
scrawl 6d27ebabb6 Integrate AddGlow with material controllers 11 years ago
pvdk 095ff4e17a Moved launcher settings stuff into components, so they can be reused in the wizard 11 years ago
Nikolay Kasyanov 892ff93489 OS X: attempt to fix #1045 11 years ago
Marek Kochanowicz e4e7d50623 Added creatureCheck. I don't know meaning of all data fields here. 11 years ago
Lukasz Gromanowski 18a9878bdd Fixes #1042: TES3 header data wrong encoding
Changed loading of HEDR structure from all-in-once to field-by-field
so author and descryption could be converted to UTF-8.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
scrawl 5fd98d7c3a Add an assertion 11 years ago
scrawl 18c002a21d Fix an awful typo. 11 years ago
Marc Zinnschlag c22e38f825 removing 255 content file limitation 11 years ago
scrawl 19e5978a01 Merge branch 'master' of https://github.com/zinnschlag/openmw
Conflicts:
	apps/openmw/main.cpp
11 years ago
Marc Zinnschlag 1cf1d49bc4 fix to content file reading error reporting in case of missing dependency 11 years ago
Marc Zinnschlag bf4ffe94dc fixed a memory leak in the script record 11 years ago
Marc Zinnschlag 3590fa40bd store global script state in saved game files 11 years ago
scrawl 530d06ab54 Remove unused code 11 years ago
scrawl 0c3c3ed8e9 Fix wind gravity affector 11 years ago
Marc Zinnschlag 77a2179d1e Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl 57a33c957e Add possibly missing include 11 years ago
scrawl 37a7ee8fcd Set alpha value of character animations according to Invisibility / Chameleon effects. 11 years ago
Lukasz Gromanowski 594cc693b2 Fixes #1006: Many NPCs have 0 skill
Added calculation of skill values for NPC with mNpdtType
set to NPC_WITH_AUTOCALCULATED_STATS (their NPDT is 12).

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
scrawl 9fcb4fad5c Implement NiFlipController 11 years ago
scrawl 51a9f0111c Implement NiAlphaController and NiMaterialColorController 11 years ago
scrawl 1624e0fd8a Rename ObjectList to ObjectScene. Wrap it in a SharedPtr so we can automate the destruction routine. 11 years ago
Marc Zinnschlag ef8c0fab73 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl c5e543b91b Implement NiGeomMorpherController 11 years ago
Marc Zinnschlag 030c733e2d Merge branch 'master' into savedgame
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg
11 years ago
Marc Zinnschlag 674931a851 remove terminating 0 from strings read from ESM records 11 years ago
Lukasz Gromanowski bfd79bfbe6 Various fixes for CppCheck warnings.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
Marc Zinnschlag 07f692bdd2 Merge remote-tracking branch 'scrawl/master' 11 years ago
scrawl 062ea627b3 Add parallax mapping for objects 11 years ago
scrawl 69c0bb1723 Add normal, specular & parallax mapping for terrain 11 years ago
Alexander "Ace" Olofsson 47c60a7037 Fix C4716 (Must return a value) error on Windows MSVC 11 years ago
scrawl 3a82f8c193 Fix incorrect log file name for launcherOgre.log 11 years ago
Marc Zinnschlag e269c9e689 changed a few sub record names to make them more unique 11 years ago
Marc Zinnschlag 7d8e3ac651 fixed QuestState::load/save 11 years ago
Marc Zinnschlag 16e2d67b1f added overloaded start/endRecord functions to ESMWriter 11 years ago
Marc Zinnschlag eec9821cd8 added records for storing journals in saved game files 11 years ago
pvdk 1512ac11ad Fixed the content selector checkboxes appearing as partially checked 11 years ago
Marc Zinnschlag 750133c0dd one more fix to SavedGame record saving 11 years ago
scrawl e7ad503e30 Merge branch 'particles' into projectiles 11 years ago
Marc Zinnschlag e432ab5e8a fixed static problem in Land recrod save function 11 years ago
Marc Zinnschlag b40c0f2a07 one more fix to SavedGame record saving 11 years ago
scrawl 9f5ff033d7 Handle the "GetLOS" alias for GetLineOfSight 11 years ago
scrawl 58dce88c7d Handle the "tai" alias for ToggleAI 11 years ago
scrawl 6b81fd78f1 Particle improvements: Handle LocalSpace flag. Attach particle systems to the base node, since they need to be relative to that when LocalSpace is enabled. Get the bone in emitters/affectors so that resulting particle positions are the same. TODO: Fix Controllers to affect particle systems. 11 years ago
Marc Zinnschlag 1ecadccb28 fixed save function of SavedGame record 11 years ago
Marc Zinnschlag 67cd0887e6 added description field to saved game record; make use of description in GUI 11 years ago
Marc Zinnschlag fc1501a510 store character profile information in saved game file 11 years ago
Marc Zinnschlag d6e2701dd6 changed played time data type from float to double 11 years ago
scrawl 3452bd2e0b Add glow effect for enchanted items 11 years ago
Marc Zinnschlag 9487bd33c3 removed broken save function from ESMWriter 11 years ago
Marc Zinnschlag 4c61deca8d fixed save code for SavedGame record 11 years ago
Marc Zinnschlag 35bf98a940 modified esm reader/writer to use UTF8 when no encoder is given 11 years ago
Marc Zinnschlag 903e867c24 change to TES3 record (moved format field to the top) 11 years ago
Marc Zinnschlag dc75627d53 added secondary saved game header record 11 years ago
Marc Zinnschlag 11e254aac8 Merge remote-tracking branch 'gus/AICombat'
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
11 years ago
gus dff3cf162d ToggleAI script instruction 11 years ago
scrawl 7fd5f1df83 Change setKeepParticlesInLocalSpace to false. Not correct for all particles, but the opposite isn't either. Plus it breaks pretty much all magic VFX. 11 years ago
scrawl aa84ce3f0d Copy paste mistake (oops) 11 years ago
scrawl c5f1bbcc5f Add functions to get the effect affecting resistance and weakness for another effect 11 years ago
scrawl 956d8adb99 Merge branch 'master' of https://github.com/zinnschlag/openmw into magic
Conflicts:
	apps/openmw/mwgui/inventoryitemmodel.cpp
11 years ago
Marc Zinnschlag d49b8e7443 Merge branch 'dialogue' 11 years ago
scrawl a6e2f43b75 Stop continuous VFX when the effect is no longer active. 11 years ago
scrawl ffdb91bb21 Add particles for Cast + Hit. Not looking quite right yet. 11 years ago
Marc Zinnschlag 2fff7fc843 save info records 11 years ago
scrawl afafaf73e8 Fix a build error 11 years ago
Marc Zinnschlag 8c4303399f Merge branch 'master' into dialogue
Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loadinfo.hpp
11 years ago
Marc Zinnschlag 418ccf705d Merge branch 'openmw-27'
Conflicts:
	apps/launcher/graphicspage.hpp
	components/CMakeLists.txt
11 years ago
Marc Zinnschlag 2d4a6c0edf cleaned up ID handling in INFO record (including a ESMTool bug fix) 11 years ago
Marc Zinnschlag 9d7695ea88 added missing columns to topic info table 11 years ago
graffy76 ed913936f8 Eliminated game & addon keys from profile configuration 11 years ago
graffy76 1d4b5a2425 Fix broken launcher content file display / selection scheme
Disable selection of content files with missing dependencies (grayed
out)
11 years ago
graffy76 12c06a5615 Fixed broken dependency check 11 years ago
graffy76 973803eb2f Fixed pathing issues in launcher 11 years ago
graffy76 8d12e2b99d fixed merge conflicts
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/launcher/settings/gamesettings.hpp
	components/contentselector/model/contentmodel.cpp
11 years ago
graffy76 cddece4f9e Another stab at fixing the pathing problem... 11 years ago
Marc Zinnschlag 767cb54e7c added missing columns to journal info table 11 years ago
gus d587f3c946 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AICombat
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwscript/docs/vmformat.txt
11 years ago
scrawl 636d399c7f Refactored Ogre initialisation into a component 11 years ago
Marc Zinnschlag ba88c94d58 first attempt at an info record collection 11 years ago
graffy76 b51bef0d98 fixed missing adjuster widget in file dialog open view 11 years ago
Lukasz Gromanowski d51c9b64dd Issue #913: Merge --master and --plugin switches
Launcher part of master/plugin switches merge.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
graffy76 9ce4a04a2d merge from saving
Merge branch 'saving' of https://github.com/zinnschlag/openmw into esxSelector

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/opencs/editor.cpp
	apps/opencs/view/doc/filedialog.cpp
	apps/opencs/view/doc/filedialog.hpp
11 years ago
graffy76 16d87ea1d1 Merge branch 'master' into esxSelector 11 years ago
graffy76 2ca7f24731 Fixed filedialog new / edit content path issue 11 years ago
graffy76 b48f066f33 Reimplemented content selector for filedialog and datafilespage classes 11 years ago
graffy76 ba3589bc76 Revert "Implemented ContentSelector as a singleton "charm" modifier for"
This reverts commit 24b167b755.

Conflicts:
	apps/launcher/datafilespage.cpp
	apps/opencs/editor.cpp
	apps/opencs/view/doc/filedialog.cpp
	apps/opencs/view/doc/filedialog.hpp
	components/contentselector/view/contentselector.cpp
	components/contentselector/view/contentselector.hpp
11 years ago
graffy76 f9591ddda6 Reimplemented constentselector view class 11 years ago
Marc Zinnschlag c995533e07 Merge branch 'dialogue' into saving
Conflicts:
	apps/opencs/model/world/columnimp.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loaddial.hpp
11 years ago
Marc Zinnschlag adf3a41a83 added topic and journal tables 11 years ago
Nikolay Kasyanov 3993c34739 Merge remote-tracking branch 'upstream/master' into osx-ogre-19 11 years ago
Marc Zinnschlag 3c580fbc59 Merge remote-tracking branch 'jordan-ayers/topic/MagicEffectDisplayFormat' 11 years ago
Jordan Ayers 296b2ab870 Magic Effect: Recognize other display types.
Fill out the list of effects which use percentage formatting.
Add in types which use Feet and level labels.
11 years ago
Jordan Ayers 6ab7002908 MagicEffect: Put magnitude type into ESM::MagicEffect helper. 11 years ago
graffy76 4c72a9ffdf Fixed non-loading files 11 years ago
graffy76 217a4d75b4 Implemented profile function in launcher datafiles page
Implemented dependency sorting to ensure dependent files appear latest
in the list.
11 years ago
Emanuel Guevel 496f786c2a Implement Disable/EnableLevitation script functions
Totally copied on Disable/EnableTeleporting implementation.
Thanks KittyCat!
11 years ago