scrawl
c0a88161b2
Get rid of unneeded setSize/setCoord overrides
2015-01-29 03:38:59 +01:00
Marc Zinnschlag
05be353fec
Merge remote-tracking branch 'dteviot/master'
2015-01-28 19:22:54 +01:00
Marc Zinnschlag
fabcdf7a1a
Merge remote-tracking branch 'ace/boost-fixes'
2015-01-28 19:19:42 +01:00
scrawl
f4c8064d39
Fix camera not being attached properly when player becomes vampire ( Fixes #2319 )
2015-01-28 19:14:57 +01:00
scrawl
9bcc84ceec
Add option to stretch menu backgrounds/cutscenes to the whole screen
2015-01-28 00:22:56 +01:00
scrawl
6c08e05fc3
ESSImport: fix for GMDT being only 92 bytes in a certain save file
2015-01-27 23:12:21 +01:00
scrawl
431f540791
ESSImport: fix NPC factions
2015-01-27 23:12:21 +01:00
scrawl
875df46ae9
ESSImport: convert journal indices
2015-01-27 23:12:21 +01:00
scrawl
6367b4dc0b
Improve INFO struct naming
2015-01-27 23:12:21 +01:00
scrawl
4cbb79191f
Don't put duplicate lines in the console history
2015-01-27 23:12:20 +01:00
scrawl
6f41e0d12e
Reapply quest index when loading quest from savegame (Bug #2260 )
2015-01-27 23:12:20 +01:00
scrawl
f35c9b7a69
Clang warning fixes (thanks hemite)
2015-01-27 23:12:20 +01:00
scrawl
76820e700c
ESSImport: reading used powers fix (not used, see comment)
2015-01-27 23:12:20 +01:00
scrawl
d34c8526f6
Enchanted arrows should not be added to victim ( Fixes #2306 )
2015-01-27 23:12:20 +01:00
scrawl
67491c7164
Fix leveled item argument issue ( Fixes #2302 )
2015-01-27 23:12:20 +01:00
scrawl
89132ff741
Add --name option to esmtool to print record with the given name
2015-01-27 23:12:20 +01:00
scrawl
315f9a98ad
ESSImport: document targeted scripts (not implemented yet)
2015-01-27 23:12:19 +01:00
scrawl
9d3f0b2ed5
Remove some unused code, include cleanup
2015-01-27 23:12:13 +01:00
scrawl
d34086ac8f
ESSImport: convert running global scripts
2015-01-27 23:05:20 +01:00
scrawl
4921c6ef9e
Split window caption bars so that the caption can be transparent ( Fixes #531 )
...
Fix transparent window background not applying to the header bar (Fixes #2294 )
2015-01-27 23:05:19 +01:00
scrawl
9b3728d878
ESSImport: convert weather state
2015-01-27 23:05:19 +01:00
Alexander "Ace" Olofsson
62acb03735
More Ogre + recent Boost build fixes
2015-01-27 21:07:26 +01:00
scrawl
697ab16ec5
Fix for coverity defects
2015-01-27 19:00:26 +01:00
Marc Zinnschlag
c4dd10fe49
Merge remote-tracking branch 'jordan-ayers/bugfix/1049'
2015-01-26 19:29:39 +01:00
dteviot
e298589e7f
Reorganised DataFilesPage.cpp code.
...
Removed some recursive calling of saveSettings() and loadSettings().
2015-01-26 18:46:18 +13:00
Jordan Ayers
1410819e20
Dialog fix for line breaks in the middle of words.
...
Issue 1049
Adjust the TypesetBookImpl::Typesetter to not assume a word break
at the end of write() calls.
A word break is assumed if any of the other content insertion methods
are used (section break, add/select content, etc).
2015-01-25 22:36:20 -06:00
dteviot
70e4f821ba
Fix Windows warning
...
warning C4244: 'initializing' : conversion from 'float' to 'int', possible loss of data
2015-01-26 13:58:13 +13:00
dteviot
946dd16696
Fixed Windows warning.
...
warning C4800: 'int' : forcing value to bool 'true' or 'false' (performance warning)
2015-01-26 13:57:22 +13:00
dteviot
e02bab67ba
Fixed MSVC warnings.
...
warning C4099: 'ESM::ESMReader' : type name first seen using 'class' now seen using 'struct'
warning C4099: 'ESM::CellId' : type name first seen using 'struct' now seen using 'class'
2015-01-26 13:17:16 +13:00
dteviot
b0b275a936
Fix for MSVC 2013 compiler issues.
...
Fixes: C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\utility(199): error C2079: 'std::pair<const _Kty,_Ty>::second' uses undefined class 'boost::shared_ptr<ESSImport::Converter>'
Which cascades to 36 more errors.
2015-01-26 12:53:01 +13:00
Marc Zinnschlag
b44fc1904b
Merge remote-tracking branch 'scrawl/master'
2015-01-24 17:13:23 +01:00
scrawl
72f7c2e555
Move weather reset to clear() method
2015-01-24 16:45:36 +01:00
scrawl
b1bd236345
ESSImport: convert script local variables
...
Had to add special reading code to openmw, because the variable names are not stored.
2015-01-24 16:45:36 +01:00
scrawl
09f11fbff2
ESSImport: convert selected spell / selected enchant item
2015-01-24 00:18:17 +01:00
scrawl
bf90b86f73
ESSImport: add some missing subrecords
2015-01-23 20:09:30 +01:00
scrawl
b0c2aec374
Add warning for missing body parts
2015-01-23 17:31:26 +01:00
scrawl
79d2eebe54
Store selected enchant item in savegame ( Fixes #1702 )
2015-01-23 16:45:47 +01:00
Alexander "Ace" Olofsson
942cf26eee
And the missing includes
2015-01-23 16:06:19 +01:00
Alexander "Ace" Olofsson
7a903b7100
Doing forward declaration instead
2015-01-23 16:05:36 +01:00
Alexander "Ace" Olofsson
0c1d762790
Fix build when using new boost with Ogre.
...
This fixes a [Parse error at "BOOST_JOIN"] if you're using - for instance - Boost 1.57.0
2015-01-23 15:37:32 +01:00
scrawl
e484a91708
ESSImport: convert global map markers
2015-01-23 15:34:48 +01:00
scrawl
c354f48a07
ESSImport: some fixes
2015-01-23 15:34:48 +01:00
scrawl
1d29180e00
ESSImport: handle deleted cell references
2015-01-23 15:34:48 +01:00
scrawl
ba7cd04ff7
ESSImport: prevent accidental overwriting of file
2015-01-23 15:34:48 +01:00
scrawl
a619cff615
Implement EnableLevelupMenu to trigger level-up
2015-01-23 15:34:47 +01:00
scrawl
c883a73d30
Several warning fixes
2015-01-23 15:34:47 +01:00
scrawl
8b5effe3e0
Fix wrong magic number for JOUR in openmw savegames
2015-01-23 15:34:47 +01:00
scrawl
af0e91c2d3
ESSImport: stolen items reading fix
2015-01-23 15:34:47 +01:00
scrawl
378e91545d
Fix Tribunal/BM summon effects not working
2015-01-23 15:34:47 +01:00
scrawl
e203127952
ESSImport: read script variables (not converted yet)
2015-01-23 15:34:47 +01:00
scrawl
98402e579d
ESSImport: fix non-existing items in player record causing load failure in OpenMW
2015-01-23 15:34:47 +01:00
scrawl
0fd5575efe
Improve warning message in ContainerStore::readState
2015-01-23 15:34:47 +01:00
scrawl
cc7be1600d
Make missing hair/head in NpcAnimation non-fatal for consistency with addOrReplaceIndividualPart
2015-01-23 15:34:14 +01:00
scrawl
5ce8a931a5
ESSImport: fix a subrecord ordering issue
2015-01-23 15:34:14 +01:00
scrawl
1e92cab3e7
ESSImport: read dialogue/journal records, not converted yet
2015-01-23 15:34:14 +01:00
scrawl
acf8461841
ESSImport: some fixes
2015-01-23 15:34:14 +01:00
scrawl
69676906ae
Don't clear known spells when reading from the savegame
...
This is needed because the .ess format doesn't include the racial spells in the player's spell list.
2015-01-23 15:34:14 +01:00
scrawl
c7d15e6f74
Revert "Revert "Light charge handling fix""
...
This reverts commit b95748d044
.
2015-01-23 15:33:39 +01:00
scrawl
7ead963075
Revert "Revert "ESSImport: convert inventory equipment slots""
...
This reverts commit fe31ca0ac0
.
2015-01-23 15:33:30 +01:00
scrawl
d13335ba40
Ensure the item can be equipped in the given slot when loading inventory
2015-01-23 15:32:34 +01:00
scrawl
c65f9cb3c0
Revert "Change save format to store relative equipment index"
...
This reverts commit 89d9649b50
.
2015-01-23 02:32:43 +01:00
scrawl
fe31ca0ac0
Revert "ESSImport: convert inventory equipment slots"
...
This reverts commit 03df659e7d
.
2015-01-23 02:32:42 +01:00
scrawl
b95748d044
Revert "Light charge handling fix"
...
This reverts commit 5e0428243b
.
2015-01-23 02:32:38 +01:00
Marc Zinnschlag
fa4718283d
Merge remote-tracking branch 'scrawl/contentselector'
2015-01-21 15:23:38 +01:00
Marc Zinnschlag
cd62dbc5b7
Merge remote-tracking branch 'scrawl/essimporter'
2015-01-21 15:12:04 +01:00
scrawl
5e0428243b
Light charge handling fix
2015-01-21 01:59:45 +01:00
Scott Howard
8c32b7e304
missing include in essimporter/main.cpp
...
error: 'cout' is not a member of 'std'
error: 'cerr' is not a member of 'std'
https://launchpadlibrarian.net/195402684/buildlog_ubuntu-trusty-amd64.openmw_0.34.0%2Bgit20150120.442-0~ubuntu14.04.1_FAILEDTOBUILD.txt.gz
2015-01-20 17:59:11 -05:00
scrawl
03df659e7d
ESSImport: convert inventory equipment slots
2015-01-20 23:58:24 +01:00
scrawl
89d9649b50
Change save format to store relative equipment index
...
Store the index for the allowedSlots vector instead of the absolute slot index. This will more gracefully handle edge cases like the available slots for an item having changed when loading the game, or the "allows stacking" property having changed. However the main reason this was done is to ease work on the essimporter.
2015-01-20 23:55:26 +01:00
scrawl
142a138b75
ESSImport: convert TalkedTo flag and gold pool
2015-01-20 20:19:08 +01:00
scrawl
e38d756345
ESSImport: fix NPCC indices
2015-01-20 20:18:30 +01:00
scrawl
5b705196bc
ESSImport: convert level progress
2015-01-20 19:47:54 +01:00
scrawl
eede2c8e55
ESSImport: convert breath meter and skill increases
2015-01-20 19:30:39 +01:00
scrawl
0fc9221eb3
ESSImport: convert NPC disposition
2015-01-20 19:29:54 +01:00
scrawl
1375a4e4bb
ESSImport: read stolen items (not converted yet)
2015-01-20 19:29:54 +01:00
Alexander "Ace" Olofsson
3a88f4ebd5
Fix windows build, MessageBox is a defined symbol
...
Windows and its stupid defines...
2015-01-20 17:07:26 +01:00
scrawl
06736e9e03
ESSImport: convert faction reactions and known dialogue topics
2015-01-20 15:56:07 +01:00
Marc Zinnschlag
a266dffb4b
Merge remote-tracking branch 'scrawl/essimporter'
2015-01-20 15:53:48 +01:00
scrawl
6d5bb57e00
ESSImport: fix loading item stacks in containers
2015-01-20 01:21:44 +01:00
scrawl
5104a5a023
Add missing setFactionReaction instruction, use absolute storage instead of difference
...
Seems to be closer to how MW is storing it (it has the complete FACT record in the savegame, actually).
This (somewhat) breaks OMW savegame compatibility in that old changes are discarded, but I don't think the faction reactions are quest relevant anywhere.
2015-01-20 00:53:31 +01:00
scrawl
40c29abe20
ESSImport: convert other references (non-creature/npc/container)
2015-01-20 00:42:26 +01:00
scrawl
9014dc48ee
Don't require the object type id for reading references from savegames
...
This is redundant, since we can look it up from the RefID.
2015-01-20 00:42:25 +01:00
scrawl
8e1eeccbe1
ESSImport: container state
2015-01-19 13:16:12 +01:00
scrawl
a7b82e5107
ESSImport: inventory loading works, equipment slots need more work
2015-01-19 12:22:51 +01:00
scrawl
235683e449
Remove LightState from openmw save format to streamline inventory loading
2015-01-19 11:36:00 +01:00
scrawl
ad398f0c65
ESSImport: convert kill counter
2015-01-19 09:29:30 +01:00
scrawl
f9cf31fcd5
ESSImport: convert custom map markers, not working for interiors yet
2015-01-19 09:29:21 +01:00
scrawl
19ed047dec
ESSImport: add some subrecords to CellRef and others, most files should load now, importacdt/cellref class structure need some refactoring
2015-01-18 23:15:36 +01:00
scrawl
08ad4d73bb
ESSImport: player is placed in correct cell, npc cellrefs work
2015-01-18 20:01:50 +01:00
scrawl
c8ed24cc84
ESSImport: creature CellRefs work, need probing to find ref type
2015-01-18 16:13:52 +01:00
scrawl
cbf56dbb47
ESSImport: work on cell fog of war
2015-01-17 03:07:24 +01:00
scrawl
031eec4550
Starting ESS importer for Morrowind save files
2015-01-17 00:16:49 +01:00
scrawl
14aacf9a72
Add comment
2015-01-17 00:10:49 +01:00
scrawl
1869d37cfc
Remove unused mLastDrowningHit
2015-01-17 00:10:45 +01:00
scrawl
714b19015c
Fix unknown record error message
2015-01-15 20:31:08 +01:00
Marc Zinnschlag
9603325b99
Merge remote-tracking branch 'origin/master'
2015-01-15 17:33:20 +01:00
Marc Zinnschlag
640d473866
Merge remote-tracking branch 'scrawl/master'
2015-01-15 17:33:08 +01:00
scrawl
fc6aa256bf
Add comment
2015-01-15 16:05:25 +01:00
scrawl
6146a3843c
Merge remote-tracking branch 'upstream/coverity_scan' into HEAD
2015-01-15 15:59:57 +01:00
Marc Zinnschlag
c55e9b9c58
one more potential 0-pointer fix
2015-01-15 15:00:16 +01:00