981a8a2cc2
delegated editing and selection functions to mode objects
9 years ago
71247a0186
inserted TagBase between ObjectTag and osg::Referenced
9 years ago
a445683312
Merge branch 'mergetool'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/tools/tools.cpp
9 years ago
4d24eff859
Show race only when mesh type is Skin (in BodyParts table)
10 years ago
1b663f01af
create merged document and open a view for it (document is still empty at this point)
10 years ago
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
904ad94952
added merge operation (doesn't do anything yet)
10 years ago
b83f9445a9
added UI for merge tool (merge tool itself is still missing)
10 years ago
0ea4d1981a
Add magic effect verifier
10 years ago
03c2e11961
Update to upstream/master. Resolve merge conflicts
10 years ago
2016ff773f
display script errors in script subview
10 years ago
6162a46fbe
Update to upstream/master. Resolve the merge conflict
10 years ago
6b34845168
Create a separate class for Edit 'ID' action to use in tables' context menus
10 years ago
1949fe4bf9
Add the configuration widget for extended commands
10 years ago
1956e2c988
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/CMakeLists.txt
10 years ago
49dc30683f
refactored dialogue subview button bar into a new class
10 years ago
f3ff90e1fd
moved meta data into a new single-row table
10 years ago
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
2565452052
Add some drag'n'drop utils to work with TableMimeData
10 years ago
27ece7f36a
Rework DropLineEdit. Make it type-sensitive
10 years ago
d5bc561d17
Merge remote-tracking branch 'smbas/feature-color-picking'
10 years ago
c719b7038e
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
10 years ago
2e40b68862
Add a custom proxy model for Info tables
10 years ago
850f612c8b
Merge branch 'master' into feature-color-picking
10 years ago
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
609e146a22
Build fixes for windows
10 years ago
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
2c15ad5e0c
Add SoundGens verifier
10 years ago
f19d07b404
Rename ColorPickerDelegate to ColorDelegate
10 years ago
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
cf95d3fc35
Refactor cmake scripts, reducing the amount of find_package(Boost)
10 years ago
fc5176dc38
Refactor cmake scripts, reducing the amount of find_package(Qt4)
10 years ago
e257c915bf
Add color picker popup to choose color
10 years ago
ef88b28c26
Create a custom item editor for color columns
10 years ago
d7fb497255
Color values are displayed as colored rectangles in tables
10 years ago
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
4bb3cbf0fb
Remove last remains of Ogre
10 years ago
1ba3fa4169
Remove leftovers of the old OpenCS navigation
10 years ago
974fda5bde
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
extern/sdl4ogre/sdlwindowhelper.cpp
10 years ago
9e405b69fa
Create the custom completer popup to avoid the problem with the wrong height of the default popup
10 years ago
33e36ee922
Add the ID completion delegate
10 years ago
87a1f9f9aa
Add ID completion manager
10 years ago
9ad69d9085
Allow wheel events in dialogue spin box types only when they have focus. Should resolve Feature #2585 .
10 years ago
3a31468af0
Pathgrid record verifier. Feature #2000 .
10 years ago
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
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
47758c11cd
Readded collision objects and movement physics
10 years ago
c31b416ba1
Move physicssystem to a new mwphysics module
10 years ago
c1edc30ad7
Dead code removal
10 years ago
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
18162557b0
TopicInfos result script are now displayed in dialogue subviews.
10 years ago
1699759d12
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/view/render/cell.cpp
10 years ago
47d5eac290
Merge branch 'master' into NonTableFields
...
Conflicts:
apps/opencs/model/world/columnbase.cpp
apps/opencs/model/world/columnbase.hpp
apps/opencs/model/world/idtable.hpp
10 years ago
a976dca27b
Changed over the remaining RefId adapters. Fixed issue where map entries were overwriting the same key...
10 years ago
ef84e553be
Renamed some stuff.
10 years ago
41b368a759
Moved templated code around a bit.
10 years ago
bdf0d8db22
Re-organise the inheritance structure once more in preparation for adding Pathgrid tables.
10 years ago
83bcc8d451
Reorganised class inheritance structure of collections, columns and idtable model.
10 years ago
af67de73a5
Delete shiny
10 years ago
619b5206cd
More consistency nit pick.
10 years ago
29ef08bb75
Spelling and other consistencies nit pick.
10 years ago
236d628884
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/model/doc/document.cpp
apps/opencs/model/doc/documentmanager.cpp
components/CMakeLists.txt
components/bsa/resources.cpp
components/nif/data.hpp
components/nif/node.cpp
components/nifogre/mesh.hpp
components/nifogre/ogrenifloader.cpp
components/nifogre/particles.cpp
10 years ago
23cf859fee
added search stages (cell table only for now)
10 years ago
72400747f2
OpenCS: preliminary port of cell rendering to OSG
10 years ago
aedafe651a
OpenCS: delete physicssystem, will be replaced with OSG picking
10 years ago
78c6268891
added search class and search box widget
10 years ago
34d503017a
OpenCS: Set up an osgQt GraphicsWindow in SceneWidget
10 years ago
49c2da27b3
OpenCS compiles and runs again (no rendering)
10 years ago
d053c62032
setting up global search operation and subview
10 years ago
5eefcd862f
Merge branch 'master' into NonTableFields
...
Conflicts:
apps/opencs/model/tools/tools.cpp
apps/opencs/model/world/columnbase.cpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/commands.hpp
apps/opencs/model/world/idtable.hpp
apps/opencs/model/world/refidadapter.cpp
apps/opencs/model/world/refidadapter.hpp
apps/opencs/view/world/dialoguesubview.hpp
10 years ago
c0dfad23b3
Fixed editor operation multi-threading ( Fixes #923 )
10 years ago
907ac5ef7f
Merge remote-tracking branch 'scrawl/master'
10 years ago
727b68dd15
Reduce difference with the master branch where possible.
10 years ago
0fda1cdd53
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
10 years ago
0b70fdac57
added start script verifier
10 years ago
fb2ba7610c
Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/world/columnbase.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/idtable.cpp
apps/opencs/view/world/dialoguesubview.cpp
apps/opencs/view/world/dialoguesubview.hpp
apps/opencs/view/world/util.cpp
10 years ago
6cc9fa2b3f
Merge remote-tracking branch 'slothlife/cmake-release-build-fix'
10 years ago
e1314d6211
Implement OpenCS reference validation (Feature #831 )
10 years ago
cfe81bafe8
Remove setting CMAKE_BUILD_TYPE to Debug
...
Setting was causing single-target configurations (ninja, make) to
incorrectly link vs debug runtimes on Windows.
10 years ago
5534306eb3
Few rename fixes
10 years ago
0b7b627443
CMake fix for opencs rename
10 years ago
0557d45bd1
renamed opencs into openmw-cs
10 years ago
3a847732b4
abstracted message collection into a class
10 years ago
7c59ea6296
added specialised report table
10 years ago
2720e5ea9d
Remove PhysicsManager singleton and use shared_ptr instead. Resolves the issue where sometimes destructors were called in an unexpected sequence resulting in a crash while exiting the application.
10 years ago
e04ead2bd5
new element visibility button icons
10 years ago
a60e4c036f
Merge branch 'mode'
...
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/opencs/view/render/worldspacewidget.hpp
10 years ago
2acf446f18
added edit mode button to scene toolbar
10 years ago
4dd645559d
added ModeButton specialisation of PushButton for use in SceneToolMode
10 years ago
8b4651f055
Move mouse related functions and states out of WorldspaceWidget.
10 years ago
b328aa1fb9
Multiple document support.
10 years ago
03a30c3f1d
Experimental, compiles but does not work.
10 years ago
094f046087
Convert OverlaySystem to a OpenCS style singleton.
10 years ago
313aed078e
Merge remote-tracking branch 'remotes/upstream/master' into QtOgre
...
Conflicts:
apps/opencs/CMakeLists.txt
10 years ago
e58e5c2bf5
Update overlays independently from multiple viewports.
10 years ago
9323f96211
Move terrainstorage to opencs_units_noqt
10 years ago
809b8c6d5b
Conflicts:
...
apps/opencs/view/render/pagedworldspacewidget.cpp
10 years ago
21b16f8425
Merge branch 'tables'
...
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/world/data.cpp
apps/opencs/model/world/data.hpp
10 years ago
406135ee96
Merge remote-tracking branch 'upstream/master' into terrain
10 years ago
8786fb639f
Implement terrain rendering in OpenCS ( Fixes #1597 )
10 years ago
Marc Zinnschlag
Stanislav Bas
Nikolay Kasyanov
scrawl
cc9cii
Kamil Bar
slothlife