mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 20:49:56 +00:00
Code Issues Releases Wiki Activity
12943 commits 38 branches 54 tags 122 MiB
Commit graph

2126 commits

Author SHA1 Message Date
scrawl
8b5effe3e0 Fix wrong magic number for JOUR in openmw savegames 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
1e92cab3e7 ESSImport: read dialogue/journal records, not converted yet 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
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
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
scrawl
db64ff6645 Fix actorId initialization 2015-01-21 01:34:00 +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
d473629dcd Improve ESMReader error messages 2015-01-20 19:29:55 +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
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
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
f7e32a24c9 Fix terrain assertion 2015-01-19 12:03:30 +01:00
scrawl
235683e449 Remove LightState from openmw save format to streamline inventory loading 2015-01-19 11:36:00 +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
Marc Zinnschlag
e9af9b991d Merge remote-tracking branch 'dteviot/master' 2015-01-18 09:50:56 +01:00
dteviot
71700d2cb1 Bugfix: OpenCS segfault when plug-in dependency not found. 
When a file that a plug-in depends on cannot be found, the OpenCS file dialog crashes.
Similar problem exists in omwlauncher's "Data Files" dialog.
 2015-01-18 11:55:58 +13:00
dteviot
017e4cd4ef OpenCS shows plug-ins with load order issues. 
1. FileDiaog in OpenCS now shows warning icon beside .esm./.esp files with load order problems.
2. omwlaucher -> replaced "stop" icon with "warning" icon for files with load order problems.
 2015-01-17 18:11:03 +13: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
