artemutin@yandex.ru
b0018aa791
Fix namespace, add file to CMakeLists.txt
...
(cherry picked from commit e672880f64
2015-11-01 22:34:49 +11:00
artemutin@yandex.ru
cb6198a843
Added StartScriptCreator class with redefined getErrors method.
...
(cherry picked from commit 3f27c85630
2015-11-01 22:34:36 +11:00
Marc Zinnschlag
69e6328507
fixed local variable caching issue in automatic error checking ( Fixes #2927 )
...
(cherry picked from commit 7bef97bf33
2015-11-01 21:36:14 +11:00
Marc Zinnschlag
14708e181c
more cleanup
...
(cherry picked from commit 659b87b25f
2015-11-01 21:35:43 +11:00
Marc Zinnschlag
6f294d0d25
removed some left-over signal slot stuff that shouldn't have been there in the first place
...
(cherry picked from commit b3b4fb3efb
2015-11-01 21:35:09 +11:00
scrawl
fcb9068c19
Fix tab indentations in apps/ and components/
...
(cherry picked from commit a47617c21f
2015-11-01 21:34:23 +11:00
cc9cii
ae1439f223
Fix typo.
...
(cherry picked from commit 1365b8edd1
2015-11-01 21:33:12 +11:00
cc9cii
2f76a1510e
Remove AI flag from the UI and instead auto-detect whether to save AIDT records. Should resolve bug #2879 .
...
(cherry picked from commit 45aee1b508
2015-11-01 21:32:34 +11:00
cc9cii
f7eb502493
Add missing fields for editing creatures.
...
- Should resolve resolve bugs #2878 (level), #2901 (gold) and #2889 (health).
- Moved Soul, Combat, Magic and Stealth editing to dialogue only (to be consistent with editing NPCs)
(cherry picked from commit 5a5e1a3b22
2015-11-01 20:36:24 +11:00
cc9cii
41f2ffdebb
Rationalise the use of ColumnIds
...
(cherry picked from commit c4a900ca2c
2015-11-01 20:28:13 +11:00
cc9cii
496cdcb51b
Ensure ColumnId names are unique. Filter parser calls Columns::getId() which implies that these should be unique.
...
(cherry picked from commit 258b2ba29a
2015-11-01 20:14:11 +11:00
Marc Zinnschlag
5031d1fbcb
disable on-demand loading of land data (for now, maybe)
...
(cherry picked from commit 5be176ee85
2015-11-01 18:57:18 +11:00
Marc Zinnschlag
453c3ee760
fixed an indexing error
...
(cherry picked from commit 23fde87816
2015-11-01 18:57:07 +11:00
Marc Zinnschlag
4aa6d7d1d1
various minor fixes
...
(cherry picked from commit 584a7a66b9
2015-11-01 18:56:56 +11:00
Marc Zinnschlag
dcf1f1515a
handle missing land texture records properly during merge
...
(cherry picked from commit 09ec60fe2a
2015-11-01 18:56:43 +11:00
Marc Zinnschlag
1784701b47
fixed a texture indexing bug (only affects the editor)
...
(cherry picked from commit 73f6efddcc
2015-11-01 18:56:31 +11:00
Marc Zinnschlag
25952369ae
merge land tables
...
(cherry picked from commit a8dc1c1198
2015-11-01 18:56:18 +11:00
Marc Zinnschlag
ce34daa64b
removed indirection in OpenMW-CS land record
...
(cherry picked from commit 85f6bb892b
2015-11-01 18:56:07 +11:00
Marc Zinnschlag
c4b34a077e
refactored loading of land data
...
(cherry picked from commit 69b9eadb52
2015-11-01 18:54:15 +11:00
cc9cii
4f24c6a7c8
more const-ness fixes
2015-11-01 17:07:40 +11:00
Marc Zinnschlag
44020df65f
made return type of ESMTerrain::Storage::getLand const
...
(cherry picked from commit febf611c82
2015-11-01 13:40:56 +11:00
Marc Zinnschlag
8cb1f4ffe9
additional safety check for land texture listing merge stage
...
(cherry picked from commit 69045d7ec9
2015-11-01 13:40:45 +11:00
Marc Zinnschlag
a2d4957d2a
merge land texture tables
...
(cherry picked from commit 890bbb6b11
2015-11-01 13:40:21 +11:00
Marc Zinnschlag
e5038cbece
fixed merge stage order; added proper initialisation
...
(cherry picked from commit b7983d08ba
2015-11-01 13:40:07 +11:00
Marc Zinnschlag
73ab89bf70
merge references tables
...
(cherry picked from commit a97a632aa7
2015-11-01 13:39:56 +11:00
Marc Zinnschlag
62daecadf5
fixed record state issues after merge
...
(cherry picked from commit 845cafd61c
2015-11-01 13:39:44 +11:00
Marc Zinnschlag
9230c62884
merge referenceables table
...
(cherry picked from commit f95950e8d8
2015-11-01 13:39:30 +11:00
Marc Zinnschlag
81188a3456
silenced a warning
...
(cherry picked from commit 9cf793c0b5
2015-11-01 13:39:18 +11:00
Marc Zinnschlag
72aa998261
simplifying merge stage
...
(cherry picked from commit 40753aa9a3
2015-11-01 13:37:41 +11:00
Marc Zinnschlag
e33314ad81
made merge operation more fluent
...
(cherry picked from commit 16dda281ce
2015-11-01 13:37:26 +11:00
Marc Zinnschlag
98cac624a9
added info tables and pathgrid table to merge operation
...
(cherry picked from commit 103073150e
2015-11-01 13:37:14 +11:00
Marc Zinnschlag
024a5405e0
flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first)
...
(cherry picked from commit c92898a5bc
2015-11-01 13:37:01 +11:00
Marc Zinnschlag
973c65bc82
merge id collections
...
(cherry picked from commit 3902513e65
2015-11-01 13:35:15 +11:00
Marc Zinnschlag
55dfe48ef7
copy meta data from game file when merging
...
(cherry picked from commit 47dd9505a9
2015-11-01 13:34:41 +11:00
Marc Zinnschlag
3eef192e4d
create merged document and open a view for it (document is still empty at this point)
...
(cherry picked from commit 1b663f01af
2015-11-01 13:31:28 +11:00
Marc Zinnschlag
0b8e04d6a8
forgot to connect merge operation signals
...
(cherry picked from commit d8655f2ff8
2015-11-01 13:25:59 +11:00
Marc Zinnschlag
9423603e94
inheriting Merge from QWidget instead of QDialog, because QDialog is bloody useless for non-modal dialogues (which makes the class completely useless, since modal dialogues are the spawn of Satan)
...
(cherry picked from commit e2377396a7
2015-11-01 13:25:46 +11:00
Marc Zinnschlag
e4381c3ec8
added merge operation (doesn't do anything yet)
...
(cherry picked from commit 904ad94952
2015-11-01 13:25:34 +11:00
Marc Zinnschlag
c2ed475950
disable merge menu item when a merge is already in progress
...
(cherry picked from commit 708cacdec4
2015-11-01 13:23:09 +11:00
Marc Zinnschlag
a5a0990d3c
improved adjuster widget problem reporting
...
(cherry picked from commit 4fd3097c1c
2015-11-01 13:22:54 +11:00
Marc Zinnschlag
ef1e01639e
added UI for merge tool (merge tool itself is still missing)
...
(cherry picked from commit b83f9445a9
2015-11-01 13:22:42 +11:00
Marc Zinnschlag
6fb658daa4
replaced State_Compiling (not requried anymore) with State_Merging
...
(cherry picked from commit 6a9218ee07
2015-11-01 13:19:56 +11:00
scrawl
52dfc0e9c7
Use the correct format specifier for ess-imported savegames
...
(cherry picked from commit 2065e0fa2d
2015-10-25 11:36:20 +11:00
scrawl
65bd5d8492
Refuse loading save games of unknown format
...
(cherry picked from commit 20d03c7e39
2015-10-25 11:35:53 +11:00
scrawl
05fd4e123e
Use the format field instead of version field
...
(cherry picked from commit a081d402c5
2015-10-25 11:35:32 +11:00
scrawl
b9ba1067bf
Savegame loading optimization
...
(cherry picked from commit 4637750601
2015-10-25 11:35:15 +11:00
scrawl
843afc5e24
Increment save file version and mark it as used, will be used in next commit
...
(cherry picked from commit 4eaaa5e855
2015-10-25 11:34:50 +11:00
Stanislav Bas
ca14d6a8a8
Add missing includes to columnimp.hpp
2015-09-08 06:48:04 +10:00
Stanislav Bas
859ba93739
Inform about State change (not a whole row) when modifying a table value
2015-09-08 06:47:50 +10:00
Stanislav Bas
b53a77389b
Show race only when mesh type is Skin (in BodyParts table)
2015-09-08 06:47:34 +10:00
Stanislav Bas
3a41fe5024
Convert AiWanderRepeat to bool in ActorAiRefIdAdapter::getNestedData()
2015-09-08 06:46:32 +10:00
Stanislav Bas
68013bd324
Columns with Display_Boolean use Combobox editor even for non-boolean values
2015-09-08 06:46:21 +10:00
Stanislav Bas
8c07d7f252
Remove enum names for AiWanderRepeat column
2015-09-08 06:46:10 +10:00
Stanislav Bas
214f3e5b9b
ModifyCommand uses a proper name of a modified nested value
2015-09-08 06:45:58 +10:00
Stanislav Bas
29536751f5
Sort tables by ID in the ascending order initially
2015-09-08 06:45:45 +10:00
scrawl
402f1ff5d8
Fix the ESM::LandTexture NAME being discarded on loading
2015-09-08 06:42:45 +10:00
scrawl
d1601feb39
Adjust OpenCS saving stages order to stop vanilla MW complaining about missing records
2015-09-08 06:42:34 +10:00
scrawl
f8f66bffb0
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
2015-09-08 06:40:06 +10:00
scrawl
dae2588c88
Editor: fix a typo in ESM::Light flag mappings
2015-09-08 06:37:31 +10:00
scrawl
1d2f4c8cfe
Editor: remove creature flag of unknown purpose from the UI
2015-09-08 06:35:58 +10:00
scrawl
34561379bc
Editor: fix magic effect magnitudes incorrectly labelled as Min/Max Range
...
Conflicts:
apps/opencs/model/world/columns.hpp
2015-09-08 06:34:56 +10:00
cc9cii
2f372a79b9
Remove additional instance of Display_YesNo (in cc9cii branch but not in master)
2015-09-08 06:31:38 +10:00
taras.kudryavtsev
0f2ea57648
#2730 and #2725
...
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
2015-09-08 06:29:25 +10:00
Stanislav Bas
f0982c87ba
Remove check for an empty Particle from Magic effects verifier
2015-09-08 06:20:59 +10:00
Stanislav Bas
11f5a928db
Don't allow empty value of School field in Magic Effects table
2015-09-08 06:20:41 +10:00
Stanislav Bas
ef02bc657f
Add magic effect verifier
2015-09-08 06:20:25 +10:00
Arthur Moore
a7befc1f0a
Removed now unneeded script
2015-09-08 06:19:08 +10:00
Arthur Moore
28bc0cca6c
Cleaned up niftest's output
...
A bad file inside of a bsa archive now looks like:
<game dir>/Data Files/TR_Data.bsa/meshes/tr/x/tr_act_ind_mark_alm.nif
2015-09-08 06:18:51 +10:00
Arthur Moore
8b48fe1cad
niftest now scans BSA files in directories for nif errors
...
The program is explicit so the user knows exactly where the bad file is.
2015-09-08 06:18:35 +10:00
Arthur Moore
16d163bd3e
Updated niftest's help message
2015-09-08 06:17:28 +10:00
Arthur Moore
8cecfe4e17
Have niftest handle directories as well
...
Note: BSA files within the directory must be passed manually.
2015-09-08 06:17:17 +10:00
Arthur Moore
7dc81c664a
Added a help message to niftest
...
Now using the boost argument parser.
2015-09-08 06:16:48 +10:00
Marc Zinnschlag
c3a31d13b1
make non-editable fields in dialogue sub view selectable ( Fixes #2818 )
2015-09-08 06:16:22 +10:00
Stanislav Bas
bc48ed94bc
Correct comparison of enum values in IdTableProxyModel
2015-09-08 05:56:37 +10:00
Stanislav Bas
c0d714adb6
Activate editing of nested table cells by a double click
...
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
2015-09-08 05:49:39 +10:00
Stanislav Bas
7a927eec79
Close EditWidget when a proper row removed
2015-09-08 05:45:33 +10:00
Stanislav Bas
bba3d6bec5
Restore Modified status of a record when adding/removing nested rows
2015-09-08 05:45:17 +10:00
Stanislav Bas
4366bdb4a8
Inform about Modified status change when modifying a value of a model
2015-09-08 05:44:58 +10:00
Stanislav Bas
ec98a1220f
Proper index for Modified column in ModifyCommand
2015-09-08 05:44:35 +10:00
cc9cii
b920e1bde7
Support MSVC 2015. Tested(*) with updated dependencies:
...
- Microsoft Visual Studio Community 2015 Version 14.0.23107.0 D14REL
- Qt 5.5, commit 1d3966833b5f27fb262f2d3727557ef2c8947828
- SDL2 default branch, Changeset: 9834 (d3fa6d0d3793)
- Ogre default branch, Changeset: 8048 (19479be2c7c5)
- Boost 1.59, commit 9a02cf8eb34eb31f0858c223ce95319f103addfa
- OpenAL commit 8fa4f276f89985be44007ce166109837cbfd5763
(*) only tested compilation and startup of the each app
2015-08-12 06:50:22 +10:00
cc9cii
5538f822f4
Initial support for Land and LandTexture tables. Updates Features #936 and #933 .
2015-08-01 07:50:56 +10:00
cc9cii
870bb491af
Fix for issue #6 ( https://github.com/cc9cii/openmw/issues/6 ) where dialogue subview for editing an NPC fails with an "invalid ID" exception.
...
* NPC autocalc code was looking for non-existent values of race and class, this is now validated first.
* Also took the opportunity to grey out the spells table when auto-calculated. The template specialisation is a bit ugly, though.
2015-07-31 09:05:26 +10:00
cc9cii
5bef43ac14
Remove duplicated config scanning (see: https://forum.openmw.org/viewtopic.php?f=7&t=2922&p=32940#p32940 )
...
* Requires boost::filesystem::canonical() from v1.48
* reduces startup time
* Fixes asset files being listed multiple times in tables
2015-07-30 16:30:59 +10:00
cc9cii
7e7c028530
Fix formatting issues after cherry-picking commit ab0b5932f7
2015-07-30 10:41:18 +10:00
Arthur Moore
f4776112c6
(Re) Wrote a tool to test NIF files in BSAs and on the filesystem.
...
Just give it a set of files, one file per argument, and it will make sure openmw can read them.
2015-07-30 09:34:12 +10:00
Stanislav Bas
9a936046f6
Add edit locking to ExtendedCommandConfigurator
2015-07-30 09:33:28 +10:00
Stanislav Bas
6033e67b4a
Close the extended configurator when all respective records were removed outside
2015-07-30 09:33:12 +10:00
Stanislav Bas
34d8e5dba5
Rewording of the user setting for extended configuration
2015-07-30 09:32:58 +10:00
Stanislav Bas
be1cf2fc80
ExtendedCommandConfigurator: layout changes
2015-07-30 09:31:48 +10:00
Stanislav Bas
194888e035
TableBottomBox: Creator/Configurator can be closed via Escape
2015-07-30 09:31:28 +10:00
Stanislav Bas
214a448ecf
Fix build error
2015-07-30 09:30:50 +10:00
Stanislav Bas
977f317eb9
ExtendedCommandConfigurator: the perform button is now the default for the widget
2015-07-30 09:27:26 +10:00
Stanislav Bas
09d867c9bf
ExtendedCommandConfigurator: the perform button takes the name of the command that is executed
2015-07-30 09:27:13 +10:00
Stanislav Bas
8eb677befb
The configuration panel gets a focus when opening
2015-07-30 09:26:56 +10:00
Stanislav Bas
bf3891e16f
ExtendedCommandConfigurator: disable the perform button when all tables are unchecked
2015-07-30 09:26:17 +10:00
Stanislav Bas
24eb9bddfb
TableBottomBox adjusts its size according to the current widget size
2015-07-30 09:26:03 +10:00
Stanislav Bas
6c51e13917
Rework widget layout of ExtendedCommandConfigurator
2015-07-30 09:25:48 +10:00
Stanislav Bas
94725f32d9
Add the ability to configure extended commands for tables
2015-07-30 09:25:34 +10:00
Stanislav Bas
832e910b6f
Add the user setting for enabling the configuration of extended commands
2015-07-30 09:24:45 +10:00
Stanislav Bas
297373f436
Add the configuration widget to the bottom box
...
Conflicts:
apps/opencs/view/world/tablebottombox.cpp
2015-07-30 09:24:28 +10:00
