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
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.
10 years ago
scrawl
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
10 years ago
scrawl
fc5176dc38
Refactor cmake scripts, reducing the amount of find_package(Qt4)
10 years ago
Stanislav Bas
e257c915bf
Add color picker popup to choose color
10 years ago
Stanislav Bas
ef88b28c26
Create a custom item editor for color columns
10 years ago
Stanislav Bas
d7fb497255
Color values are displayed as colored rectangles in tables
10 years ago
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
10 years ago
scrawl
4bb3cbf0fb
Remove last remains of Ogre
10 years ago
scrawl
1ba3fa4169
Remove leftovers of the old OpenCS navigation
10 years ago
scrawl
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
Stanislav Bas
9e405b69fa
Create the custom completer popup to avoid the problem with the wrong height of the default popup
10 years ago
Stanislav Bas
33e36ee922
Add the ID completion delegate
10 years ago
Stanislav Bas
87a1f9f9aa
Add ID completion manager
10 years ago
cc9cii
9ad69d9085
Allow wheel events in dialogue spin box types only when they have focus. Should resolve Feature #2585 .
10 years ago
cc9cii
3a31468af0
Pathgrid record verifier. Feature #2000 .
10 years ago
scrawl
22f01b1232
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/launcher/graphicspage.cpp
apps/opencs/editor.cpp
apps/opencs/model/doc/document.cpp
apps/opencs/view/render/cell.cpp
apps/opencs/view/render/mousestate.cpp
apps/opencs/view/render/textoverlay.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/openmw/mwclass/creature.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwgui/inventorywindow.cpp
apps/openmw/mwgui/loadingscreen.cpp
apps/openmw/mwgui/mapwindow.cpp
apps/openmw/mwgui/pickpocketitemmodel.cpp
apps/openmw/mwgui/waitdialog.cpp
apps/openmw/mwmechanics/combat.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
apps/openmw/mwrender/globalmap.cpp
apps/openmw/mwworld/physicssystem.cpp
apps/openmw/mwworld/refdata.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
components/sdlutil/sdlinputwrapper.cpp
extern/shiny/Main/Factory.cpp
extern/shiny/Main/MaterialInstance.cpp
extern/shiny/Main/Platform.cpp
extern/shiny/Main/ShaderSet.cpp
10 years ago
cc9cii
cfcfb17320
Updates to optional horizontal scrollbar.
...
- move SizeHintWidget out to separate files
- remove redundant logic in view.cpp
- remove sizehint from dialogue subview
- add tooltip hints in user preferences
10 years ago
scrawl
47758c11cd
Readded collision objects and movement physics
10 years ago
scrawl
c31b416ba1
Move physicssystem to a new mwphysics module
10 years ago
scrawl
c1edc30ad7
Dead code removal
10 years ago
scrawl
e1f4a7f647
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwgui/mainmenu.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/sky.cpp
components/nif/nifkey.hpp
components/nif/nifstream.hpp
components/nifbullet/bulletnifloader.cpp
components/nifogre/ogrenifloader.hpp
libs/openengine/bullet/physic.cpp
libs/openengine/gui/manager.cpp
10 years ago