Commit Graph

90 Commits (8419002393d89bd20222773a1872efb858f7ea32)

Author SHA1 Message Date
cc9cii bbe77d656a Minor fixes from static analysis. 11 years ago
scrawl 49a6579d3a Fixed esmtool 11 years ago
scrawl 1677fcf324 Dialogue merging 11 years ago
Thoronador f69d61976e minor performance improvements in other apps subdirectories 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 805843d7ff Closes #1086: Implement blood effects 11 years ago
scrawl de64c57179 Fix some typos and accidental commit 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
Marc Zinnschlag 3e58eb34e4 Merge remote-tracking branch 'sergeyshambir/startcombat'
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
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
Sergey Shambir d536ff3cdc printAIPackage: changed field name from Unknown to ShouldRepeat too. 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
Marc Zinnschlag 43dd3b8ef2 removed redundant deletion flag from CellRef 11 years ago
Marc Zinnschlag c22e38f825 removing 255 content file limitation 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
Lukasz Gromanowski bfd79bfbe6 Various fixes for CppCheck warnings.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
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 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 cfdc19c427 Renamed esxSelector to contentSelector
Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file
11 years ago
Chris Robinson e3d5a1b38d Dialog function 72 is not player-specific
It's used to force any NPC in werewolf form to play the appropriate
growls for combat.
12 years ago
Emanuel Guevel aa14656ff2 esmtool: fix swapped comparison operators 12 years ago
Glorf 5b81d124bb Catched another exception 12 years ago
Glorf f4d302501e Bugfix #826 12 years ago
Nikolay Kasyanov 5984a15846 We don't need Carbon on OS X anymore 12 years ago
Miroslav Puda 8a9ddcaa32 Plain output moved at the end of records output. 12 years ago
Miroslav Puda d3d5cb4edf New command line option --plain to print contents of scripts, books, dialogs. 12 years ago
scrawl c519fc360d Move away from fixed record names for body parts 12 years ago
Marc Zinnschlag ff1d908af4 added script table 12 years ago
Marc Zinnschlag 18e046e628 cleaned up race record struct 12 years ago
Marc Zinnschlag 7136ac0079 added missing attribute columns to faction table 12 years ago
Marc Zinnschlag f9f520df34 adjusted faction record to increase consistency with other records 12 years ago
scrawl e27e53f607 Fix not playable body parts appearing in the race selection menu. 12 years ago
scrawl 6f1575d42a CELL record corrections 12 years ago
scrawl 8e2f9f5186 Fix CellRef to load current weapon/armor health correctly, also show it in the tooltips 12 years ago
scrawl 918cdcffc2 Split up components/esm/loadlocks 12 years ago
Marc Zinnschlag 75bd30844d added optional format sub-record to tes3 record 12 years ago
Marc Zinnschlag 9e68a420ae restructuring tes3 record structs 12 years ago
Marc Zinnschlag 2e1a1fd11a removing some remains of the removed GMST fixing feature 12 years ago
Marc Zinnschlag 64d517dd79 removed unused file type information from esm component 12 years ago
Marc Zinnschlag 1489570b09 change variant in info record to new type 12 years ago
Marc Zinnschlag ba4907fbaf use new Variant type for GMSTs 12 years ago
Marc Zinnschlag a1ac20c6f3 changed global variable records to new variant type 12 years ago
Douglas Mencken a3e421167b esmtool/labels: bodyPartLabel, meshPartLabel, meshTypeLabel
Signed chars, unsigned chars... Just use int for index everywhere.
12 years ago
Douglas Mencken df5919f2c5 Use `signed char' explicitly where needed. It is important because:
- It is implementation-dependent if plain `char' signed or not.
- C standard defines three *distinct* types: char, signed char,
  and unsigned char.
- Assuming that char is always unsigned or signed can lead to
  compile-time and run-time errors.

You can also use int8_t, but then it would be less obvious for developers
to never assume that char is always unsigned (or always signed).

Conflicts:

	components/esm/loadcell.hpp
12 years ago
Mark Siewert dca8dc4fdb Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/store.hpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/esmreader.hpp

- Quick hack: OMW::Engine::prepareEngine only loads translation data for the first master file.
12 years ago
Emanuel Guevel 63f09462fd to_utf8, Utf8Encoder: pass encoding as constructor parameter
Edit other files accordingly.
12 years ago
Marc Zinnschlag 2d468fec02 made previous commits naming standard compliant 12 years ago