mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-26 23:39:42 +00:00
Code Issues Releases Wiki Activity
14080 commits 108 branches 68 tags 135 MiB
Commit graph

1332 commits

Author SHA1 Message Date
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
taras.kudryavtsev
0f2ea57648 #2730 and #2725 
Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
 2015-09-08 06:29:25 +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
Marc Zinnschlag
c3a31d13b1 make non-editable fields in dialogue sub view selectable (Fixes #2818) 2015-09-08 06:16:22 +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
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
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
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
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
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
1041c3babb IdTableProxyModel refreshes the filter when the source model data or rows changed 2015-07-27 15:23:31 +10:00
Rohit Nirmal
d037844d6e Fix building OpenCS with Qt 5. 2015-07-27 15:23:14 +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
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
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
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
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
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
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
Stanislav Bas
867ce686ae Proper conversion to QString for DropLineEdit::dropEvent() 2015-06-25 19:30:53 +03: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
Marc Zinnschlag
6fbdbb11d5 added refrash menu item to report table (Fixes #2620) 2015-06-25 12:03:40 +02:00
cc9cii
b1f07ba4fb Resolve merge issues and change the getSpells() interface. 2015-06-25 18:57:32 +10:00
Stanislav Bas
d282bead23 InfoCreator accepts drops of Topic/Journal ID 2015-06-25 11:24:19 +03:00
Stanislav Bas
5b82b9d9d0 ReferenceCreator accepts drops of Cell ID 2015-06-25 11:20:35 +03:00
cc9cii
66877cbfe7 Merge branch 'master' into autocalc 
Conflicts:
	apps/opencs/view/world/nestedtable.cpp
	apps/opencs/view/world/util.cpp
 2015-06-25 13:39:59 +10:00
Stanislav Bas
21f0b586ec Rows with the same topic but in different letter case can be reordered 2015-06-24 20:01:29 +03:00
Marc Zinnschlag
e29d9bcc8e use a namespace instead of a class with only static functions 2015-06-24 17:29:47 +02:00
Stanislav Bas
270c17faa7 Prevent drops on non-editable table cells 2015-06-24 16:36:09 +03:00
cc9cii
8af12788a4 Merge branch 'master' into autocalc 
Conflicts:
	apps/opencs/view/world/util.cpp
 2015-06-24 21:16:48 +10:00
cc9cii
6b00d4ad91 Move NPC autocalc to a separate component so that it can be shared between OpenMW and OpenCS. 
- Vanilla behaviour mimic'd where possible, except copying over autocalc spells to the npc's spell list when the status changes
 2015-06-24 21:05:59 +10:00
Stanislav Bas
d606b62688 Nested tables accept drops 2015-06-21 21:35:00 +03:00
Stanislav Bas
b9882eb59a DragRecordTable checks drag type before accepting it 2015-06-21 18:40:13 +03:00
Stanislav Bas
a23de394f8 Refine DropLineEdit code 2015-06-21 17:16:13 +03:00
Stanislav Bas
2565452052 Add some drag'n'drop utils to work with TableMimeData 2015-06-21 17:08:10 +03:00
Stanislav Bas
7dcdd130bb Rework Dialogue subview code according to DropLineEdit changes 2015-06-20 20:52:47 +03:00