1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-26 19:09:41 +00:00
Commit graph

506 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
38ce074a62 Merge branch 'replace' 2015-04-16 20:11:25 +02:00
Marc Zinnschlag
3b408b6427 sorting out some Display enum mixup 2015-04-04 19:55:53 +02:00
scrawl
6ff2523d8a Fix for line focus when clicking on a verifier script error
- setFocus() on the script editor, otherwise setting the text cursor has no effect.
- setFocus() must be done after the widgets are created/shown, or the newly created widgets will "steal" the focus again.
- Missing useHint in case subviews are reused.
2015-03-16 03:07:37 +01:00
cc9cii
15b9a628ac Fix the name of DragRecordTable::startDrag method. Make the compiler be quiet about BulletShapeLoader's hidden overloaded methods. 2015-03-14 19:41:55 +11:00
cc9cii
17e6244bd6 Yet more warnings suppressed. 2015-03-14 12:42:46 +11:00
Marc Zinnschlag
26955dc6d3 Merge remote-tracking branch 'cc9cii/editor-var-edit' 2015-03-12 10:44:55 +01:00
cc9cii
418025e0a2 Add missing editor type to the dialogue. Should resolve Bug #2437. 2015-03-12 13:10:25 +11:00
Scott Howard
e2ef8c4022 fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
Marc Zinnschlag
a148b851c0 added start script table 2015-03-03 14:32:12 +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
Marc Zinnschlag
9603325b99 Merge remote-tracking branch 'origin/master' 2015-01-15 17:33:20 +01:00
Marc Zinnschlag
706df3f881 silenced a coverity warning 2015-01-15 12:13:53 +01:00
scrawl
f11ec653d0 Add setting for showing MRK nodes to NIF loaders
This makes marker objects show up in OpenCS.
2015-01-13 17:29:25 +01: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
e6307a5151 move cursor in scripteditor to position of error 2014-12-08 12:29:23 +01:00
cc9cii
6731afc79c Use float for setting skill use values. Should resolve bug #2183. 2014-12-05 03:59:16 +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
e04ead2bd5 new element visibility button icons 2014-11-28 09:14:02 +01:00
cc9cii
936094ae95 Set range of spinbox types in dialogsubview. 2014-11-26 08:08:28 +11: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
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
0a66877cf1 Remove no longer needed code. 2014-11-13 07:47:32 +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
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
48ecea7103 Simplistic drop-to-ground functionality for pathgrid points. 2014-11-10 22:38:29 +11:00
cc9cii
89eb30054b Fix deleting physic objects. 2014-11-09 18:37:04 +11:00
cc9cii
895739d6bb Visibility mask working correctly. 2014-11-09 17:53:54 +11:00
cc9cii
2c09b9ba21 Fix scene node being erased in the object reference map. 2014-11-09 12:34:26 +11:00
cc9cii
a3a0682138 Remove files no longer used, reverting to OEngine. 2014-11-06 11:16:17 +11:00
cc9cii
f051fb65ff Fix memory leak when multiple documents in 3D edit. Support multiple physics engine per document. 2014-11-06 08:35:24 +11:00
cc9cii
03abd69b4f Include string header for gcc. 2014-11-05 07:20:20 +11:00
cc9cii
7d133d508d Remove unused code. Move the cleanup of global resources used by the PhysicsEngine to PhysicsManager. 2014-11-05 07:10:14 +11:00
cc9cii
37a050873c Fix crash when multiple scenewidgets were closed. BtOgre was destroying resources each time. 2014-11-04 21:46:35 +11:00
cc9cii
70b5d6857a Add missing files. 2014-11-04 20:52:28 +11:00
cc9cii
0e70315f91 Experimental, compiles and runs but crashes in some exit scenarios. 2014-11-04 20:43:04 +11:00
cc9cii
bf5ba41223 Fix deleting physics object when scene nodes were still referencing it. Remove unused code from MouseState. Items that do not change are fetched only once. 2014-11-03 12:46:31 +11:00
cc9cii
358cac2f0a Fix deleting object physics again. 2014-11-03 10:03:54 +11:00
cc9cii
85ef683319 Fix deleting physics object when scene node is cleared. 2014-11-03 08:10:28 +11:00
cc9cii
3796240b19 Refactor duplicate code sections. 2014-11-02 18:13:25 +11:00
cc9cii
49d416353e Remove a redundant list. 2014-11-02 17:56:28 +11:00
cc9cii
7f54dab6ef Fix issue where objects were sometimes unresponsive after dragging. 2014-11-02 15:34:45 +11:00
cc9cii
998982b16a Keep physics engines until physics code is moved out of OEngine. 2014-11-01 21:04:53 +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
1ee64c7087 Add missing files for multi-document support. 2014-11-01 19:12:22 +11:00
cc9cii
b328aa1fb9 Multiple document support. 2014-11-01 18:57:39 +11:00