mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 15:49:55 +00:00
Code Issues Releases Wiki Activity
14846 commits 38 branches 54 tags 122 MiB
Commit graph

79 commits

Author SHA1 Message Date
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
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
b2cb5f0374 pass on user settings updates to potentially interested parties within a scene subview 2015-09-24 15:51:16 +02:00
scrawl
18d0cae801 OpenCS: Select objects with the right mouse button 2015-09-18 18:31:43 +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
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
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
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
232e34bddd OpenCS: port lighting toolbar, fix multiple context GL objects issue 2015-03-28 20:15:17 +01:00
scrawl
e3bfbcb44b OpenCS: connect navigation button to OSG camera manipulators 2015-03-26 00:55:58 +01:00
scrawl
1edccdbe55 OpenCS: apply visibility flags to osg node 2015-03-26 00:27:39 +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
scrawl
34d503017a OpenCS: Set up an osgQt GraphicsWindow in SceneWidget 2015-03-20 16:22:33 +01:00
Marc Zinnschlag
f771b95a15 Merge remote-tracking branch 'cc9cii/master' 2014-12-04 20:04:19 +01:00
Marc Zinnschlag
406cf2b981 disable element visibility buttons that do not apply to the respective cell type 2014-12-02 11:17:39 +01:00
cc9cii
9fb4b1f499 Initialise null shared_ptr 2014-12-01 08:15:17 +11: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
e177b66c1d moved fog button from unpaged worldspace to worldspace 2014-11-28 09:16:39 +01:00
Marc Zinnschlag
e04ead2bd5 new element visibility button icons 2014-11-28 09:14:02 +01:00
Marc Zinnschlag
50a489321f updated run button 2014-11-27 09:27:29 +01:00
Marc Zinnschlag
5eb9fd81e1 use placeholder icons in OpenCS when no proper icon is available 2014-11-13 12:09:10 +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
b50fcd403b renamed getElementMask to getVisibilityMask 2014-11-09 11:29:45 +01:00
cc9cii
bd6e54dde3 Add function to cancel drag by pressing ESC. Remove debug code. 2014-11-03 21:24:47 +11:00
cc9cii
85ef683319 Fix deleting physics object when scene node is cleared. 2014-11-03 08:10:28 +11:00
cc9cii
1eed180a5c Fix Gcc/MSVC differences with friend class. Invert camera derived direction. 2014-11-02 11:41:11 +11:00
cc9cii
8b4651f055 Move mouse related functions and states out of WorldspaceWidget. 2014-11-02 08:22:27 +11:00
cc9cii
c6a2461fbd Delay removing physics until the document is closed. Also other general cleanup. 2014-11-01 20:51:04 +11:00
cc9cii
b328aa1fb9 Multiple document support. 2014-11-01 18:57:39 +11:00
cc9cii
057982b1f8 Fix Subview interface clutter by keeping a map of Scenewidgets. 2014-11-01 08:29:08 +11:00
cc9cii
e51d532795 Show drag movements of objects in multiple scene managers. 2014-11-01 07:39:58 +11:00
cc9cii
d6e67b248f Fix deleting objects and scenewidgets. 2014-11-01 07:29:16 +11:00
cc9cii
ac7acb2c22 Disable more debug code. 2014-10-31 22:21:24 +11:00
cc9cii
aa7b693a13 Remove debug settings and minor cleanup. 2014-10-31 22:04:10 +11:00
cc9cii
fbadaf55ee Multiple SceneManagers per physics engine now working. 2014-10-31 21:50:57 +11:00
cc9cii
a2ac4c7650 Allow multiple scene managers per physics engine. Compiles but does not work properly. 2014-10-31 08:18:15 +11:00
cc9cii
1741043f20 Revert to storing Scene Node names as the key in RigidBody. Allow moving objects up/down using scroll wheel or touchpad while dragging. Cleanup code a little. 2014-10-29 23:02:38 +11:00