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
|
f962ce0bbe
|
Don't link against unnecessary OSG libraries
|
2015-11-29 19:56:43 +01:00 |
|
Marc Zinnschlag
|
0d35938794
|
basic cell arrow rendering (shape is a placeholder)
|
2015-10-12 14:12:01 +02:00 |
|
Marc Zinnschlag
|
6ef2319eb8
|
Merge branch 'sceneinput'
|
2015-10-02 15:07:01 +02:00 |
|
artemutin@yandex.ru
|
e672880f64
|
Fix namespace, add file to CMakeLists.txt
|
2015-09-30 09:46:51 +10:00 |
|
Marc Zinnschlag
|
981a8a2cc2
|
delegated editing and selection functions to mode objects
|
2015-09-27 16:18:22 +02:00 |
|
Marc Zinnschlag
|
71247a0186
|
inserted TagBase between ObjectTag and osg::Referenced
|
2015-09-26 12:18:18 +02: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 |
|
Stanislav Bas
|
4d24eff859
|
Show race only when mesh type is Skin (in BodyParts table)
|
2015-08-22 16:34:54 +03: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 |
|
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.
|
2015-08-15 22:37:09 +02:00 |
|
Marc Zinnschlag
|
904ad94952
|
added merge operation (doesn't do anything yet)
|
2015-08-13 12:03:20 +02:00 |
|
Marc Zinnschlag
|
b83f9445a9
|
added UI for merge tool (merge tool itself is still missing)
|
2015-08-06 12:52:10 +02:00 |
|
Stanislav Bas
|
0ea4d1981a
|
Add magic effect verifier
|
2015-08-03 19:08:01 +03:00 |
|
Stanislav Bas
|
03c2e11961
|
Update to upstream/master. Resolve merge conflicts
|
2015-07-27 13:54:13 +03:00 |
|
Marc Zinnschlag
|
2016ff773f
|
display script errors in script subview
|
2015-07-16 12:36:20 +02:00 |
|
Stanislav Bas
|
6162a46fbe
|
Update to upstream/master. Resolve the merge conflict
|
2015-07-05 16:15:48 +03:00 |
|
Stanislav Bas
|
6b34845168
|
Create a separate class for Edit 'ID' action to use in tables' context menus
|
2015-07-04 18:49:32 +03:00 |
|
Stanislav Bas
|
1949fe4bf9
|
Add the configuration widget for extended commands
|
2015-07-02 15:47:12 +03:00 |
|
scrawl
|
1956e2c988
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/CMakeLists.txt
|
2015-06-28 00:38:39 +02:00 |
|
Marc Zinnschlag
|
49dc30683f
|
refactored dialogue subview button bar into a new class
|
2015-06-27 12:49:56 +02:00 |
|
Marc Zinnschlag
|
f3ff90e1fd
|
moved meta data into a new single-row table
|
2015-06-26 13:01:25 +02:00 |
|
scrawl
|
a5670b5133
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/main.cpp
apps/openmw/mwworld/player.hpp
|
2015-06-22 20:09:02 +02:00 |
|
Stanislav Bas
|
2565452052
|
Add some drag'n'drop utils to work with TableMimeData
|
2015-06-21 17:08:10 +03:00 |
|
Stanislav Bas
|
27ece7f36a
|
Rework DropLineEdit. Make it type-sensitive
|
2015-06-20 17:33:36 +03:00 |
|
Marc Zinnschlag
|
d5bc561d17
|
Merge remote-tracking branch 'smbas/feature-color-picking'
|
2015-06-18 16:37:49 +02:00 |
|
scrawl
|
c719b7038e
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
|
2015-06-18 15:00:21 +02:00 |
|
Stanislav Bas
|
2e40b68862
|
Add a custom proxy model for Info tables
|
2015-06-17 22:47:39 +03:00 |
|
Stanislav Bas
|
850f612c8b
|
Merge branch 'master' into feature-color-picking
|
2015-06-16 22:39:12 +03:00 |
|
scrawl
|
3663511cdb
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
|
2015-06-16 19:53:41 +02:00 |
|
scrawl
|
609e146a22
|
Build fixes for windows
|
2015-06-15 16:48:18 +02:00 |
|
scrawl
|
f70250a296
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/launcher/CMakeLists.txt
apps/opencs/CMakeLists.txt
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/CMakeLists.txt
components/CMakeLists.txt
extern/osg-ffmpeg-videoplayer/CMakeLists.txt
|
2015-06-13 21:11:24 +02:00 |
|
Stanislav Bas
|
2c15ad5e0c
|
Add SoundGens verifier
|
2015-06-13 19:08:31 +03:00 |
|
Stanislav Bas
|
f19d07b404
|
Rename ColorPickerDelegate to ColorDelegate
|
2015-06-12 23:09:31 +03:00 |
|
scrawl
|
e13a938896
|
Add support to build with Qt5 (Task #2665)
Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing.
|
2015-06-12 15:13:42 +02:00 |
|
scrawl
|
cf95d3fc35
|
Refactor cmake scripts, reducing the amount of find_package(Boost)
|
2015-06-12 01:45:19 +02:00 |
|
scrawl
|
fc5176dc38
|
Refactor cmake scripts, reducing the amount of find_package(Qt4)
|
2015-06-11 23:38:08 +02:00 |
|
Stanislav Bas
|
e257c915bf
|
Add color picker popup to choose color
|
2015-06-12 00:00:23 +03:00 |
|
Stanislav Bas
|
ef88b28c26
|
Create a custom item editor for color columns
|
2015-06-09 15:20:50 +03:00 |
|
Stanislav Bas
|
d7fb497255
|
Color values are displayed as colored rectangles in tables
|
2015-06-08 21:33:23 +03:00 |
|
scrawl
|
e66e9916db
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/document.hpp
|
2015-06-07 15:23:54 +02:00 |
|
scrawl
|
4bb3cbf0fb
|
Remove last remains of Ogre
|
2015-06-03 23:04:35 +02:00 |
|
scrawl
|
1ba3fa4169
|
Remove leftovers of the old OpenCS navigation
|
2015-06-03 18:11:34 +02:00 |
|
scrawl
|
974fda5bde
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
|
2015-06-03 03:18:29 +02:00 |
|
Stanislav Bas
|
9e405b69fa
|
Create the custom completer popup to avoid the problem with the wrong height of the default popup
|
2015-05-31 16:43:28 +03:00 |
|
Stanislav Bas
|
33e36ee922
|
Add the ID completion delegate
|
2015-05-30 15:51:33 +03:00 |
|
Stanislav Bas
|
87a1f9f9aa
|
Add ID completion manager
|
2015-05-30 15:31:44 +03:00 |
|
cc9cii
|
9ad69d9085
|
Allow wheel events in dialogue spin box types only when they have focus. Should resolve Feature #2585.
|
2015-05-29 05:44:35 +10:00 |
|
cc9cii
|
3a31468af0
|
Pathgrid record verifier. Feature #2000.
|
2015-05-27 22:12:11 +10:00 |
|