krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
15770 commits 35 branches 0 tags 65 MiB
Commit graph

1396 commits

Author SHA1 Message Date
Marc Zinnschlag
f3ee3f5be1 Do not call base class event functions in WorldspaceWidget 
This avoids some event function being triggered twice. I do not fully understand why
calling the base class function causes this problem, which is more than a bit
disconcerting, but let's roll with it for now.
 2015-10-27 15:25:46 +01:00
Marc Zinnschlag
6c65081643 Merge branch 'marker' 2015-10-26 14:27:29 +01:00
Marc Zinnschlag
e34af4c4b5 handle primary and secondary edit button clicks on cell arrows 2015-10-25 15:16:22 +01:00
Marc Zinnschlag
8f0d7ec1ec Merge remote-tracking branch 'artemutin/longStringEditor' 2015-10-16 09:15:48 +02:00
artemutin@yandex.ru
eae36f8005 Fixed filter reapplication on Description column change and on State 
column change.

Moved column index search to widget constructor, rewrite slot with
respect to multiple columns data change.
 2015-10-16 11:32:22 +10:00
Marc Zinnschlag
361634489e properly handle cells that don't exist 2015-10-15 14:46:08 +02:00
artemutin@yandex.ru
33e12a99fa If table dont use any filter, filter update now dont cause a reapply of empty filter 2015-10-14 21:22:28 +10:00
Marc Zinnschlag
773df6fd22 some OSG fixes 2015-10-13 16:53:40 +02:00
Marc Zinnschlag
68115c4e8a (somewhat) improved the colour scheme 2015-10-13 16:15:53 +02:00
Marc Zinnschlag
0b1d6bddc8 merged primitives arrays 2015-10-13 16:11:47 +02:00
Marc Zinnschlag
6e140c9cb1 proper shape for cell arrows (kinda) 2015-10-13 11:43:33 +02:00
Marc Zinnschlag
3f9db7ba3c more reliable method of obtaining the cell coordinates in CSVRender::Cell 2015-10-12 18:00:44 +02:00
Marc Zinnschlag
b81ee606c8 use CellCoordinates instead of a pair of ints for cell coordinates 2015-10-12 14:31:55 +02:00
Marc Zinnschlag
0d35938794 basic cell arrow rendering (shape is a placeholder) 2015-10-12 14:12:01 +02:00
Marc Zinnschlag
3b39572274 Merge remote-tracking branch 'artemutin/scriptSearchRedirect' 2015-10-09 17:15:11 +02:00
artemutin@yandex.ru
4ca7b26609 Stream error handling, and other minor changes. 2015-10-09 21:57:02 +10:00
cc9cii
64821b0785 Disable toolbar context menu. Should resolve bug #2953. 2015-10-09 06:29:50 +11:00
artemutin@yandex.ru
e7a3f059aa Implemented line and col calculations in scriptsubview 2015-10-09 00:29:18 +10:00
cc9cii
998348e606 Further rationalise the use of ColumnIds 
- Address Zini's review comments as per https://github.com/OpenMW/openmw/pull/755
 2015-10-08 12:35:09 +11:00
Alexander "Ace" Olofsson
b4132faaea Update editmode.cpp 
Fixes builds on Windows
 2015-10-04 16:27:05 +02:00
Rohit Nirmal
0a8e2c0b21 Fix building OpenCS with Qt 5. 2015-10-03 00:07:08 -05:00
Marc Zinnschlag
6ef2319eb8 Merge branch 'sceneinput' 2015-10-02 15:07:01 +02:00
Marc Zinnschlag
4b0fa370e3 made WorldspaceWidget::getDocument public (EditModes will need the document later) 2015-10-02 15:06:42 +02:00
Marc Zinnschlag
323f8bb29f sensitivity settings 2015-10-01 13:42:21 +02:00
Marc Zinnschlag
1d4f8b2595 send mouse wheel input to active EditMode during drag operations 2015-10-01 13:19:48 +02:00
Marc Zinnschlag
0a5bfb2107 added framework for drag operations 2015-10-01 12:46:01 +02:00
artemutin@yandex.ru
ecce3a1975 Add StartScriptCreator to a factory manager. 2015-09-30 09:46:51 +10:00
artemutin@yandex.ru
903cd3322b add getIdValidatorResult method to GenericCreator, for use in subclass 
StartScriptCreator
 2015-09-30 09:46:51 +10:00
