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)
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/tools/tools.cpp
|
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)
Conflicts:
apps/opencs/editor.cpp
apps/opencs/editor.hpp
|
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 |
|
cc9cii
|
904f9871cc
|
Merge pull request #9 from cc9cii/master-cherry-pick-2
Master cherry pick 2
|
2015-09-08 07:55:29 +10: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 |
|
Marc Zinnschlag
|
c157fef2e0
|
allow use of IDs as function arguments, even if the ID matches a keyword (Fixes #2830)
|
2015-09-08 06:01:47 +10:00 |
|
Alexandre Moine
|
e9e057de2e
|
Rewrite of the description
|
2015-09-08 06:01:36 +10:00 |
|
Alexandre Moine
|
ce27f0c3f5
|
Add appdata file for openmw and install it
|
2015-09-08 06:01:24 +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
|
2242920b85
|
Fix compiling with MSVC 2013 (typo mistake with the include file).
|
2015-08-13 13:11:17 +10:00 |
|
cc9cii
|
bb250a236b
|
Fix compilation when using 1.9 Ogre branch (i.e. the previous change on this file was in fact not related to MSVC 2015, but rather the use of the Ogre default branch).
|
2015-08-13 13:09:40 +10:00 |
|