mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 19:15:31 +00:00
Code Issues Releases Wiki Activity
13939 commits 38 branches 54 tags 122 MiB
Commit graph

10650 commits

Author SHA1 Message Date
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
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
Stanislav Bas
b667500ae2 Add the configuration widget for extended commands 
Conflicts:
	apps/opencs/CMakeLists.txt
 2015-07-30 09:20:05 +10:00
Stanislav Bas
3280aade39 Don't inform about a nested row addition in proxy models for top-level tables 2015-07-30 09:14:03 +10:00
Stanislav Bas
6a82ce0d50 Rework Table to use rowAdded() signal of a proxy model 
Conflicts:
	apps/opencs/view/world/table.cpp
	apps/opencs/view/world/table.hpp
 2015-07-30 09:13:39 +10:00
Stanislav Bas
9461baa2ea Inform about a row addition after re-sorting in InfoTableProxyModel 2015-07-30 08:14:36 +10:00
Stanislav Bas
f24b293c13 Create a custom signal to inform about a row addition in IdTableProxyModel 2015-07-30 08:14:20 +10:00
scrawl
6c8862e542 Fix a typo 2015-07-27 17:39:23 +10:00
Stanislav Bas
77d5476d46 Proper index creation for nested data 2015-07-27 15:24:01 +10:00
Stanislav Bas
1041c3babb IdTableProxyModel refreshes the filter when the source model data or rows changed 2015-07-27 15:23:31 +10:00
Stanislav Bas
ca67e4ea3a Proper sorting of columns with enum values 2015-07-27 15:23:30 +10:00
Rohit Nirmal
d037844d6e Fix building OpenCS with Qt 5. 2015-07-27 15:23:14 +10:00
Marc Zinnschlag
1d722fcdbc incorrect sBribe GMSTs for new omwgame files (Fixes #2785) 2015-07-27 15:21:04 +10:00
Marc Zinnschlag
833844f5a4 do not allow editing of deleted scripts 2015-07-27 15:20:39 +10:00
Marc Zinnschlag
25bb2983e2 make compilation delay configurable via a user setting 2015-07-27 15:20:38 +10:00
Marc Zinnschlag
7f89d3688f put script compilation in script subview behind a timer 2015-07-27 15:20:36 +10:00
Marc Zinnschlag
9abc57d988 do not try to jump to source location for errors that do not have a source location 2015-07-27 15:20:34 +10:00
Marc Zinnschlag
527ab1aff7 consider column when jumping to error in source text 2015-07-27 15:20:32 +10:00
Marc Zinnschlag
757f7d895a jump to line in source text when clicking on an error in error table 2015-07-27 15:20:30 +10:00
Marc Zinnschlag
6576ac34f6 made error table read only 2015-07-27 15:20:28 +10:00
Marc Zinnschlag
e86b8c96f5 improved error table layout 2015-07-27 15:20:27 +10:00
Marc Zinnschlag
446ac998d8 consider script warning settings for script subview 2015-07-27 15:20:26 +10:00
Marc Zinnschlag
092204bd82 refactored mapping from message severity enum to string 2015-07-27 15:20:24 +10:00
Marc Zinnschlag
3ea445cc67 improved error reporting 2015-07-27 15:20:22 +10:00
Marc Zinnschlag
c5eec822ae display script errors in script subview 2015-07-27 15:20:21 +10:00
Marc Zinnschlag
ecbdd7d753 hooked up script subview buttons to bottom box (enables add and clone) 2015-07-27 15:20:19 +10:00
Marc Zinnschlag
2064a3979b fixed deleted button sensitivity state 2015-07-27 15:20:18 +10:00
Marc Zinnschlag
a658efe557 improving consistency of subview layouts 2015-07-27 15:20:16 +10:00
Marc Zinnschlag
286f1c8c5c replaced the script subview status bar with a bottom box (including a status bar) 
Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
 2015-07-27 15:20:14 +10:00
Marc Zinnschlag
ab0b5932f7 added user settings option to toggle toolbars in single-record subviews 
Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
 2015-07-27 15:15:05 +10:00
Marc Zinnschlag
05ed8ada11 renaming a few user settings categories 2015-07-27 15:13:51 +10:00
Marc Zinnschlag
ee85bbc0e6 added button bar to script subview 2015-07-27 15:13:27 +10:00
scrawl
0671987d10 Fix config file priority in the launcher to match OpenMW 2015-07-27 15:12:13 +10:00
MiroslavR
5dc87e5008 Fix calculation of selected blocks in ScriptEdit 2015-07-27 14:26:38 +10:00
Stanislav Bas
fb395e4dc9 Count of nested columns can be retrieved for a collection with no records 2015-07-27 14:25:02 +10:00
Stanislav Bas
27c9eaeffc Add Edit 'ID' action for nested fields 2015-07-27 14:05:37 +10:00
Stanislav Bas
bcd0f0f4e4 TableEditIdAction: prevent creation of a UniversalId with Type_None 2015-07-27 14:05:18 +10:00