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

14041 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stanislav Bas
0c4dd48394 Load methods (for ESM records) accept a deleted flag in ESMTool 
(cherry picked from commit 8243fb2479)

Conflicts:
	apps/esmtool/record.cpp
 2015-12-05 11:23:12 +11:00
Stanislav Bas
f4587e48f3 Load methods (for ESM records) accept a deleted flag in OpenCS 
(cherry picked from commit 13bb6be238)

Conflicts:
	apps/opencs/model/doc/savingstages.cpp
	apps/opencs/model/world/land.cpp
	apps/opencs/model/world/land.hpp
	apps/opencs/model/world/landtexture.cpp
 2015-12-05 11:22:51 +11:00
Stanislav Bas
0c002dd6de Load/read methods (for ESM records) accept a deleted flag in OpenMW 
(cherry picked from commit 67c8f95c4e)

Conflicts:
	apps/openmw/mwworld/store.cpp
 2015-12-05 11:20:55 +11:00
Stanislav Bas
82363bf318 Make deleted flag a parameter of load/save methods (instead of a record member) in ESM records 
(cherry picked from commit 4a16eba716)

Conflicts:
	components/esm/loadland.cpp
	components/esm/loadland.hpp
 2015-12-05 11:20:31 +11:00
Stanislav Bas
7013ba751c Fix build errors & warnings 
(cherry picked from commit 1e8182220a)
 2015-12-05 11:19:22 +11:00
Stanislav Bas
d12f784e7e Remove <cstdint> include file from loaddial.cpp 
(cherry picked from commit f5745749a6)
 2015-12-05 11:19:11 +11:00
Stanislav Bas
a3d48fd482 Rework ESS importer code. Remove explicit NAME handling for ESM records 
(cherry picked from commit 6b21da7f8e)
 2015-12-05 11:18:57 +11:00
Stanislav Bas
459fe3da52 Rework EsmTool code. Remove explicit NAME handling 
(cherry picked from commit ede4bfcf52)

Conflicts:
	apps/esmtool/record.cpp
 2015-12-05 11:18:46 +11:00
Stanislav Bas
0277a4e8c4 Implement saving of deleted records 
(cherry picked from commit 8e6a7be6f5)

Conflicts:
	apps/opencs/model/doc/savingstages.cpp
 2015-12-05 11:18:15 +11:00
Stanislav Bas
a120bb2b54 Delete infos of deleted dialogue when loading a content file 
(cherry picked from commit e04e32bcff)
 2015-12-05 09:46:53 +11:00
Stanislav Bas
9a803739ff Add a separate method to check whether a record is deleted or not for IdCollection 
(cherry picked from commit a4d3e59e5c)
 2015-12-05 09:46:40 +11:00
Stanislav Bas
696f7a942b Some refactoring. Remove unused code 
(cherry picked from commit 5fd48efd28)

Conflicts:
	apps/openmw/mwworld/store.cpp
 2015-12-05 09:46:20 +11:00
Stanislav Bas
b5c958c62a More ESM records have DELE handling. 
Changed records: Race, Land, Pathgrid, StartScript, DebugProfile, Filter

(cherry picked from commit e65ff723ce)

Conflicts:
	components/esm/loadland.cpp
	components/esm/loadland.hpp
 2015-12-05 09:17:40 +11:00
Stanislav Bas
8b7b3d2a4e Refine DELE handling in ESM records. Add position-independent DELE search 
(cherry picked from commit ad353e6dd0)
 2015-12-05 07:20:36 +11:00
Stanislav Bas
4e199697cc Handle deleted records in RefCollection 
(cherry picked from commit 3ba73f5fd9)
 2015-12-05 07:20:22 +11:00
Stanislav Bas
3686c1e32d Move DELE handling to CellRef record 
(cherry picked from commit e8a9567be3)
 2015-12-05 07:20:09 +11:00
Stanislav Bas
9503104129 Return a correct index for a loaded record that was deleted 
(cherry picked from commit a1389b87ba)
 2015-12-05 07:19:55 +11:00
Stanislav Bas
0979d88b0c Rework RefIdData code. Update the index map when a new record is loaded 
(cherry picked from commit 5e623a2a1d)
 2015-12-05 07:19:43 +11:00
Stanislav Bas
82e1b0563c Add NAME handling to DebugProfile and Filter records 
(cherry picked from commit b55a4999ca)
 2015-12-05 07:19:32 +11:00
Stanislav Bas
bd695feded Remove INAM handling from InfoCollection 
(cherry picked from commit 71e5fc7f04)
 2015-12-05 07:19:18 +11:00
Stanislav Bas
72152d84ed Move ID loading into a separate method for Dialogue and DialInfo records 
(cherry picked from commit c8c79dc1ef)

Conflicts:
	apps/openmw/mwworld/store.cpp
 2015-12-05 07:19:07 +11:00
Stanislav Bas
d518d70212 Remove NAME and DELE handling from IdCollection 
(cherry picked from commit 74a055f3cc)
 2015-12-05 07:18:39 +11:00
Stanislav Bas
639e6e1c56 Remove DELE and NAME handling from RefIdCollection and RefIdData 
(cherry picked from commit 42f9136141)
 2015-12-05 07:18:27 +11:00
Stanislav Bas
377d606fc3 Load/read methods in MWWorld::Store return a pair (record ID, deleted flag) 
(cherry picked from commit c266315a35)