fc663addfa Fix null character issue in ESMReader::getString 2015-01-17 00:10:49 +01:00
scrawl
1869d37cfc Remove unused mLastDrowningHit 2015-01-17 00:10:45 +01:00
Marc Zinnschlag
9603325b99 Merge remote-tracking branch 'origin/master' 2015-01-15 17:33:20 +01:00
Marc Zinnschlag
375d426dd0 check for premature end of scripts more consistently 2015-01-15 11:35:17 +01:00
scrawl
d387c207d1 Fix initial scaling for btCompoundShape children (Fixes #2234) 2015-01-14 18:49:25 +01:00
scrawl
f11ec653d0 Add setting for showing MRK nodes to NIF loaders 
This makes marker objects show up in OpenCS.
 2015-01-13 17:29:25 +01:00
scrawl
883f7ec7ce Move workaround for hiding markers from NIF loader to Scene 2015-01-13 17:19:39 +01:00
Marc Zinnschlag
7cc1ebc05b Merge remote-tracking branch 'scrawl/master' 2015-01-13 10:38:02 +01:00
scrawl
7b4665c623 Terrain: documentation update 2015-01-13 05:37:44 +01:00
scrawl
261da8dd0a Terrain: use 32-bit indices if necessary 2015-01-13 05:37:43 +01:00
scrawl
f7bac58b39 Terrain: change index buffer flags to unsigned 2015-01-13 05:37:43 +01:00
scrawl
41b3a9dba9 Rewrite animated collision shape support (Fixes #2123) 2015-01-13 05:37:37 +01:00
scrawl
de23ad5c8d Change dynamic_cast to static_cast to make coverity happy 2015-01-12 23:29:58 +01:00
scrawl
04d6cead3b Autogenerated collision should only be disabled if RootCollisionNode is a child of the root node (Fixes #2133) 2015-01-12 23:29:57 +01:00
Marc Zinnschlag
763e058ed2 Merge remote-tracking branch 'dteviot/master' 2015-01-12 10:41:04 +01:00
dteviot
e95b513cfc Use icon to show files with problem (Fixes #2268) 
Launcher now indicates files with problem using an icon.
Using red text for files with load order issue removed because it doesn't work well with dark themes.
 2015-01-12 21:17:41 +13:00
Marc Zinnschlag
7c959c8494 Merge remote-tracking branch 'dteviot/Bug811' 2015-01-11 12:30:32 +01:00
dteviot
7aa0f887c0 Minor changes to ESM::RefNum 
1. Changed mIndex to unsigned, to solve potential implementation defined behavior with right shift.
2. Refactoring to minimize use of magic number -1 to indicate "no Content File".
 2015-01-11 12:20:22 +13:00
Marc Zinnschlag
e439065897 Merge remote-tracking branch 'scrawl/master' 2015-01-10 11:33:04 +01:00
dteviot
05b89be8bf Launcher sets content list to match values in openmw.cfg (Fixes #811) 
I took the liberty to add accessor & mutator functions for classes ContentListsGameSettings and LauncherSettings , as existing code can reverse order of entries.
Also replaced some "magic strings" with named constants.
 2015-01-10 18:46:47 +13:00
scrawl
efbc8742a0 Remove some unnecessary includes 2015-01-09 21:13:57 +01:00
Marc Zinnschlag
d254bb0a34 Merge remote-tracking branch 'dteviot/FixLoadOrderReset' 2015-01-09 09:32:23 +01:00
scrawl
ef7e0070a6 Don't right-shift signed integers which is implementation-defined 2015-01-08 16:27:13 +01:00
Marc Zinnschlag
4b88ef5891 fixed QuickFileParser handling of begin line (skip it instead of trying to make sense of it) 2015-01-08 13:59:03 +01:00
dteviot
9d6efcecff Merge remote-tracking branch 'OpenMW/master' into FixLoadOrderReset 
Fixed Conflict:
	components/contentselector/model/contentmodel.cpp
 2015-01-08 12:15:48 +13:00
dteviot
083de62be5 Fixed issues found by Zinnschlag. 
1. Errors found are added to default tool tip text. (Instead of replacing it.)
2. If multiple errors are found, all are shown in tool tip text, not just first one.
3. Load Order Errors are updated when files are activated/deactivated, not just when the files have their position in list changed.
 2015-01-08 11:18:42 +13:00
Marc Zinnschlag
38a413a483 Merge remote-tracking branch 'scrawl/master' 2015-01-07 20:22:15 +01:00
Marc Zinnschlag
83e454e493 Merge remote-tracking branch 'marcoschulze/git-version-retrieval-fix' 2015-01-07 12:29:09 +01:00
scrawl
e19ab77d00 Store camera first person state in savegame (Fixes #2255) 2015-01-07 02:34:24 +01:00
scrawl
c6c7d102d0 Revert "components/nif/base.hpp now uses the templated get() function" 
This reverts commit ad609bff78.

Revert "Made incorrect nif get error message more informative."

This reverts commit 9909c4abad.

Revert "Build the nif file tester by default"

This reverts commit c1315ed90c.

Revert "Converted most nifstream "get multiple" functions to the templated version"

This reverts commit 2619d57bb6.

Revert "Add a templated option for getting vectors to NIFStream"

This reverts commit f318ee0b8c.

Revert "Made NIFStream getters templated"

This reverts commit 4edc4142f3.
 2015-01-06 23:36:15 +01:00
scrawl
f267497c03 Allow separate summoned creature instances for each spell ID (Fixes #2194) 2015-01-06 16:11:05 +01:00
scrawl
afc961d19c Workaround for random AABB assertion due to zero-sized particles (Fixes #1663) 2015-01-05 20:32:26 +01:00
Marc Zinnschlag
365bb3d3f0 Merge remote-tracking branch 'scrawl/unused' 2015-01-05 20:05:23 +01:00
scrawl
d919a0186e Comment out unused opSkipOnZero 2015-01-05 18:54:52 +01:00
scrawl
4a734f5cd3 Fall back to top-level directory when looking for resources (Fixes #2169) 2015-01-03 19:10:15 +01:00
Marc Zinnschlag
ac7c2a1473 some cleanup 2015-01-03 13:59:59 +01:00
Marc Zinnschlag
bbbf431ae3 double bug in script name handling workaround (Fixes #1730) 2015-01-03 13:54:46 +01:00
Marc Zinnschlag
9f6a2d00e8 Merge remote-tracking branch 'thoronador/fix-uninitialized-members' 2015-01-02 18:17:25 +01:00
Thoronador
773669952b remove initializing constructors from "dumb structs" 
As suggested by Marc Zinnschlag:
https://github.com/OpenMW/openmw/pull/423#issuecomment-68526701
 2015-01-02 16:30:14 +01:00
Arthur Moore
ad609bff78 components/nif/base.hpp now uses the templated get() function 2015-01-02 01:19:34 -05:00
Arthur Moore
9909c4abad Made incorrect nif get error message more informative. 2015-01-02 01:16:47 -05:00
Arthur Moore
c1315ed90c Build the nif file tester by default 
It's extremely useful in determining if a nif file is bad without having to load up openmw or opencs.
Also updated the nif testing script to run at a low priority.
 2015-01-01 22:49:33 -05:00
Arthur Moore
2619d57bb6 Converted most nifstream "get multiple" functions to the templated version 2015-01-01 22:49:05 -05:00
Arthur Moore
f318ee0b8c Add a templated option for getting vectors to NIFStream 2015-01-01 22:45:55 -05:00
Arthur Moore
4edc4142f3 Made NIFStream getters templated 2015-01-01 21:39:44 -05:00
Thoronador
9cc219ff76 fix uninitialized members in Pathgrid::Point 2015-01-02 01:22:53 +01:00
Thoronador
87fac78823 fix uninitialized members in Cell and structures 2015-01-02 01:01:37 +01:00
dteviot
fb671fed20 Corrected issues found by Scrawl. 2015-01-01 15:53:35 +13:00
scrawl
01652bbcc5 Store original actor position in AiWander package (Fixes #2200) 2015-01-01 03:38:49 +01:00
dteviot
43dd9aee94 Fix for more errors found by Travis CI. 2015-01-01 10:13:27 +13:00
dteviot
93bbd7463a Fixed errors and warnings from Travis CI. 2015-01-01 09:40:42 +13:00
dteviot
dfbd470613 Adjust plug-in order to match profile loading. 
Also marks plug-ins with load order problems in red and changes tool tip to describe error.
 2014-12-31 19:19:54 +13:00
scrawl
363d1f9207 Merge remote-tracking branch 'upstream/master' 2014-12-30 23:01:45 +01:00
Marco Schulze
3024c67995 Regenerate components/version/version.hpp as HEAD moves on a git checkout 
Pull request #416 introduced a common bug where version.hpp wouldn't be
regenerated every build, poteantially leading to stale version data. This
commit adds a custom build target, git-version, which updates version.hpp
before the components library is built.
 2014-12-30 18:37:33 -03:00
scrawl
e2346d7c37 Store permanent magic effects in savegame (Fixes #1648) 2014-12-30 01:36:31 +01:00
Marc Zinnschlag
82af524a58 Merge remote-tracking branch 'dteviot/master' 2014-12-26 16:21:18 +01:00
scrawl
59f21c6105 Use "hair" as filter for PRT_Hair parts (Fixes #2218) 2014-12-24 15:45:14 +01:00
scrawl
b35f87ae7e Improve font file error handling 2014-12-24 15:45:13 +01:00
scrawl
c7be850162 Add messagebox escape characters for spell/weapon cycling hotkeys 2014-12-24 15:45:13 +01:00
scrawl
f931ba2efc Fix some static analysis issues (coverity) 2014-12-24 15:45:12 +01:00
dteviot
ad5d884761 omwlauncher crash when can't read file in active profile (Fixes #1069) 2014-12-24 10:22:26 +13:00
MiroslavR
3cc32b641a Fix some memory leaks 2014-12-23 20:44:25 +01:00
Marc Zinnschlag
120873a66d another workaround for script translation messup 2014-12-18 10:40:51 +01:00
Marc Zinnschlag
057d0913d6 Merge branch 'scriptfixes' 2014-12-18 10:22:07 +01:00
Marc Zinnschlag
fc1d42a7d2 fixed exclusion for certain characters at the start of names 2014-12-18 09:55:26 +01:00
Marc Zinnschlag
b951251572 handle junk in argument lists (Fixes #2206) 2014-12-17 15:03:05 +01:00
Marc Zinnschlag
5cb94da9c5 compensate for incorrect minus character in translated dialogue script (Fixes #2207) 2014-12-17 11:56:54 +01:00
scrawl
31d28e727f Implement leveled list script functions (Fixes #1546) 2014-12-17 01:24:22 +01:00
scrawl
84b0dcf2e3 Work around particles not being rendered in the first frame 2014-12-15 18:19:05 +01:00
scrawl
8f29f2667e Fix rotation order for XYZ rotation keys (Fixes #1067) 2014-12-13 15:49:32 +01:00