1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-08-12 03:44:04 +00:00
Commit graph

21488 commits

Author SHA1 Message Date
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
scrawl
3dcefd17fc Fix CellStore::count() 2015-12-04 20:03:14 +01:00
scrawl
3aa53f3cb4 Object cell movement tracker works. Savegame handling is still missing and some game functionality is still stubbed out. 2015-12-04 19:46:02 +01:00
scrawl
64b4926127 Add reference moving logic - untested 2015-12-04 18:29:41 +01:00
scrawl
7a983340bf Add comment 2015-12-04 18:29:41 +01:00
scrawl
fc449233be Restore support for inserting objects into a cell 2015-12-04 18:29:41 +01:00
scrawl
0975f60d59 Stub out CellStore::get<T> accessors in preparation of reference movement between cells 2015-12-04 18:29:41 +01:00
scrawl
4a9b37aa53 Fix copy constructor issue 2015-12-04 18:08:32 +01:00
scrawl
c442af09c5 Write more documentation for the lighting system 2015-12-04 18:08:32 +01:00
Marc Zinnschlag
49b37ce8bf Merge remote-tracking branch 'scrawl/geteffect' 2015-12-04 10:42:22 +01:00
scrawl
462ef617ce Don't read forward/backward values for Quaternion key lists
https://forum.openmw.org/viewtopic.php?f=8&t=3201&p=35867#p35867
2015-12-04 00:18:54 +01:00
scrawl
8e9571d155 Double buffer the light StateAttributes and StateSets
Fixes a race condition where the position of a light could jump a frame ahead.
2015-12-04 00:06:22 +01:00
scrawl
1f8ee9b8d1 StateSetUpdater: use the frameNumber
More robust in case a node is updated twice in the same frame (e.g. because it has multiple parents).
2015-12-03 23:46:25 +01:00
scrawl
f22982d251 Merge pull request #835 from sandstranger/opengles1
enable opengl es1
2015-12-03 21:25:00 +01:00
scrawl
5f349b9a6e Support effects with attribute/skill argument in OpGetEffect 2015-12-03 21:12:58 +01:00
sandstranger
7db307e028 delete unused variables 2015-12-03 22:37:42 +03:00
scrawl
1ec338f19d Don't attempt to load external keyframes for non-NIF files 2015-12-03 20:11:28 +01:00
scrawl
795f6d77f2 Cache the Animation's Skeleton 2015-12-03 20:06:00 +01:00
scrawl
eb458bf9c8 Fix inactive RigGeometry not rendering correctly 2015-12-03 19:49:45 +01:00
sandstranger
7d374b36fd change cmake variables 2015-12-03 21:29:50 +03:00
sandstranger
d9b1b7c516 addd forgotten line 2015-12-03 19:56:38 +03:00
Marc Zinnschlag
e0c9265148 Merge remote-tracking branch 'origin/master' 2015-12-03 15:56:24 +01:00
Marc Zinnschlag
8b0659c4f2 Merge remote-tracking branch 'scrawl/soundlistener' 2015-12-03 15:52:57 +01:00
scrawl
389b168d5f Restore OpGetWaterLevel to vanilla behaviour 2015-12-03 15:48:27 +01:00
scrawl
6234fba16d Merge pull request #836 from kcat/master
More audio cleanups and crash fix
2015-12-03 15:41:22 +01:00
scrawl
d0c6b407b4 Fix isUnderwater checks being off by one for exterior cells 2015-12-03 15:16:50 +01:00