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
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
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
2015-05-23 20:33:44 +02:00
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
2015-05-18 07:12:02 +10:00
scrawl
47758c11cd
Readded collision objects and movement physics
2015-05-12 03:02:15 +02:00
scrawl
c31b416ba1
Move physicssystem to a new mwphysics module
2015-05-10 01:09:00 +02:00
scrawl
c1edc30ad7
Dead code removal
2015-05-04 03:29:12 +02:00
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
2015-05-04 02:41:50 +02:00
cc9cii
18162557b0
TopicInfos result script are now displayed in dialogue subviews.
2015-04-19 13:31:16 +10:00
scrawl
1699759d12
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
...
Conflicts:
apps/opencs/view/render/cell.cpp
2015-04-19 02:29:16 +02:00
cc9cii
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
2015-04-17 12:37:34 +10:00
cc9cii
a976dca27b
Changed over the remaining RefId adapters. Fixed issue where map entries were overwriting the same key...
2015-04-13 06:39:38 +10:00
cc9cii
ef84e553be
Renamed some stuff.
2015-04-12 13:48:23 +10:00
cc9cii
41b368a759
Moved templated code around a bit.
2015-04-12 10:52:01 +10:00
cc9cii
bdf0d8db22
Re-organise the inheritance structure once more in preparation for adding Pathgrid tables.
2015-04-09 19:11:19 +10:00
cc9cii
83bcc8d451
Reorganised class inheritance structure of collections, columns and idtable model.
2015-04-02 20:19:15 +11:00
scrawl
af67de73a5
Delete shiny
2015-04-01 17:06:31 +02:00
cc9cii
619b5206cd
More consistency nit pick.
2015-03-30 16:41:55 +11:00
cc9cii
29ef08bb75
Spelling and other consistencies nit pick.
2015-03-30 11:53:33 +11:00
scrawl
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
2015-03-27 17:30:48 +01:00
Marc Zinnschlag
23cf859fee
added search stages (cell table only for now)
2015-03-27 16:33:54 +01:00
scrawl
72400747f2
OpenCS: preliminary port of cell rendering to OSG
2015-03-25 23:35:10 +01:00
scrawl
aedafe651a
OpenCS: delete physicssystem, will be replaced with OSG picking
2015-03-25 19:08:09 +01:00
Marc Zinnschlag
78c6268891
added search class and search box widget
2015-03-25 11:56:14 +01:00
scrawl
34d503017a
OpenCS: Set up an osgQt GraphicsWindow in SceneWidget
2015-03-20 16:22:33 +01:00
scrawl
49c2da27b3
OpenCS compiles and runs again (no rendering)
2015-03-19 17:21:15 +01:00
Marc Zinnschlag
d053c62032
setting up global search operation and subview
2015-03-17 12:30:47 +01:00
cc9cii
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
2015-03-16 10:30:54 +11:00
Marc Zinnschlag
c0dfad23b3
Fixed editor operation multi-threading ( Fixes #923 )
2015-03-14 12:00:24 +01:00
Marc Zinnschlag
907ac5ef7f
Merge remote-tracking branch 'scrawl/master'
2015-03-06 19:24:15 +01:00
cc9cii
727b68dd15
Reduce difference with the master branch where possible.
2015-03-06 19:20:50 +11:00
scrawl
0fda1cdd53
Move oengine to a static library, fixes duplicate compilation of oengine/bullet files by openmw and opencs
2015-03-06 02:36:12 +01:00
Marc Zinnschlag
0b70fdac57
added start script verifier
2015-03-05 11:24:01 +01:00
cc9cii
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
2015-03-04 11:22:42 +11:00
Marc Zinnschlag
6cc9fa2b3f
Merge remote-tracking branch 'slothlife/cmake-release-build-fix'
2015-02-15 09:52:13 +01:00
Kamil Bar
e1314d6211
Implement OpenCS reference validation (Feature #831 )
2015-02-13 04:45:18 +01:00
slothlife
cfe81bafe8
Remove setting CMAKE_BUILD_TYPE to Debug
...
Setting was causing single-target configurations (ninja, make) to
incorrectly link vs debug runtimes on Windows.
2015-02-11 21:46:00 -06:00
Nikolay Kasyanov
5534306eb3
Few rename fixes
2015-02-06 08:59:00 +02:00
scrawl
0b7b627443
CMake fix for opencs rename
2015-02-03 13:57:40 +01:00
Marc Zinnschlag
0557d45bd1
renamed opencs into openmw-cs
2015-02-03 13:18:03 +01:00
Marc Zinnschlag
3a847732b4
abstracted message collection into a class
2014-12-07 18:57:47 +01:00
Marc Zinnschlag
7c59ea6296
added specialised report table
2014-12-06 13:01:55 +01:00
cc9cii
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.
2014-12-01 06:44:12 +11:00
Marc Zinnschlag
e04ead2bd5
new element visibility button icons
2014-11-28 09:14:02 +01:00
Marc Zinnschlag
a60e4c036f
Merge branch 'mode'
...
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/worldspacewidget.cpp
apps/opencs/view/render/worldspacewidget.hpp
2014-11-13 11:12:20 +01:00
Marc Zinnschlag
2acf446f18
added edit mode button to scene toolbar
2014-11-11 15:58:22 +01:00
Marc Zinnschlag
4dd645559d
added ModeButton specialisation of PushButton for use in SceneToolMode
2014-11-06 13:26:19 +01:00
