mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-04 00:15:32 +00:00
Code Issues Releases Wiki Activity
13227 commits 38 branches 54 tags 122 MiB
Commit graph

261 commits

Author SHA1 Message Date
cc9cii
03578129c7 Merge branch 'master' into pathgrid-edit 
Conflicts:
	apps/opencs/view/render/cell.cpp
 2015-04-18 15:47:45 +10:00
Marc Zinnschlag
a9a8b5ad47 improved performance of CSVRender::Cell::addObjects by bypassing Qt model 2015-03-31 14:25:27 +02:00
cc9cii
17e6244bd6 Yet more warnings suppressed. 2015-03-14 12:42:46 +11:00
Scott Howard
e2ef8c4022 fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
scrawl
f6509fe53e Another crash fix for land record without data 2015-03-02 22:23:00 +01:00
cc9cii
7f7c3d57bd Merge branch 'master' into pathgrid-edit 
Conflicts:
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/cell.hpp
 2015-02-16 16:46:52 +11:00
Alexander "Ace" Olofsson
62acb03735 More Ogre + recent Boost build fixes 2015-01-27 21:07:26 +01:00
Marc Zinnschlag
c55e9b9c58 one more potential 0-pointer fix 2015-01-15 15:00:16 +01:00
Marc Zinnschlag
7b8e6f9dda addressed potential 0-pointer issue 2015-01-15 12:04:23 +01:00
scrawl
f931ba2efc Fix some static analysis issues (coverity) 2014-12-24 15:45:12 +01:00
cc9cii
4c3c674223 Resolve merge issues. 2014-12-09 19:37:37 +11: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
3b5cd286f6 Do not destroy overlay if it was never created (e.g. due to an Ogre exception). 2014-12-01 14:09:22 +11:00
cc9cii
44b11163d1 Do not delete physics objects if it was never created (e.g. preview window) 2014-12-01 10:07:02 +11:00
cc9cii
2d229c70cb Another missed null shared_ptr conversion for gcc. 2014-12-01 09:41:03 +11: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
Marc Zinnschlag
b7f8f848a8 added edit modes for exteriors 2014-11-13 10:45:59 +01:00
cc9cii
0a66877cf1 Remove no longer needed code. 2014-11-13 07:47:32 +11:00
cc9cii
ba1a42ec05 Don't delete physics object if it was never created. 2014-11-13 07:41:31 +11:00
cc9cii
0e0ad97a91 Pathgrid edge resource management for editing multiple cells or multiple documents. 2014-11-13 06:36:47 +11:00
cc9cii
e430dcfd8a Check the resource group's existence before destroying it. 2014-11-13 05:59:04 +11:00
cc9cii
12511778d1 Remove duplicate parameter. 2014-11-12 22:43:22 +11:00
cc9cii
8c6890c682 Move element filtering back out of castRay(). 2014-11-12 22:28:41 +11:00
cc9cii
d65adc4376 Reduce code duplication. 2014-11-12 22:04:48 +11:00
cc9cii
b86148411b Fix for issue #2051. Not perfect (can get into a lock in some situations) but usable. 2014-11-12 14:02:08 +11:00
Marc Zinnschlag
2acf446f18 added edit mode button to scene toolbar 2014-11-11 15:58:22 +01:00
cc9cii
3eb556ff8a Enhanced snap functionality for pathgrid points. 2014-11-11 19:40:04 +11:00
cc9cii
407edc770c Added a simplistic snap to closest object or terrain. 2014-11-11 07:47:35 +11:00
cc9cii
1504119da7 Increase the sensitivity of the wheel movement. 2014-11-11 06:07:52 +11:00
cc9cii
48ecea7103 Simplistic drop-to-ground functionality for pathgrid points. 2014-11-10 22:38:29 +11:00
cc9cii
2412d127b0 Fix saving pathgrid positions when adding or moving. 2014-11-10 22:29:01 +11:00
cc9cii
d7804974e8 Better mouse cursor tracking for the third axis. 2014-11-10 20:37:07 +11: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
f5ba74cd10 Suppress warnings. 2014-11-09 18:10:44 +11:00
cc9cii
895739d6bb Visibility mask working correctly. 2014-11-09 17:53:54 +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
f2ff2f2988 Render pathgrid points and edges. Can move the points but the edges are not updated. Visibility mask does not work properly because pathgrid points are considered as objects by the physics engine. 2014-11-08 15:51:45 +11:00
cc9cii
bf669a51c1 Merge branch 'master' into mouse-picking-physics 2014-11-06 09:46:48 +11:00
scrawl
6b88f5f33e Use Ogre::uint8, fixes a missing include for uint8_t 2014-11-05 20:58:49 +01:00
scrawl
61d4a6b344 Merge branch 'openmw-033' 2014-11-05 20:58:42 +01:00