mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-20 15:40:32 +00:00
Code Issues Projects Releases Wiki Activity
14,047 Commits 17 Branches 68 Tags
Commit Graph

66 Commits

Author SHA1 Message Date
cc9cii
9716b671f1 Merge branch 'cc9cii' into Feature-1278 
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/nestedcoladapterimp.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/worldspacewidget.cpp
 2015-11-07 12:04:09 +11:00
scrawl
f8f66bffb0 Remove empty line at the beginning of files 
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
 2015-09-08 06:40:06 +10: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
cc9cii
a02448f0ba Merge branch 'master' into pathgrid-edit 
Conflicts:
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
 2015-05-31 11:12:39 +10:00
Rohit Nirmal
396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
Marc Zinnschlag
048d7be87c Adjusted terminology for references/referenceables in OpenMW-CS user-interface (Fixes #2516) 2015-05-03 16:35:10 +02:00
cc9cii
3102a17522 Changes made to DialogueSubview pathgrid tables are now reflected on PagedWorldspaceWidget. 2015-04-24 04:00:49 +10:00
cc9cii
84f0ddd51c Merge branch 'master' into pathgrid-edit 
Conflicts:
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/object.cpp
	apps/opencs/view/render/object.hpp
	apps/opencs/view/render/pagedworldspacewidget.cpp
	apps/opencs/view/render/unpagedworldspacewidget.cpp
	apps/opencs/view/render/worldspacewidget.cpp
 2014-12-09 14:02:26 +11: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
cc9cii
9703fd95ac Merge branch 'master' into pathgrid-edit 
Conflicts:
	apps/opencs/view/render/pagedworldspacewidget.cpp
 2014-11-14 18:03:53 +11: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
cc9cii
d65adc4376 Reduce code duplication. 2014-11-12 22:04:48 +11: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
1f73fae6ef Allow adding or dragging pathgrid points over objects as well as terrain. 2014-11-09 20:03:29 +11:00
cc9cii
a5a76cadca Adding, deleting and moving pathgrid points work. However still not saving to the document. 2014-11-09 14:36:58 +11: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
cc9cii
792fbd119f Resolve incorrect merge issues. 2014-10-29 10:43:55 +11:00
cc9cii
68b7532383 Move code to WorldspaceWidget so that UnpagedWorldspaceWidget can be supported. 2014-10-29 00:50:48 +11:00
cc9cii
809b8c6d5b Conflicts: 
apps/opencs/view/render/pagedworldspacewidget.cpp
 2014-10-12 05:54:21 +11:00
cc9cii
b3ef7a71e2 Different implementation of update overlay fix. 2014-10-09 05:56:44 +11:00
cc9cii
dbb2781817 Mouse click on text overlay implemented. Removed 'm' keybinding for overlay toggle. White lines not visible by default. 2014-10-06 08:20:09 +11:00
cc9cii
85d93807c5 Working version. White lines still present. Marker toggle hard-coded to 'm' key. Mouse events not implemented. 2014-10-05 19:25:37 +11:00
Marc Zinnschlag
1254198d90 add debug profiles to scene subviews view drag and drop 2014-09-13 18:54:29 +02:00
Marc Zinnschlag
717c1b15f5 fixed drop implementation for unpaged worldspace (wasn't updating cell object) 2014-09-11 13:08:30 +02:00
Marc Zinnschlag
0db288ce07 generalising and cleaning up drop implementation of worldspace widget 2014-09-11 13:04:20 +02:00
Marc Zinnschlag
5a9376450b some cleanup of the scene view drop code 2014-09-11 11:27:56 +02:00
Marc Zinnschlag
f913d51e35 remove deleted debug profiles from run tool 2014-09-07 12:55:52 +02:00
Marc Zinnschlag
51128d2d57 added run button to scene subview toolbar 2014-09-06 16:11:06 +02:00
Marc Zinnschlag
1e6d557089 Merge branch 'visibility' 2014-07-31 14:34:25 +02:00