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

2306 commits

Author SHA1 Message Date
Marc Zinnschlag
81188a3456 silenced a warning 
(cherry picked from commit 9cf793c0b5)

Conflicts:
	apps/opencs/model/doc/document.cpp
 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)

Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/document.hpp
 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)

Conflicts:
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/world/data.cpp
 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)

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/documentmanager.cpp
 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)

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
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
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
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
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
Stanislav Bas
09a95f276f Add Edit 'ID' action for nested tables 
Conflicts:
	apps/opencs/view/world/nestedtable.cpp
 2015-07-27 14:04:57 +10:00
Stanislav Bas
561c3bd553 Rework Table (view) code to use a TableEditIdAction 2015-07-27 13:44:22 +10:00
Stanislav Bas
110306f6b0 Create a separate class for Edit 'ID' action to use in tables' context menus 2015-07-27 13:44:07 +10:00
Stanislav Bas
ba68201593 IdContextMenu: don't add Edit action if it's already in the context menu 2015-07-27 13:43:54 +10:00
Stanislav Bas
bdb063a691 Prevent the Edit 'ID' action for the current ID of the dialogue subview 2015-07-27 13:43:40 +10:00
Stanislav Bas
d777c7a68a IdContextMenu: if the ID field is empty show the standard context menu (if available) 2015-07-27 13:43:25 +10:00
Stanislav Bas
814f2d3376 Edit 'ID' action is available in dialogue sub-views (for LineEdits and Labels) 2015-07-27 13:43:10 +10:00
Stanislav Bas
efed2556be Create a context menu handler for dialogue editors with ID information 2015-07-27 13:42:57 +10:00
Marc Zinnschlag
2cd62e19d8 implemented sorting in report views (Fixes #2540) 2015-07-27 13:42:41 +10:00
Stanislav Bas
8bf1b66ca2 Add the RecordType column to the MetaData table 2015-07-27 13:42:08 +10:00
Stanislav Bas
bec19fde97 Not accepted drag event must be ignored 2015-07-27 13:41:53 +10:00
Stanislav Bas
d7ce441b70 Deleted records can be cloned 2015-07-27 13:12:33 +10:00
Stanislav Bas
0809a738b8 Add the proper getErrors() method to CellCreator. 
Fix the impossibility of the Exterior Cell creation.
 2015-07-27 13:12:06 +10:00
Stanislav Bas
9ef3dced90 Close the creator when the original record is removed (in clone mode) 2015-07-27 13:11:54 +10:00
Stanislav Bas
3a6f708405 Cell type can be changed when cloning a cell 2015-07-27 13:11:34 +10:00
Stanislav Bas
1c9d36a368 Creating/cloning Cell sets the proper Interior flag 2015-07-27 13:11:21 +10:00
Stanislav Bas
0420f21462 Add the ability to add nested values to the Create command 2015-07-27 13:11:07 +10:00
Stanislav Bas
5602992b86 Add the ability to search a nested column index 
Conflicts:
	apps/opencs/model/world/idtree.cpp
	apps/opencs/model/world/idtree.hpp
 2015-07-27 13:10:52 +10:00
cc9cii
740c8bc6f1 Merge branch 'master' into cc9cii 
Conflicts:
	apps/opencs/model/settings/usersettings.cpp
	apps/opencs/view/world/dialoguesubview.cpp
 2015-07-27 10:53:39 +10:00
Marc Zinnschlag
15bb2855a9 disable prev/next buttons if there is no previous/next record 2015-06-27 16:57:45 +02:00
Marc Zinnschlag
e27a75bd10 added user setting for cyclic prev/next 2015-06-27 15:56:41 +02:00
Marc Zinnschlag
95522fcad2 more general cleanup 2015-06-27 15:29:54 +02:00
Marc Zinnschlag
9aa153984a fixed inconsistent handling of deleted records in dialogue; general cleanup 2015-06-27 15:02:50 +02:00
Marc Zinnschlag
a8c26ec0c1 moved most of the code for next/prev buttons from DialogueSubView to RecordBUttonBar 2015-06-27 14:42:22 +02:00
Marc Zinnschlag
d5e6d8a58b disable dialogue subview buttons while document is locked 2015-06-27 14:25:48 +02:00
Marc Zinnschlag
6769479358 moved code for initiating record cloning from DialogueSubView to RecordButtonBar 2015-06-27 13:47:07 +02:00
Marc Zinnschlag
7f1129df3b cleaned up DialogueSubView constructor; moved bottom box below button bar 2015-06-27 12:53:46 +02:00
Marc Zinnschlag
49dc30683f refactored dialogue subview button bar into a new class 2015-06-27 12:49:56 +02:00
cc9cii
e4c6ac22ea Merge branch 'cc9cii' into npc-autocalc 2015-06-27 09:25:20 +10:00
cc9cii
6542ff111d Fix merge issues. 2015-06-27 08:50:53 +10:00
cc9cii
2612a91f8d Merge branch 'master' into autocalc 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.hpp
	apps/opencs/view/world/dialoguesubview.cpp
 2015-06-27 07:46:36 +10:00
Marc Zinnschlag
6d5823e8aa killed some tabs 2015-06-26 18:54:49 +02:00
Marc Zinnschlag
fdf6645dbc Merge remote-tracking branch 'smbas/fix-info-tables' 2015-06-26 18:47:16 +02:00
Marc Zinnschlag
654e7428aa Merge remote-tracking branch 'smbas/master' 2015-06-26 18:39:40 +02:00
Marc Zinnschlag
2dada1a162 Merge branch 'meta' 2015-06-26 18:37:39 +02:00
Marc Zinnschlag
4487bda702 size limits for meta data strings 2015-06-26 18:19:00 +02:00
Marc Zinnschlag
a4c2c75d1f fixed overwriting of meta data when loading project file 2015-06-26 16:22:06 +02:00
Marc Zinnschlag
1e033fa8fe added meta data dialogue sub view 2015-06-26 16:11:00 +02:00
Marc Zinnschlag
57015f3666 fixed handling of numeric read-only fields in dialogue sub views 2015-06-26 15:50:36 +02:00
Marc Zinnschlag
10fbe6aada split DialogueSubView in SimpleDialogueSubView and DialogueSubView 2015-06-26 15:17:47 +02:00
Marc Zinnschlag
5a37530c1c added missing MetaData table UniversalId type 2015-06-26 15:17:18 +02:00
Marc Zinnschlag
1870b087e7 ported setting of meta data for saving to the new mechanism 2015-06-26 13:13:22 +02:00
Marc Zinnschlag
f3ff90e1fd moved meta data into a new single-row table 2015-06-26 13:01:25 +02:00
cc9cii
3e29bb8a86 Fix undo for NPC autocalc changes. Fix the lack of refresh after race powers subtable. 2015-06-26 16:10:50 +10:00
cc9cii
78457a8234 Simplify npc data update and fix data copy when autocal flag changed. 2015-06-26 13:50:09 +10:00
cc9cii
8c39f2b376 Fix dereferencing a null pointer. 2015-06-26 08:52:39 +10:00
cc9cii
273ff1cccb Address review comments. 2015-06-26 07:48:48 +10:00
Stanislav Bas
ea97b0a20c Refine InfoTableProxyModel::getFirstInfoRow() code 2015-06-25 20:08:42 +03:00
Stanislav Bas
844e5c504d Fix conversion to QString 2015-06-25 19:41:26 +03:00
Stanislav Bas
867ce686ae Proper conversion to QString for DropLineEdit::dropEvent() 2015-06-25 19:30:53 +03:00
Marc Zinnschlag
8fbc799655 Merge remote-tracking branch 'cc9cii/master' 2015-06-25 14:06:22 +02:00
Marc Zinnschlag
69db0179ca update refresh menu item on stateChanged signal instead of when opening the menu 2015-06-25 13:05:57 +02:00
cc9cii
67b6c86a59 Fix initialisation order - properly this time. 2015-06-25 20:34:27 +10:00
cc9cii
c0f3d70f06 Use the new severity message attribute. 2015-06-25 20:23:43 +10:00
cc9cii
71f3b7ed4f Fix crash when user preference is missing. 2015-06-25 20:21:51 +10:00