Rohit Nirmal
|
0a8e2c0b21
|
Fix building OpenCS with Qt 5.
|
2015-10-03 00:07:08 -05:00 |
|
Marc Zinnschlag
|
4b0fa370e3
|
made WorldspaceWidget::getDocument public (EditModes will need the document later)
|
2015-10-02 15:06:42 +02:00 |
|
Marc Zinnschlag
|
323f8bb29f
|
sensitivity settings
|
2015-10-01 13:42:21 +02:00 |
|
Marc Zinnschlag
|
1d4f8b2595
|
send mouse wheel input to active EditMode during drag operations
|
2015-10-01 13:19:48 +02:00 |
|
Marc Zinnschlag
|
0a5bfb2107
|
added framework for drag operations
|
2015-10-01 12:46:01 +02:00 |
|
Marc Zinnschlag
|
8e87b48866
|
handle context-sensitive select mode in instance editing
|
2015-09-29 16:07:14 +02:00 |
|
Marc Zinnschlag
|
2cb106f6ad
|
added missing flagAsModified calls
|
2015-09-29 16:06:55 +02:00 |
|
Marc Zinnschlag
|
f28fa9fc16
|
clear instance selection on select click on nothing/something that isn't an instance
|
2015-09-29 13:53:47 +02:00 |
|
Marc Zinnschlag
|
319e3f24a3
|
on edit mode change clear selection of elements that are not affected by current edit mode (only support for instance for now since we do not have selection for other elements yet)
|
2015-09-29 13:48:04 +02:00 |
|
Marc Zinnschlag
|
981a8a2cc2
|
delegated editing and selection functions to mode objects
|
2015-09-27 16:18:22 +02:00 |
|
Marc Zinnschlag
|
9bf27c7e37
|
moved edit mode handling from SceneSubView to WorldspaceWidget
|
2015-09-27 14:38:12 +02:00 |
|
Marc Zinnschlag
|
5d9863aec1
|
removed a redundant check
|
2015-09-27 11:34:14 +02:00 |
|
Marc Zinnschlag
|
7bbc475bda
|
apply button mapping
|
2015-09-26 18:01:49 +02:00 |
|
Marc Zinnschlag
|
501ae6372d
|
factored out mouse picking into a separate function
|
2015-09-26 17:51:41 +02:00 |
|
Marc Zinnschlag
|
3844c94975
|
bit masking fix
|
2015-09-26 17:39:55 +02:00 |
|
Marc Zinnschlag
|
72bb33c2c4
|
filter mouse interaction by interaction mask
|
2015-09-26 12:24:41 +02:00 |
|
Marc Zinnschlag
|
71247a0186
|
inserted TagBase between ObjectTag and osg::Referenced
|
2015-09-26 12:18:18 +02:00 |
|
Marc Zinnschlag
|
748b13b45b
|
renamed ObjectHolder into ObjectTag
|
2015-09-26 12:05:44 +02:00 |
|
Marc Zinnschlag
|
d46eeb04cd
|
removed a left-over debugging statement
|
2015-09-25 14:16:41 +02:00 |
|
Marc Zinnschlag
|
5c34a02058
|
store mouse bindings in WorldspaceWidget
|
2015-09-25 13:11:40 +02:00 |
|
Marc Zinnschlag
|
62047b1868
|
Merge remote-tracking branch 'origin/master' into sceneinput
|
2015-09-24 16:07:39 +02:00 |
|
Marc Zinnschlag
|
3ada08af90
|
store lock state and pass it on to edit mode
|
2015-09-24 16:07:17 +02:00 |
|
Marc Zinnschlag
|
b2cb5f0374
|
pass on user settings updates to potentially interested parties within a scene subview
|
2015-09-24 15:51:16 +02:00 |
|
scrawl
|
12b8fcf0bf
|
OpenCS: Fix camera position retrieval in WorldspaceWidget
|
2015-09-23 23:37:09 +02:00 |
|
scrawl
|
18d0cae801
|
OpenCS: Select objects with the right mouse button
|
2015-09-18 18:31:43 +02:00 |
|
scrawl
|
41ea76fd83
|
OpenCS: Add selection outline effect to CSVRender::Object
|
2015-09-18 18:31:05 +02:00 |
|
scrawl
|
dac3b33efb
|
OpenCS: Pass events from the QGLWidget to the RenderWidget
|
2015-09-18 18:30:48 +02:00 |
|
scrawl
|
169fc6a61b
|
OpenCS: Remove margin around the render window
|
2015-09-18 18:29:22 +02:00 |
|
Marc Zinnschlag
|
1aa926c7e0
|
restored T-shortcut (focus toolbar) in scene widget
|
2015-09-17 12:41:56 +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 |
|
Marc Zinnschlag
|
85f6bb892b
|
removed indirection in OpenMW-CS land record
|
2015-08-31 18:13:27 +02:00 |
|
Marc Zinnschlag
|
febf611c82
|
made return type of ESMTerrain::Storage::getLand const
|
2015-08-31 14:17:11 +02:00 |
|
scrawl
|
32ad8c86bf
|
Fix the ESM::LandTexture NAME being discarded on loading
|
2015-08-22 13:10:54 +02:00 |
|
scrawl
|
67bd6cd708
|
Remove empty line at the beginning of files
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
|
2015-08-18 23:06:12 +02:00 |
|
scrawl
|
58720e6a28
|
Fix the OpenCS rendering crash on exit (Fixes #2735)
|
2015-07-18 03:52:48 +02:00 |
|
scrawl
|
76799982a5
|
Add missing include
|
2015-06-18 14:56:43 +02:00 |
|
scrawl
|
412e001edb
|
Fix simulation time reset in OpenCS when opening a new view
|
2015-06-14 19:19:23 +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 |
|
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
|
1ba3fa4169
|
Remove leftovers of the old OpenCS navigation
|
2015-06-03 18:11:34 +02:00 |
|
scrawl
|
cd47dff196
|
Minor cleanup
|
2015-06-03 03:03:16 +02:00 |
|
scrawl
|
cdd0623009
|
Terrain rendering
|
2015-06-03 01:35:41 +02:00 |
|
scrawl
|
da24e298ee
|
Fix -Wreorder warnings
|
2015-05-23 22:44:00 +02: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 |
|
Rohit Nirmal
|
396fba7fa9
|
Silence -Wreorder warnings, and remove -Wno-reorder.
|
2015-05-21 22:46:44 -05:00 |
|
scrawl
|
820f4a2688
|
Fix light direction
|
2015-05-20 02:07:18 +02:00 |
|
scrawl
|
c31b416ba1
|
Move physicssystem to a new mwphysics module
|
2015-05-10 01:09:00 +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 |
|
Marc Zinnschlag
|
048d7be87c
|
Adjusted terminology for references/referenceables in OpenMW-CS user-interface (Fixes #2516)
|
2015-05-03 16:35:10 +02: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 |
|