mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 12:39:55 +00:00
Code Issues Projects Releases Wiki Activity
14,047 Commits 17 Branches 67 Tags
Commit Graph

10729 Commits

Author SHA1 Message Date
scrawl
25bb8a59ef esmtool fix 
(cherry picked from commit 9116c701d518f791252fe2c991d24938bf03e3ea)

Conflicts:
	apps/esmtool/record.cpp
 2015-12-05 11:25:59 +11:00
Stanislav Bas
2abdeef2e0 Remove unused includes 
(cherry picked from commit daaff1284e26d13358b130d7b44721ced210066d)

Conflicts:
	apps/openmw/mwworld/store.cpp
	components/esm/util.hpp
 2015-12-05 11:23:57 +11:00
Stanislav Bas
38e99c9cd4 Load methods (for ESM records) accept a deleted flag in ESSImporter 
(cherry picked from commit 0c6ab6cc9449e14fe30d1f9baa3424b92eee9ba8)
 2015-12-05 11:23:24 +11:00
Stanislav Bas
0c4dd48394 Load methods (for ESM records) accept a deleted flag in ESMTool 
(cherry picked from commit 8243fb2479a18cd47e03e9ffcff87020a9c1446f)

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 13bb6be2383c808084eabed0cb1bfb3b9749e55a)

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 67c8f95c4e85466a7c802f4cced117ade2378184)

Conflicts:
	apps/openmw/mwworld/store.cpp
 2015-12-05 11:20:55 +11:00
Stanislav Bas
7013ba751c Fix build errors & warnings 
(cherry picked from commit 1e8182220ae7c14de13ab634c82f2b14444c0e69)
 2015-12-05 11:19:22 +11:00
Stanislav Bas
a3d48fd482 Rework ESS importer code. Remove explicit NAME handling for ESM records 
(cherry picked from commit 6b21da7f8e6b50de71047248c36d4ee9ec51751e)
 2015-12-05 11:18:57 +11:00
Stanislav Bas
459fe3da52 Rework EsmTool code. Remove explicit NAME handling 
(cherry picked from commit ede4bfcf52a77f371058e0fdce655534d6879056)

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 8e6a7be6f543a112c6aa3e814f572a9d2839ab15)

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 e04e32bcffa3c95f7c2a007d5fcf09641fff0b03)
 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 a4d3e59e5c7380ffb27b4d17d4574009e2b45379)
 2015-12-05 09:46:40 +11:00
Stanislav Bas
4e199697cc Handle deleted records in RefCollection 
(cherry picked from commit 3ba73f5fd9feb9727b56f32767c848e520d9a94c)
 2015-12-05 07:20:22 +11:00
Stanislav Bas
3686c1e32d Move DELE handling to CellRef record 
(cherry picked from commit e8a9567be30fb35e78e252bf52e95bcebe76a109)
 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 a1389b87bacd08f54c4c146c7a0b6d1ed51edc54)
 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 5e623a2a1d06d5679f214cad95123a1d3bd88b34)
 2015-12-05 07:19:43 +11:00
Stanislav Bas
bd695feded Remove INAM handling from InfoCollection 
(cherry picked from commit 71e5fc7f0458f77e94879399a39e36393ed19409)
 2015-12-05 07:19:18 +11:00
Stanislav Bas
d518d70212 Remove NAME and DELE handling from IdCollection 
(cherry picked from commit 74a055f3ccbe25e50d2947d6fe639a84e3138ec7)
 2015-12-05 07:18:39 +11:00
Stanislav Bas
639e6e1c56 Remove DELE and NAME handling from RefIdCollection and RefIdData 
(cherry picked from commit 42f9136141657cbe3fd0801c579e37dd1ff47a30)
 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 c266315a355480ad6e4bc665e5d4150c6c8de8f3)

Conflicts:
	apps/openmw/mwworld/store.cpp
	apps/openmw/mwworld/store.hpp
 2015-12-05 07:17:56 +11:00
Stanislav Bas
25a8cda9ac Some fixes for ESM Dialogues and Infos 
(cherry picked from commit e0983c815c32c9b79d340100ab2b4b6750820554)
 2015-12-05 07:09:05 +11:00
Stanislav Bas
19acd1fada Letter case fix for MWWorld::Globals 
(cherry picked from commit 20723581a102f021ba04296096d5cd0c715f0d66)
 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 00bf87b5611d7dbc8fc8e7d5add1a4a236071733)
 2015-12-05 07:08:17 +11:00
Stanislav Bas
f8b0cfc637 Remove NAME handling from MWWorld::Globals 
(cherry picked from commit 897a52cdda1cec48833af47c2798b6836c9f4d36)
 2015-12-05 07:08:00 +11:00
Stanislav Bas
2564eb9841 Remove NAME handling from MWWorld::ESMStore 
(cherry picked from commit 9301bc148e9fa10e58519debdc7103a9babae07b)
 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 89e44c8f1fcb02a0ea78b468402a2c8e96d5465c)
 2015-12-05 07:07:14 +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
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
cc9cii
fb3015c9b8 Merge branch 'cc9cii' into jump-to-modified 
Conflicts:
	apps/opencs/view/world/table.cpp
	apps/opencs/view/world/table.hpp
	apps/opencs/view/world/tablesubview.cpp
 2015-11-07 06:30:46 +11:00
