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 |
|