Marc Zinnschlag
0dc3d10112
some simplification
2015-12-08 09:56:42 +01:00
Marc Zinnschlag
b37a2ac09c
user settings categories
2015-12-06 12:06:28 +01:00
Marc Zinnschlag
36ce8f97d7
basic framework for new user settings system
2015-12-06 11:18:31 +01:00
scrawl
35fa1f5865
Not found Land Textures are no longer a fatal error (Bug #3037 )
...
Log warning message and show the default texture when encountering invalid ESM::LandTexture references.
2015-11-27 21:57:24 +01:00
Marc Zinnschlag
99500f4021
make initial size of script error panel configurable ( Fixes #2996 )
2015-11-21 14:28:40 +01:00
Marc Zinnschlag
f5c61ee616
remember script error panel height per scriptsubview
2015-11-21 14:19:14 +01:00
Marc Zinnschlag
26640d17eb
do not adjust error panel height if panal was already open
2015-11-21 12:52:32 +01:00
Marc Zinnschlag
1093a53cf9
hide script error list when there are no errors ( Fixes #2867 )
2015-11-21 12:45:11 +01:00
Marc Zinnschlag
b74b274ac0
Removed validator for filenames in OpenMW-CS ( Fixes #2918 )
2015-11-21 12:14:57 +01:00
Marc Zinnschlag
e0e9e7f8c2
adjusted startup warning message for recent improvements regarding loading/saving
2015-11-21 11:56:24 +01:00
scrawl
1402a16702
SceneWidget: change the threading model to DrawThreadPerContext
...
Performs much better because we can break frame early, running cull in parallel with last frame's draw.
2015-11-13 21:00:51 +01:00
Marc Zinnschlag
63ee37d914
added 3D scene tooltips
2015-11-13 11:39:57 +01:00
Marc Zinnschlag
8b01f1f6fb
added instance tooltips
2015-11-12 15:09:43 +01:00
Marc Zinnschlag
01f4b8a182
added scene tooltips system (tag based)
2015-11-12 15:06:37 +01:00
Marc Zinnschlag
655b40267b
changed instance selection model (primary selects, secondary toggles selection)
2015-10-29 11:27:01 +01:00
Marc Zinnschlag
ad4e0e3b97
split virtual select button into two buttons (primary select and seconadry select)
2015-10-29 11:20:06 +01:00
cc9cii
107ccd84d4
Move TableEditModes enum inside a class scope.
2015-10-28 23:33:24 +11:00
cc9cii
77471d1592
Re-add mistakenly removed line and fix a silly typo.
2015-10-28 20:52:07 +11:00
cc9cii
80869d9bae
Disable context menu for fixed size sub-tables. Should resolve bug #2932 .
2015-10-28 20:30:30 +11:00
cc9cii
972193c7eb
Fix issue where mandatory effects field was allowed to be empty (and vice versa)
2015-10-28 11:49:24 +11:00
Marc Zinnschlag
843225996c
get modifiers from event instead of from the application
2015-10-27 15:43:52 +01:00
Marc Zinnschlag
d2e92fd36f
trigger mouse click actions on release instead of on press (avoids problems with dragging)
2015-10-27 15:30:51 +01:00
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