cc9cii
12a8692cdb Fix include file issue. 
(cherry picked from commit 7f477e2fae47bdfe78ac17b2622ed2fdd844fd98)
 2015-11-02 18:50:02 +11:00
cc9cii
6d38d97470 Fix some sub-tables becoming uneditable since commit 80869d 
(cherry picked from commit 4af469511da373c48d7b3eaa0b4e1eb37971558c)

Conflicts:
	apps/opencs/model/world/refidadapterimp.hpp
 2015-11-02 18:49:48 +11:00
cc9cii
a19a1dabe2 Add a check for scale value of 0. Should resolve bug #2880. 
(cherry picked from commit 819fecd08ec163e3f6b94ca40330f68214d54579)
 2015-11-02 18:46:34 +11:00
cc9cii
26195dc5fe Rename a variable to make it less confusing. 
(cherry picked from commit 7c007d9c6d530126075165766a8c497bd3de7d62)
 2015-11-02 18:46:21 +11:00
cc9cii
894f3a9418 Fix saving when only topic info was modified (topic itself unchanged) 
(cherry picked from commit 78c735adc609dda06954746b31cea4289a7060ad)
 2015-11-02 18:46:04 +11:00
cc9cii
245357c9b2 Move TableEditModes enum inside a class scope. 
(cherry picked from commit 107ccd84d4f411a825c2f095bae7f84e65f8609d)

Conflicts:
	apps/opencs/model/world/refidadapterimp.cpp
 2015-11-02 18:45:17 +11:00
cc9cii
0ec4af4210 Re-add mistakenly removed line and fix a silly typo. 
(cherry picked from commit 77471d1592611fe08b65e6b34b7e656d78753944)
 2015-11-02 06:25:46 +11:00
cc9cii
f08680ebcd Disable context menu for fixed size sub-tables. Should resolve bug #2932. 
(cherry picked from commit 80869d9bae8c472ec7d1dca38eb668cc32850352)

Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
	apps/opencs/view/world/nestedtable.cpp
	apps/opencs/view/world/nestedtable.hpp
 2015-11-02 06:25:31 +11:00
cc9cii
b595f2641c Fix issue where mandatory effects field was allowed to be empty (and vice versa) 
(cherry picked from commit 972193c7ebcb597dfdd5b38e72965efa1bb4e70f)
 2015-11-01 23:09:06 +11:00
cc9cii
bb1a959c88 Fix skills and attributes being possible to add to irrelevant effects. Should resolve bug #2980. 
(cherry picked from commit 1a64b4072570e09a75e2ac250576589244ed8a3e)
 2015-11-01 23:08:55 +11:00
cc9cii
30de5c1c59 Fix editing ingredient effects sub-table. Should resolve bug #2978. 
(cherry picked from commit 9f0e059a15106eb5fa8f1174eadd91076623e7d3)
 2015-11-01 23:08:42 +11:00
artemutin@yandex.ru
91c4afe78c Fixed filter reapplication on Description column change and on State 
column change.

Moved column index search to widget constructor, rewrite slot with
respect to multiple columns data change.

(cherry picked from commit eae36f800585a9347e778b36a1010b2a05f576c4)
 2015-11-01 22:50:37 +11:00
artemutin@yandex.ru
437cabf778 If table dont use any filter, filter update now dont cause a reapply of empty filter 
(cherry picked from commit 33e12a99fad15ced87a9996c42ffeb84983be2a4)
 2015-11-01 22:50:21 +11:00
artemutin@yandex.ru
f44d7e97b0 Stream error handling, and other minor changes. 
(cherry picked from commit 4ca7b2660932efb06535f148a643a7e814f3a72d)
 2015-11-01 22:49:05 +11:00
artemutin@yandex.ru
ba9190ed5e Implemented line and col calculations in scriptsubview 
(cherry picked from commit e7a3f059aafb643238d95de8d34554747d7e74f2)
 2015-11-01 22:48:53 +11:00
cc9cii
71077fda6a Disable toolbar context menu. Should resolve bug #2953. 
(cherry picked from commit 64821b0785a306f90e4f2f3be9c6a8fa61d440eb)
 2015-11-01 22:48:01 +11:00
cc9cii
b3daa7d956 Fix AiWander sub-table editing. Should resolve bugs #2888 and #2930. 
(cherry picked from commit 3bbcf6a9169dc24d47c4d10e24f3818681fc34c0)

Conflicts:
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
 2015-11-01 22:47:47 +11:00
cc9cii
9cc046ce4e Further rationalise the use of ColumnIds 
- Address Zini's review comments as per https://github.com/OpenMW/openmw/pull/755

(cherry picked from commit 998348e606182eb171dd82b99b647e3dff798b26)
 2015-11-01 22:46:18 +11:00
artemutin@yandex.ru
c34d8c2a0d Add StartScriptCreator to a factory manager. 
(cherry picked from commit ecce3a197550cd8b689e7d2bf697461325a7c6b9)

Conflicts:
	apps/opencs/view/world/subviews.cpp
 2015-11-01 22:37:25 +11:00
artemutin@yandex.ru
7f46bc155a add getIdValidatorResult method to GenericCreator, for use in subclass 
StartScriptCreator

(cherry picked from commit 903cd3322b2a24e4d0a757ede8e429583f34f2b4)
 2015-11-01 22:35:12 +11:00