Marc Zinnschlag
9c7bbd667b
Merge branch 'usersettings'
9 years ago
Marc Zinnschlag
be19da189a
fixed user settings not being saved when last document window is closed while user settings window is still open
9 years ago
Marc Zinnschlag
d6bd2cb1f0
changed name of openmw-cs user settings file
9 years ago
Marc Zinnschlag
c646533448
removed old user settings system
9 years ago
Marc Zinnschlag
67cf260144
final batch of changing over user settings usage to the new system
9 years ago
Marc Zinnschlag
44925e9fc8
fixed records settings (Text Only wasn't updating)
9 years ago
Marc Zinnschlag
591564566c
made user settings access thread-safe
9 years ago
Marc Zinnschlag
ecbd68a19b
third batch of changing over user settings usage to the new system
9 years ago
Marc Zinnschlag
a3a2c2f476
second batch of changing over user settings usage to the new system
9 years ago
scrawl
fb9f5f8fe8
Fix typo
9 years ago
Marc Zinnschlag
cf9fa0e0e9
first batch of changing over user settings usage to the new system
9 years ago
Marc Zinnschlag
0ffe4290fb
workaround for MOC's lack of namespace awareness
9 years ago
Marc Zinnschlag
04a11679fb
added category update function
9 years ago
Marc Zinnschlag
3a5238bebc
changed the settingChanged signature to accommodate queued connections
9 years ago
Marc Zinnschlag
8245b9e439
added interface for querying settings
9 years ago
Marc Zinnschlag
31b105ad9e
improved settings layout
9 years ago
Marc Zinnschlag
a907b4ab15
made Setting class non-abstract
9 years ago
Marc Zinnschlag
73ffdd5ac5
added colour settings
9 years ago
Marc Zinnschlag
590d6eba9b
added enum settings
9 years ago
Marc Zinnschlag
8050eba83b
added a few comments
9 years ago
Marc Zinnschlag
b0fb6d56f1
added bool settings
9 years ago
Marc Zinnschlag
9ca5a1b647
added double settings
9 years ago
Marc Zinnschlag
c61d717e41
added integer settings
9 years ago
Marc Zinnschlag
c158224314
fixed a faulty include
9 years ago
Marc Zinnschlag
5e40b4d2e8
page switching mechanism
9 years ago
Marc Zinnschlag
0dc3d10112
some simplification
9 years ago
scrawl
07b064f616
Rename to lowerCaseInPlace
9 years ago
scrawl
4dd4c5394b
Broken lower-casing fix
9 years ago
scrawl
42d68eb7fb
Build fix
9 years ago
Marc Zinnschlag
b37a2ac09c
user settings categories
9 years ago
Marc Zinnschlag
36ce8f97d7
basic framework for new user settings system
9 years ago
scrawl
f962ce0bbe
Don't link against unnecessary OSG libraries
9 years ago
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.
9 years ago
Marc Zinnschlag
99500f4021
make initial size of script error panel configurable ( Fixes #2996 )
9 years ago
Marc Zinnschlag
f5c61ee616
remember script error panel height per scriptsubview
9 years ago
Marc Zinnschlag
26640d17eb
do not adjust error panel height if panal was already open
9 years ago
Marc Zinnschlag
1093a53cf9
hide script error list when there are no errors ( Fixes #2867 )
9 years ago
Marc Zinnschlag
b74b274ac0
Removed validator for filenames in OpenMW-CS ( Fixes #2918 )
9 years ago
Marc Zinnschlag
e0e9e7f8c2
adjusted startup warning message for recent improvements regarding loading/saving
9 years ago
Marc Zinnschlag
020b3add94
Merge branch 'openmw-37'
9 years ago
scrawl
eb2f16d682
Support for loading .osg mesh format
9 years ago
scrawl
af4923577b
Fix double writing of Dialogue NAME in OpenCS
9 years ago
Marc Zinnschlag
de98ee0062
Merge remote-tracking branch 'scrawl/esm_rewrite'
9 years ago
Nikolay Kasyanov
014a2fc0e9
OS X: do not override Qt plugin path
9 years ago
Nikolay Kasyanov
4e3bbe01b6
OS X: disable `glTexStorage2D` because of OSG/driver issue
...
See http://forum.openscenegraph.org/viewtopic.php?p=65276#65276 for the details.
9 years ago
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.
9 years ago
Marc Zinnschlag
b0d79ee790
Merge branch 'tooltip'
9 years ago
Marc Zinnschlag
63ee37d914
added 3D scene tooltips
9 years ago
scrawl
b8e11cf197
Merge commit 'pull/upstream/678' into HEAD
...
Conflicts:
apps/esmtool/record.cpp
apps/opencs/model/doc/savingstages.cpp
apps/opencs/model/world/land.cpp
apps/opencs/model/world/land.hpp
apps/opencs/model/world/landtexture.cpp
apps/openmw/mwworld/store.cpp
components/esm/loadland.cpp
components/esm/loadland.hpp
9 years ago
Marc Zinnschlag
8b01f1f6fb
added instance tooltips
9 years ago
Marc Zinnschlag
01f4b8a182
added scene tooltips system (tag based)
9 years ago
cc9cii
7f477e2fae
Fix include file issue.
9 years ago
cc9cii
4af469511d
Fix some sub-tables becoming uneditable since commit 80869d
9 years ago
cc9cii
819fecd08e
Add a check for scale value of 0. Should resolve bug #2880 .
9 years ago
cc9cii
7c007d9c6d
Rename a variable to make it less confusing.
9 years ago
cc9cii
78c735adc6
Fix saving when only topic info was modified (topic itself unchanged)
9 years ago
Marc Zinnschlag
655b40267b
changed instance selection model (primary selects, secondary toggles selection)
9 years ago
Marc Zinnschlag
ad4e0e3b97
split virtual select button into two buttons (primary select and seconadry select)
9 years ago
cc9cii
107ccd84d4
Move TableEditModes enum inside a class scope.
9 years ago
cc9cii
77471d1592
Re-add mistakenly removed line and fix a silly typo.
9 years ago
cc9cii
80869d9bae
Disable context menu for fixed size sub-tables. Should resolve bug #2932 .
9 years ago
cc9cii
972193c7eb
Fix issue where mandatory effects field was allowed to be empty (and vice versa)
9 years ago
cc9cii
1a64b40725
Fix skills and attributes being possible to add to irrelevant effects. Should resolve bug #2980 .
9 years ago
cc9cii
9f0e059a15
Fix editing ingredient effects sub-table. Should resolve bug #2978 .
9 years ago
Marc Zinnschlag
843225996c
get modifiers from event instead of from the application
9 years ago
Marc Zinnschlag
d2e92fd36f
trigger mouse click actions on release instead of on press (avoids problems with dragging)
9 years ago
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.
9 years ago
Marc Zinnschlag
6c65081643
Merge branch 'marker'
9 years ago
Marc Zinnschlag
e34af4c4b5
handle primary and secondary edit button clicks on cell arrows
9 years ago
Marc Zinnschlag
8f0d7ec1ec
Merge remote-tracking branch 'artemutin/longStringEditor'
9 years ago
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.
9 years ago
Marc Zinnschlag
361634489e
properly handle cells that don't exist
9 years ago
artemutin@yandex.ru
33e12a99fa
If table dont use any filter, filter update now dont cause a reapply of empty filter
9 years ago
Marc Zinnschlag
773df6fd22
some OSG fixes
9 years ago
Marc Zinnschlag
68115c4e8a
(somewhat) improved the colour scheme
9 years ago
Marc Zinnschlag
0b1d6bddc8
merged primitives arrays
9 years ago
Marc Zinnschlag
6e140c9cb1
proper shape for cell arrows (kinda)
9 years ago
Marc Zinnschlag
3f9db7ba3c
more reliable method of obtaining the cell coordinates in CSVRender::Cell
9 years ago
Marc Zinnschlag
b81ee606c8
use CellCoordinates instead of a pair of ints for cell coordinates
9 years ago
Marc Zinnschlag
0d35938794
basic cell arrow rendering (shape is a placeholder)
9 years ago
Marc Zinnschlag
3b39572274
Merge remote-tracking branch 'artemutin/scriptSearchRedirect'
9 years ago
artemutin@yandex.ru
4ca7b26609
Stream error handling, and other minor changes.
9 years ago
cc9cii
64821b0785
Disable toolbar context menu. Should resolve bug #2953 .
9 years ago
artemutin@yandex.ru
e7a3f059aa
Implemented line and col calculations in scriptsubview
9 years ago
cc9cii
3bbcf6a916
Fix AiWander sub-table editing. Should resolve bugs #2888 and #2930 .
9 years ago
cc9cii
998348e606
Further rationalise the use of ColumnIds
...
- Address Zini's review comments as per https://github.com/OpenMW/openmw/pull/755
9 years ago
Alexander "Ace" Olofsson
b4132faaea
Update editmode.cpp
...
Fixes builds on Windows
9 years ago
Rohit Nirmal
0a8e2c0b21
Fix building OpenCS with Qt 5.
9 years ago
Marc Zinnschlag
6ef2319eb8
Merge branch 'sceneinput'
9 years ago
Marc Zinnschlag
4b0fa370e3
made WorldspaceWidget::getDocument public (EditModes will need the document later)
9 years ago
Marc Zinnschlag
323f8bb29f
sensitivity settings
9 years ago
Marc Zinnschlag
1d4f8b2595
send mouse wheel input to active EditMode during drag operations
9 years ago
Marc Zinnschlag
0a5bfb2107
added framework for drag operations
9 years ago
artemutin@yandex.ru
ecce3a1975
Add StartScriptCreator to a factory manager.
9 years ago
artemutin@yandex.ru
903cd3322b
add getIdValidatorResult method to GenericCreator, for use in subclass
...
StartScriptCreator
9 years ago
artemutin@yandex.ru
e672880f64
Fix namespace, add file to CMakeLists.txt
9 years ago
artemutin@yandex.ru
3f27c85630
Added StartScriptCreator class with redefined getErrors method.
9 years ago
Marc Zinnschlag
8e87b48866
handle context-sensitive select mode in instance editing
9 years ago
Marc Zinnschlag
2cb106f6ad
added missing flagAsModified calls
9 years ago
Marc Zinnschlag
f28fa9fc16
clear instance selection on select click on nothing/something that isn't an instance
9 years ago
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)
9 years ago
Marc Zinnschlag
981a8a2cc2
delegated editing and selection functions to mode objects
9 years ago
Marc Zinnschlag
9bf27c7e37
moved edit mode handling from SceneSubView to WorldspaceWidget
9 years ago
Marc Zinnschlag
5d9863aec1
removed a redundant check
9 years ago
Marc Zinnschlag
7bbc475bda
apply button mapping
9 years ago
Marc Zinnschlag
501ae6372d
factored out mouse picking into a separate function
9 years ago
Marc Zinnschlag
3844c94975
bit masking fix
9 years ago
Marc Zinnschlag
72bb33c2c4
filter mouse interaction by interaction mask
9 years ago
Marc Zinnschlag
71247a0186
inserted TagBase between ObjectTag and osg::Referenced
9 years ago
Marc Zinnschlag
748b13b45b
renamed ObjectHolder into ObjectTag
9 years ago
Marc Zinnschlag
d46eeb04cd
removed a left-over debugging statement
9 years ago
Marc Zinnschlag
5c34a02058
store mouse bindings in WorldspaceWidget
9 years ago
Marc Zinnschlag
d597bef2cd
refined selection related user settings
9 years ago
Marc Zinnschlag
62047b1868
Merge remote-tracking branch 'origin/master' into sceneinput
9 years ago
Marc Zinnschlag
3ada08af90
store lock state and pass it on to edit mode
9 years ago
Marc Zinnschlag
b2cb5f0374
pass on user settings updates to potentially interested parties within a scene subview
9 years ago
scrawl
12b8fcf0bf
OpenCS: Fix camera position retrieval in WorldspaceWidget
9 years ago
Marc Zinnschlag
7bef97bf33
fixed local variable caching issue in automatic error checking ( Fixes #2927 )
9 years ago
Marc Zinnschlag
39b7340580
added mouse button settings for 3D scene (not in use yet)
9 years ago
scrawl
18d0cae801
OpenCS: Select objects with the right mouse button
9 years ago
scrawl
41ea76fd83
OpenCS: Add selection outline effect to CSVRender::Object
9 years ago
scrawl
dac3b33efb
OpenCS: Pass events from the QGLWidget to the RenderWidget
9 years ago
scrawl
169fc6a61b
OpenCS: Remove margin around the render window
9 years ago
Marc Zinnschlag
1aa926c7e0
restored T-shortcut (focus toolbar) in scene widget
9 years ago
Marc Zinnschlag
659b87b25f
more cleanup
9 years ago
Marc Zinnschlag
b3b4fb3efb
removed some left-over signal slot stuff that shouldn't have been there in the first place
9 years ago
scrawl
a47617c21f
Fix tab indentations in apps/ and components/
9 years ago
cc9cii
1365b8edd1
Fix typo.
9 years ago
cc9cii
45aee1b508
Remove AI flag from the UI and instead auto-detect whether to save AIDT records. Should resolve bug #2879 .
9 years ago
cc9cii
5a5e1a3b22
Add missing fields for editing creatures.
...
- Should resolve resolve bugs #2878 (level), #2901 (gold) and #2889 (health).
- Moved Soul, Combat, Magic and Stealth editing to dialogue only (to be consistent with editing NPCs)
9 years ago
cc9cii
c4a900ca2c
Rationalise the use of ColumnIds
9 years ago
cc9cii
258b2ba29a
Ensure ColumnId names are unique. Filter parser calls Columns::getId() which implies that these should be unique.
9 years ago
Marc Zinnschlag
a445683312
Merge branch 'mergetool'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/tools/tools.cpp
9 years ago
Marc Zinnschlag
5be176ee85
disable on-demand loading of land data (for now, maybe)
9 years ago
Marc Zinnschlag
23fde87816
fixed an indexing error
9 years ago
Marc Zinnschlag
584a7a66b9
various minor fixes
9 years ago
Marc Zinnschlag
09ec60fe2a
handle missing land texture records properly during merge
9 years ago
Marc Zinnschlag
73f6efddcc
fixed a texture indexing bug (only affects the editor)
9 years ago
Marc Zinnschlag
a8dc1c1198
merge land tables
9 years ago
Marc Zinnschlag
85f6bb892b
removed indirection in OpenMW-CS land record
9 years ago
Marc Zinnschlag
69b9eadb52
refactored loading of land data
9 years ago
Marc Zinnschlag
febf611c82
made return type of ESMTerrain::Storage::getLand const
9 years ago
Marc Zinnschlag
69045d7ec9
additional safety check for land texture listing merge stage
9 years ago
Marc Zinnschlag
890bbb6b11
merge land texture tables
9 years ago
Marc Zinnschlag
b7983d08ba
fixed merge stage order; added proper initialisation
9 years ago
Marc Zinnschlag
a97a632aa7
merge references tables
9 years ago
Marc Zinnschlag
845cafd61c
fixed record state issues after merge
9 years ago
Marc Zinnschlag
f95950e8d8
merge referenceables table
9 years ago
Marc Zinnschlag
9cf793c0b5
silenced a warning
9 years ago
Marc Zinnschlag
40753aa9a3
simplifying merge stage
9 years ago
Marc Zinnschlag
16dda281ce
made merge operation more fluent
9 years ago
Marc Zinnschlag
103073150e
added info tables and pathgrid table to merge operation
9 years ago
Marc Zinnschlag
c92898a5bc
flag newly merged documents as dirty (triggering an 'are you sure' dialogue when closing without saving first)
9 years ago
Marc Zinnschlag
e76401d5ea
Merge remote-tracking branch 'smbas/fix-opencs-bugs'
9 years ago
Stanislav Bas
ba4b7df99d
Add missing includes to columnimp.hpp
10 years ago
Stanislav Bas
720aca8f3d
Inform about State change (not a whole row) when modifying a table value
10 years ago
Stanislav Bas
4d24eff859
Show race only when mesh type is Skin (in BodyParts table)
10 years ago
Stanislav Bas
6d81ca07b5
Convert AiWanderRepeat to bool in ActorAiRefIdAdapter::getNestedData()
10 years ago
scrawl
32ad8c86bf
Fix the ESM::LandTexture NAME being discarded on loading
10 years ago
scrawl
031d64d0d3
Adjust OpenCS saving stages order to stop vanilla MW complaining about missing records
10 years ago
Stanislav Bas
b7295e2632
Columns with Display_Boolean use Combobox editor even for non-boolean values
10 years ago
Stanislav Bas
aeb1acca51
Remove enum names for AiWanderRepeat column
10 years ago
Stanislav Bas
e14aedc7cd
ModifyCommand uses a proper name of a modified nested value
10 years ago
Stanislav Bas
d038ac2da0
Sort tables by ID in the ascending order initially
10 years ago
Marc Zinnschlag
3902513e65
merge id collections
10 years ago
scrawl
67bd6cd708
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
10 years ago
scrawl
d1e1c0f38b
Editor: fix a typo in ESM::Light flag mappings
10 years ago
Marc Zinnschlag
47dd9505a9
copy meta data from game file when merging
10 years ago
Marc Zinnschlag
1b663f01af
create merged document and open a view for it (document is still empty at this point)
10 years ago
Marc Zinnschlag
5558962b14
Merge remote-tracking branch 'scrawl/editor_creatureflag'
10 years ago
Marc Zinnschlag
8bb28c3236
Merge remote-tracking branch 'corristo/osx-hidpi'
10 years ago
Nikolay Kasyanov
dbcce482a6
OS X: enable high resolution mode for OpenMW & OpenCS
...
We don't support retina completely yet, but it's still better than
blurry mess, and Qt does pretty good job for OpenCS already.
10 years ago
scrawl
e36ebc77d5
Editor: remove creature flag of unknown purpose from the UI
10 years ago
scrawl
c07ced4c8f
Editor: fix magic effect magnitudes incorrectly labelled as Min/Max Range
10 years ago
Marc Zinnschlag
d8655f2ff8
forgot to connect merge operation signals
10 years ago
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)
10 years ago
Marc Zinnschlag
904ad94952
added merge operation (doesn't do anything yet)
10 years ago
Marc Zinnschlag
708cacdec4
disable merge menu item when a merge is already in progress
10 years ago
Marc Zinnschlag
23ccee0124
Merge remote-tracking branch 'dieho/master'
...
Conflicts:
apps/opencs/view/world/dialoguesubview.cpp
10 years ago
Marc Zinnschlag
7f10a7f24f
Merge remote-tracking branch 'smbas/feature-mgef-verifier'
10 years ago
Stanislav Bas
ff2dab8d56
Remove check for an empty Particle from Magic effects verifier
10 years ago
Marc Zinnschlag
4fd3097c1c
improved adjuster widget problem reporting
10 years ago
Marc Zinnschlag
b83f9445a9
added UI for merge tool (merge tool itself is still missing)
10 years ago
Marc Zinnschlag
469a896ca1
make non-editable fields in dialogue sub view selectable ( Fixes #2818 )
10 years ago
taras.kudryavtsev
8ae7c63c45
#2730 and #2725
10 years ago
Stanislav Bas
cbc8309289
Don't allow empty value of School field in Magic Effects table
10 years ago
Stanislav Bas
8da9eecea7
Correct comparison of enum values in IdTableProxyModel
10 years ago
Stanislav Bas
0ea4d1981a
Add magic effect verifier
10 years ago
Stanislav Bas
6b3de5c720
Activate editing of nested table cells by a double click
10 years ago
Stanislav Bas
1590a04d03
Close EditWidget when a proper row removed
10 years ago
Stanislav Bas
33042c1464
Restore Modified status of a record when adding/removing nested rows
10 years ago
Stanislav Bas
25b653e316
Inform about Modified status change when modifying a value of a model
10 years ago
Stanislav Bas
afb36b73eb
Proper index for Modified column in ModifyCommand
10 years ago
Marc Zinnschlag
6a9218ee07
replaced State_Compiling (not requried anymore) with State_Merging
10 years ago
Marc Zinnschlag
2c1cee38b4
Merge remote-tracking branch 'smbas/feature-extended-configurator'
10 years ago
Stanislav Bas
03c2e11961
Update to upstream/master. Resolve merge conflicts
10 years ago
Marc Zinnschlag
420503d5fc
Merge remote-tracking branch 'smbas/fix-bug-2728'
10 years ago
Marc Zinnschlag
bafa86d3e9
Merge remote-tracking branch 'scrawl/master'
10 years ago
Stanislav Bas
812fffbadc
Don't inform about a nested row addition in proxy models for top-level tables
10 years ago
Stanislav Bas
2471e4d67a
Rework Table to use rowAdded() signal of a proxy model
10 years ago