Conflicts:
	apps/openmw/mwworld/store.cpp
	apps/openmw/mwworld/store.hpp
 2015-12-05 07:17:56 +11:00
Stanislav Bas
2448aa05cb Add removing of deleted Infos to Dialogue::clearDeletedInfos() 
(cherry picked from commit adec0cb61d)
 2015-12-05 07:09:23 +11:00
Stanislav Bas
25a8cda9ac Some fixes for ESM Dialogues and Infos 
(cherry picked from commit e0983c815c)
 2015-12-05 07:09:05 +11:00
Stanislav Bas
80074f90bf Set Deleted flag to false when initializing ESM records 
(cherry picked from commit 7ecb54a776)
 2015-12-05 07:08:50 +11:00
Stanislav Bas
19acd1fada Letter case fix for MWWorld::Globals 
(cherry picked from commit 20723581a1)
 2015-12-05 07:08:30 +11:00
Stanislav Bas
a46ea70d65 Convert IDs of loaded records to lower case in MWWorld::Store 
(cherry picked from commit 00bf87b561)
 2015-12-05 07:08:17 +11:00
Stanislav Bas
f8b0cfc637 Remove NAME handling from MWWorld::Globals 
(cherry picked from commit 897a52cdda)
 2015-12-05 07:08:00 +11:00
Stanislav Bas
2564eb9841 Remove NAME handling from MWWorld::ESMStore 
(cherry picked from commit 9301bc148e)
 2015-12-05 07:07:43 +11:00
Stanislav Bas
e0d5208d26 Remove explicit record ID in load/read methods of MWWorld::Store 
(cherry picked from commit 89e44c8f1f)
 2015-12-05 07:07:14 +11:00
Stanislav Bas
c4fd4be3ea Add NAME handling to GameSetting record 
(cherry picked from commit b2f3ccb080)
 2015-12-05 07:05:41 +11:00
Stanislav Bas
711d787939 Add NAME and DELE handling to Global record 
(cherry picked from commit 09a3358017)
 2015-12-05 07:05:28 +11:00
Stanislav Bas
1aa1336dcf Remove redundant code 
(cherry picked from commit 30b42bf4c0)
 2015-12-05 07:00:07 +11:00
Stanislav Bas
4f1601fe0d Add NAME handling to Race record 
(cherry picked from commit 8c3654af11)
 2015-12-05 06:59:53 +11:00
Stanislav Bas
7dc0c9138f Add NAME and DELE handling to Cell record 
(cherry picked from commit b667338a8f)
 2015-12-05 06:59:39 +11:00
Stanislav Bas
8c77cafc35 Add DELE handling to Info record 
(cherry picked from commit 847614c26f)
 2015-12-05 06:59:24 +11:00
Stanislav Bas
d89de1ba30 Add NAME and DELE handling to Dialogue record 
(cherry picked from commit 0b537186e5)
 2015-12-05 06:59:12 +11:00
Stanislav Bas
93736e9a81 Change DELE sub-record value to 0 (4 bytes) 
(cherry picked from commit 19ac4e942a)
 2015-12-05 06:59:01 +11:00
Stanislav Bas
1b21d1b5f7 Add NAME and DELE handling to Script record 
(cherry picked from commit d2c15647a3)
 2015-12-05 06:58:47 +11:00
Stanislav Bas
44c36a00f8 Add NAME and DELE handling to ESM records. 
Changed records are those where DELE is inserted at the beginning of a
record (before NAME).
The record has all required sub-records in this case.

(cherry picked from commit 9ac20a3355)
 2015-12-05 06:58:34 +11:00
Stanislav Bas
e9a8eac6af Add NAME and DELE handling to ESM records. 
Changed records are those where DELE is located after NAME sub-record.
And DELE is the last sub-record.

(cherry picked from commit 926c825d0c)

Conflicts:
	components/esm/loadstat.cpp
	components/esm/loadstat.hpp
	components/esm/util.hpp
 2015-12-05 06:58:16 +11:00
Marc Zinnschlag
70cb6f0238 fixed an interference with script warning mode and error downgrading (Fixes #2990) 
(cherry picked from commit b61b732207)
 2015-12-05 06:40:10 +11:00
scrawl
368dd9bd8d Compiler: remove unused mNameStartingWithDigit 
(cherry picked from commit f7d0d06134)
 2015-12-05 06:34:32 +11:00
cc9cii
c7c0023ed2 Merge pull request #12 from cc9cii/Feature-1278 
Feature #1278 - part 1
 2015-11-07 15:20:13 +11:00
cc9cii
9716b671f1 Merge branch 'cc9cii' into Feature-1278 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/nestedcoladapterimp.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/worldspacewidget.cpp
 2015-11-07 12:04:09 +11:00
cc9cii
f7598a67f4 Merge branch 'pathgrid-edit' into Feature-1278 
Conflicts:
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
 2015-11-07 11:56:34 +11:00
cc9cii
5b1373f3fd Merge pull request #11 from cc9cii/jump-to-modified 
Feature #2554
 2015-11-07 07:46:07 +11:00
cc9cii
007c733578 Resolve merge issues and add back user preference setting for auto selecting a modified record. 
(cherry picked from commit 321b1b5106a47500bffd4c78a66d3d6f44a06f5b)

Conflicts:
	apps/opencs/model/settings/usersettings.cpp
 2015-11-07 07:17:46 +11:00