Alexander "Ace" Olofsson
|
b3e985fca2
|
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
|
9 years ago |
|
Alexander "Ace" Olofsson
|
338f0cf53d
|
Merge branch 'appveyor' of github.com:ace13/openmw into appveyor
|
9 years ago |
Marc Zinnschlag
|
4a02563708
|
Merge branch 'master' into buttons
Conflicts:
apps/opencs/view/render/instancemode.cpp
|
9 years ago |
|
Marc Zinnschlag
|
0305ae3693
|
added selection mode UI
|
9 years ago |
Aesylwinn
|
1d86f705ba
|
gmst verifier
|
9 years ago |
scrawl
|
ad2145b463
|
OpenCS: use a separate enum for the toggle buttons
|
9 years ago |
|
Alexander "Ace" Olofsson
|
fe241be26c
|
Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor
|
9 years ago |
|
Alexander "Ace" Olofsson
|
2142d0d2d6
|
Make Qt5 happy
|
9 years ago |
|
Marc Zinnschlag
|
c646533448
|
removed old user settings system
|
9 years ago |
|
Marc Zinnschlag
|
73ffdd5ac5
|
added colour settings
|
9 years ago |
|
Marc Zinnschlag
|
590d6eba9b
|
added enum settings
|
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
|
5e40b4d2e8
|
page switching mechanism
|
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 |
|
Marc Zinnschlag
|
0d35938794
|
basic cell arrow rendering (shape is a placeholder)
|
9 years ago |
|
Marc Zinnschlag
|
6ef2319eb8
|
Merge branch 'sceneinput'
|
9 years ago |
artemutin@yandex.ru
|
e672880f64
|
Fix namespace, add file to CMakeLists.txt
|
9 years ago |
|
Marc Zinnschlag
|
981a8a2cc2
|
delegated editing and selection functions to mode objects
|
9 years ago |
|
Marc Zinnschlag
|
71247a0186
|
inserted TagBase between ObjectTag and osg::Referenced
|
9 years ago |
|
Marc Zinnschlag
|
a445683312
|
Merge branch 'mergetool'
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/tools/tools.cpp
|
9 years ago |
Stanislav Bas
|
4d24eff859
|
Show race only when mesh type is Skin (in BodyParts table)
|
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 |
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 |
|
Marc Zinnschlag
|
904ad94952
|
added merge operation (doesn't do anything yet)
|
10 years ago |
|
Marc Zinnschlag
|
b83f9445a9
|
added UI for merge tool (merge tool itself is still missing)
|
10 years ago |
|
Stanislav Bas
|
0ea4d1981a
|
Add magic effect verifier
|
10 years ago |
|
Stanislav Bas
|
03c2e11961
|
Update to upstream/master. Resolve merge conflicts
|
10 years ago |
|
Marc Zinnschlag
|
2016ff773f
|
display script errors in script subview
|
10 years ago |
|
Stanislav Bas
|
6162a46fbe
|
Update to upstream/master. Resolve the merge conflict
|
10 years ago |
|
Stanislav Bas
|
6b34845168
|
Create a separate class for Edit 'ID' action to use in tables' context menus
|
10 years ago |
|
Stanislav Bas
|
1949fe4bf9
|
Add the configuration widget for extended commands
|
10 years ago |
|
scrawl
|
1956e2c988
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/CMakeLists.txt
|
10 years ago |
|
Marc Zinnschlag
|
49dc30683f
|
refactored dialogue subview button bar into a new class
|
10 years ago |
|
Marc Zinnschlag
|
f3ff90e1fd
|
moved meta data into a new single-row table
|
10 years ago |
|
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
|
10 years ago |
|
Stanislav Bas
|
2565452052
|
Add some drag'n'drop utils to work with TableMimeData
|
10 years ago |
|
Stanislav Bas
|
27ece7f36a
|
Rework DropLineEdit. Make it type-sensitive
|
10 years ago |
|
Marc Zinnschlag
|
d5bc561d17
|
Merge remote-tracking branch 'smbas/feature-color-picking'
|
10 years ago |
|
scrawl
|
c719b7038e
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
|
10 years ago |
|
Stanislav Bas
|
2e40b68862
|
Add a custom proxy model for Info tables
|
10 years ago |
|
Stanislav Bas
|
850f612c8b
|
Merge branch 'master' into feature-color-picking
|
10 years ago |
|
scrawl
|
3663511cdb
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/opencs/CMakeLists.txt
extern/ogre-ffmpeg-videoplayer/CMakeLists.txt
|
10 years ago |
|
scrawl
|
609e146a22
|
Build fixes for windows
|
10 years ago |
|
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
|
10 years ago |
|
Stanislav Bas
|
2c15ad5e0c
|
Add SoundGens verifier
|
10 years ago |
|
Stanislav Bas
|
f19d07b404
|
Rename ColorPickerDelegate to ColorDelegate
|
10 years ago |