artemutin@yandex.ru
e672880f64 Fix namespace, add file to CMakeLists.txt 2015-09-30 09:46:51 +10:00
artemutin@yandex.ru
3f27c85630 Added StartScriptCreator class with redefined getErrors method. 2015-09-30 09:46:51 +10:00
Marc Zinnschlag
8e87b48866 handle context-sensitive select mode in instance editing 2015-09-29 16:07:14 +02:00
Marc Zinnschlag
2cb106f6ad added missing flagAsModified calls 2015-09-29 16:06:55 +02:00
Marc Zinnschlag
f28fa9fc16 clear instance selection on select click on nothing/something that isn't an instance 2015-09-29 13:53:47 +02:00
Marc Zinnschlag
319e3f24a3 on edit mode change clear selection of elements that are not affected by current edit mode (only support for instance for now since we do not have selection for other elements yet) 2015-09-29 13:48:04 +02:00
Marc Zinnschlag
981a8a2cc2 delegated editing and selection functions to mode objects 2015-09-27 16:18:22 +02:00
Marc Zinnschlag
9bf27c7e37 moved edit mode handling from SceneSubView to WorldspaceWidget 2015-09-27 14:38:12 +02:00
Marc Zinnschlag
5d9863aec1 removed a redundant check 2015-09-27 11:34:14 +02:00
Marc Zinnschlag
7bbc475bda apply button mapping 2015-09-26 18:01:49 +02:00
Marc Zinnschlag
501ae6372d factored out mouse picking into a separate function 2015-09-26 17:51:41 +02:00
Marc Zinnschlag
3844c94975 bit masking fix 2015-09-26 17:39:55 +02:00
Marc Zinnschlag
72bb33c2c4 filter mouse interaction by interaction mask 2015-09-26 12:24:41 +02:00
Marc Zinnschlag
71247a0186 inserted TagBase between ObjectTag and osg::Referenced 2015-09-26 12:18:18 +02:00
Marc Zinnschlag
748b13b45b renamed ObjectHolder into ObjectTag 2015-09-26 12:05:44 +02:00
Marc Zinnschlag
d46eeb04cd removed a left-over debugging statement 2015-09-25 14:16:41 +02:00
Marc Zinnschlag
5c34a02058 store mouse bindings in WorldspaceWidget 2015-09-25 13:11:40 +02:00
Marc Zinnschlag
62047b1868 Merge remote-tracking branch 'origin/master' into sceneinput 2015-09-24 16:07:39 +02:00
Marc Zinnschlag
3ada08af90 store lock state and pass it on to edit mode 2015-09-24 16:07:17 +02:00
Marc Zinnschlag
b2cb5f0374 pass on user settings updates to potentially interested parties within a scene subview 2015-09-24 15:51:16 +02:00
scrawl
12b8fcf0bf OpenCS: Fix camera position retrieval in WorldspaceWidget 2015-09-23 23:37:09 +02:00
Marc Zinnschlag
7bef97bf33 fixed local variable caching issue in automatic error checking (Fixes #2927) 2015-09-22 15:36:00 +02:00
scrawl
18d0cae801 OpenCS: Select objects with the right mouse button 2015-09-18 18:31:43 +02:00
scrawl
41ea76fd83 OpenCS: Add selection outline effect to CSVRender::Object 2015-09-18 18:31:05 +02:00
scrawl
dac3b33efb OpenCS: Pass events from the QGLWidget to the RenderWidget 2015-09-18 18:30:48 +02:00
scrawl
169fc6a61b OpenCS: Remove margin around the render window 2015-09-18 18:29:22 +02:00
Marc Zinnschlag
1aa926c7e0 restored T-shortcut (focus toolbar) in scene widget 2015-09-17 12:41:56 +02:00
Marc Zinnschlag
659b87b25f more cleanup 2015-09-17 11:31:25 +02:00
Marc Zinnschlag
b3b4fb3efb removed some left-over signal slot stuff that shouldn't have been there in the first place 2015-09-17 11:27:55 +02:00
scrawl
a47617c21f Fix tab indentations in apps/ and components/ 2015-09-16 20:45:37 +02:00
cc9cii
c4a900ca2c Rationalise the use of ColumnIds 2015-09-12 09:33:11 +10:00
Marc Zinnschlag
a445683312 Merge branch 'mergetool' 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/tools/tools.cpp
 2015-09-11 13:22:15 +02:00
Marc Zinnschlag
85f6bb892b removed indirection in OpenMW-CS land record 2015-08-31 18:13:27 +02:00
Marc Zinnschlag
febf611c82 made return type of ESMTerrain::Storage::getLand const 2015-08-31 14:17:11 +02:00
Marc Zinnschlag
e76401d5ea Merge remote-tracking branch 'smbas/fix-opencs-bugs' 2015-08-23 12:15:19 +02:00
scrawl
32ad8c86bf Fix the ESM::LandTexture NAME being discarded on loading 2015-08-22 13:10:54 +02:00
Stanislav Bas
b7295e2632 Columns with Display_Boolean use Combobox editor even for non-boolean values 2015-08-21 22:36:53 +03:00
Stanislav Bas
aeb1acca51 Remove enum names for AiWanderRepeat column 2015-08-21 22:05:40 +03:00
Stanislav Bas
d038ac2da0 Sort tables by ID in the ascending order initially 2015-08-21 21:38:28 +03:00
scrawl
67bd6cd708 Remove empty line at the beginning of files 
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
 2015-08-18 23:06:12 +02:00
Marc Zinnschlag
1b663f01af create merged document and open a view for it (document is still empty at this point) 2015-08-16 15:24:48 +02:00
Marc Zinnschlag
e2377396a7 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) 2015-08-13 12:53:00 +02:00
Marc Zinnschlag
904ad94952 added merge operation (doesn't do anything yet) 2015-08-13 12:03:20 +02:00
Marc Zinnschlag
708cacdec4 disable merge menu item when a merge is already in progress 2015-08-08 16:47:58 +02:00
Marc Zinnschlag
23ccee0124 Merge remote-tracking branch 'dieho/master' 
Conflicts:
	apps/opencs/view/world/dialoguesubview.cpp
 2015-08-08 11:00:44 +02:00
Marc Zinnschlag
7f10a7f24f Merge remote-tracking branch 'smbas/feature-mgef-verifier' 2015-08-08 10:50:38 +02:00
Marc Zinnschlag
4fd3097c1c improved adjuster widget problem reporting 2015-08-06 12:58:52 +02:00
Marc Zinnschlag
b83f9445a9 added UI for merge tool (merge tool itself is still missing) 2015-08-06 12:52:10 +02:00
Marc Zinnschlag
469a896ca1 make non-editable fields in dialogue sub view selectable (Fixes #2818) 2015-08-06 08:45:38 +02:00
taras.kudryavtsev
8ae7c63c45 #2730 and #2725 2015-08-04 16:58:44 +03:00
Stanislav Bas
cbc8309289 Don't allow empty value of School field in Magic Effects table 2015-08-04 16:19:00 +03:00
Stanislav Bas
6b3de5c720 Activate editing of nested table cells by a double click 2015-08-02 22:53:40 +03:00
Stanislav Bas
1590a04d03 Close EditWidget when a proper row removed 2015-08-02 22:39:41 +03:00
Marc Zinnschlag
6a9218ee07 replaced State_Compiling (not requried anymore) with State_Merging 2015-07-30 11:49:24 +02:00
Marc Zinnschlag
2c1cee38b4 Merge remote-tracking branch 'smbas/feature-extended-configurator' 2015-07-28 07:56:12 +02:00
Stanislav Bas
03c2e11961 Update to upstream/master. Resolve merge conflicts 2015-07-27 13:54:13 +03:00
Stanislav Bas
2471e4d67a Rework Table to use rowAdded() signal of a proxy model 2015-07-26 20:09:31 +03:00
Marc Zinnschlag
fcf9ae42f4 Merge remote-tracking branch 'smbas/fix-table-proxy-bugs' 2015-07-24 10:29:08 +02:00
Rohit Nirmal
6d2d32485f Fix building OpenCS with Qt 5. 2015-07-23 22:22:22 -05:00
Stanislav Bas
f5b1447c92 IdTableProxyModel refreshes the filter when the source model data or rows changed 2015-07-23 21:05:00 +03:00
Marc Zinnschlag
b2ab0122ab Merge branch 'scriptbuttons' 2015-07-18 17:37:43 +02:00
Marc Zinnschlag
f1ac440b78 do not allow editing of deleted scripts 2015-07-18 17:00:00 +02:00
Marc Zinnschlag
8763a3b3c3 make compilation delay configurable via a user setting 2015-07-18 15:32:38 +02:00
Marc Zinnschlag
73b6df8280 put script compilation in script subview behind a timer 2015-07-18 13:09:17 +02:00
scrawl
58720e6a28 Fix the OpenCS rendering crash on exit (Fixes #2735) 2015-07-18 03:52:48 +02:00
Marc Zinnschlag
5febb96012 do not try to jump to source location for errors that do not have a source location 2015-07-17 13:59:50 +02:00
Marc Zinnschlag
f665919046 consider column when jumping to error in source text 2015-07-17 13:53:22 +02:00
Marc Zinnschlag
0abd29a3b4 jump to line in source text when clicking on an error in error table 2015-07-17 13:42:25 +02:00
Marc Zinnschlag
100af80388 made error table read only 2015-07-17 13:06:51 +02:00
Marc Zinnschlag
56ed0926bd improved error table layout 2015-07-17 12:45:08 +02:00
Marc Zinnschlag
eab1ec9160 consider script warning settings for script subview 2015-07-17 11:52:59 +02:00
Marc Zinnschlag
9b12b4f1e2 refactored mapping from message severity enum to string 2015-07-16 14:46:02 +02:00