Alexander "Ace" Olofsson
940e982d65
Add FFMPEG to include path for OpenMW
...
I'm a bit confused; `mwsound/ffmpeg_decoder.hpp/cpp` requires FFMPEG headers to compile, how did this work in the first place?
(cherry picked from commit d2a4175804
2015-12-05 17:29:12 +11:00
cc9cii
1334091613
Resolve merge issues.
2015-12-05 17:28:32 +11:00
scrawl
33c0db1d9a
Adjust tests to work with esm_rewrite branch.
...
(cherry picked from commit aae1aa3708
2015-12-05 11:27:12 +11:00
scrawl
0d9ffe8119
Tests: add record overwrite test
...
(cherry picked from commit f91aae2350
2015-12-05 11:27:00 +11:00
scrawl
d3ada38f01
Tests: add record deletion test
...
(cherry picked from commit 1e817a976f
2015-12-05 11:26:49 +11:00
scrawl
c3031da20e
Tests: add content_diagnostics_test (requires some data files)
...
(cherry picked from commit 771193bae8
2015-12-05 11:26:37 +11:00
scrawl
c221be76dc
Tests: add dialogue_merging_test (requires some data files)
...
(cherry picked from commit 38c155c579
2015-12-05 11:26:24 +11:00
scrawl
f9e12d6fbd
Delete empty test
...
(cherry picked from commit d0d8c2eded
2015-12-05 11:26:11 +11:00
scrawl
25bb8a59ef
esmtool fix
...
(cherry picked from commit 9116c701d5
2015-12-05 11:25:59 +11:00
Stanislav Bas
2abdeef2e0
Remove unused includes
...
(cherry picked from commit daaff1284e
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 0c6ab6cc94
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 8243fb2479
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
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
2015-12-05 11:20:55 +11:00
Stanislav Bas
7013ba751c
Fix build errors & warnings
...
(cherry picked from commit 1e8182220a
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 6b21da7f8e
2015-12-05 11:18:57 +11:00
Stanislav Bas
459fe3da52
Rework EsmTool code. Remove explicit NAME handling
...
(cherry picked from commit ede4bfcf52
2015-12-05 11:18:46 +11:00
Stanislav Bas
0277a4e8c4
Implement saving of deleted records
...
(cherry picked from commit 8e6a7be6f5
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
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
bd695feded
Remove INAM handling from InfoCollection
...
(cherry picked from commit 71e5fc7f04
2015-12-05 07:19:18 +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
2015-12-05 07:17:56 +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
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
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 7f477e2fae
2015-11-02 18:50:02 +11:00
cc9cii
6d38d97470
Fix some sub-tables becoming uneditable since commit 80869d
...
(cherry picked from commit 4af469511d
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 819fecd08e
2015-11-02 18:46:34 +11:00
cc9cii
26195dc5fe
Rename a variable to make it less confusing.
...
(cherry picked from commit 7c007d9c6d
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 78c735adc6
2015-11-02 18:46:04 +11:00
cc9cii
245357c9b2
Move TableEditModes enum inside a class scope.
...
(cherry picked from commit 107ccd84d4
2015-11-02 18:45:17 +11:00
cc9cii
0ec4af4210
Re-add mistakenly removed line and fix a silly typo.
...
(cherry picked from commit 77471d1592
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 80869d9bae
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 972193c7eb
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 1a64b40725
2015-11-01 23:08:55 +11:00
cc9cii
30de5c1c59
Fix editing ingredient effects sub-table. Should resolve bug #2978 .
...
(cherry picked from commit 9f0e059a15
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 eae36f8005
2015-11-01 22:50:37 +11:00
