cc9cii
|
5eefcd862f
|
Merge branch 'master' into NonTableFields
Conflicts:
apps/opencs/model/tools/tools.cpp
apps/opencs/model/world/columnbase.cpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/commands.hpp
apps/opencs/model/world/idtable.hpp
apps/opencs/model/world/refidadapter.cpp
apps/opencs/model/world/refidadapter.hpp
apps/opencs/view/world/dialoguesubview.hpp
|
2015-03-16 10:30:54 +11: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 |
|
cc9cii
|
727b68dd15
|
Reduce difference with the master branch where possible.
|
2015-03-06 19:20:50 +11:00 |
|
cc9cii
|
6d6ff8c6a4
|
Resolved compile issues, but not fully working.
|
2015-03-06 14:36:13 +11:00 |
|
cc9cii
|
fb2ba7610c
|
Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/doc/document.cpp
apps/opencs/model/world/columnbase.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/commands.cpp
apps/opencs/model/world/idtable.cpp
apps/opencs/view/world/dialoguesubview.cpp
apps/opencs/view/world/dialoguesubview.hpp
apps/opencs/view/world/util.cpp
|
2015-03-04 11:22:42 +11:00 |
|
Marc Zinnschlag
|
a148b851c0
|
added start script table
|
2015-03-03 14:32:12 +01:00 |
|
Marc Zinnschlag
|
9603325b99
|
Merge remote-tracking branch 'origin/master'
|
2015-01-15 17:33:20 +01:00 |
|
Marc Zinnschlag
|
7615cbafce
|
create modify commands through command dispatcher
|
2015-01-15 14:24:33 +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 |
|
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 |
|
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 |
|
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 |
|
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
|
ade7f09203
|
Keep track of terrain in physics engine. Should resolve crash exiting after opening multiple subviews of the same cell.
|
2014-11-01 00:03:09 +11:00 |
|
cc9cii
|
4f685092fb
|
Merge remote-tracking branch 'remotes/upstream/master' into mouse-picking
|
2014-10-31 22:05: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 |
|
Alexander "Ace" Olofsson
|
c1ce570e37
|
Use the enum value from Qt::KeyboardModifiers
This fixes the windows build at least
|
2014-10-29 04:55:06 +01:00 |
|
cc9cii
|
c990ed4335
|
Merge branch 'mouse-picking-state' into mouse-picking
Conflicts:
apps/opencs/view/render/pagedworldspacewidget.cpp
apps/opencs/view/render/pagedworldspacewidget.hpp
|
2014-10-29 09:33:48 +11:00 |
|
cc9cii
|
6ca88dc541
|
Merge branch 'master' into mouse-picking
Conflicts:
apps/opencs/model/settings/usersettings.cpp
|
2014-10-29 09:28:23 +11:00 |
|
cc9cii
|
8e2a0ea90a
|
Implemented moving objects around x-y plane.
|
2014-10-29 08:13:13 +11:00 |
|
Marc Zinnschlag
|
b0a7b457f7
|
made double click actions in tables configurable
|
2014-10-27 09:32:02 +01:00 |
|
Marc Zinnschlag
|
275bf854ed
|
added new user setting: window/hide-subview (hide subview titlebar if there is only one subview in the window)
|
2014-10-27 08:57:18 +01:00 |
|
cc9cii
|
6c8320a638
|
More cleanup.
|
2014-10-27 12:09:20 +11:00 |
|
cc9cii
|
0b63ba5727
|
Move debug rendering code out of PhysicsSystem.
|
2014-10-27 08:08:33 +11:00 |
|
cc9cii
|
dd2c067e17
|
Cleanup for better legibility.
|
2014-10-27 06:50:51 +11:00 |
|
cc9cii
|
fb0f85c8db
|
Report terrain position on cursor position.
|
2014-10-26 21:15:47 +11:00 |
|
cc9cii
|
b46df4034d
|
Cleanup bullet objects in the destructors.
|
2014-10-26 07:56:51 +11:00 |
|
Marc Zinnschlag
|
aad13e6bff
|
close view when closing last sub-view unless this view is the last view
|
2014-10-25 18:13:56 +02:00 |
|
Marc Zinnschlag
|
a9f5632afd
|
extended double click functionality in tables
|
2014-10-25 16:27:36 +02:00 |
|
cc9cii
|
9337d6533a
|
Add terrain collision. Support visibility mask for objects and terrain.
|
2014-10-25 22:09:19 +11:00 |
|
cc9cii
|
cc0acec64c
|
Add settings to enable/disable debug rendering of mouse picking.
|
2014-10-25 21:02:40 +11:00 |
|
cc9cii
|
dd9208afeb
|
Merge remote-tracking branch 'upstream/master' into mouse-picking
|
2014-10-25 10:59:17 +01:00 |
|
cc9cii
|
e5dd8d06a0
|
Store object reference id to RigidBody instead of scene node handles.
|
2014-10-24 21:18:29 +11:00 |
|
cc9cii
|
cb53e714f7
|
Convert PhysicsSystem to a singleton.
|
2014-10-24 19:14:02 +10:00 |
|
Marc Zinnschlag
|
6ff41c6a00
|
intercept shift/ctrl double-clicks in tables
|
2014-10-23 11:28:58 +02:00 |
|
cc9cii
|
2f26fc1188
|
Avoid Ogre exceptions and null pointers.
|
2014-10-23 20:14:01 +11:00 |
|
cc9cii
|
39cd89a9af
|
Make gcc happy.
|
2014-10-23 18:51:31 +11:00 |
|
cc9cii
|
4d86371ca3
|
Minor refactoring and cleanup.
|
2014-10-23 15:35:01 +11:00 |
|
cc9cii
|
cca6d0a024
|
Fixed issue with mouse picking accuracy.
|
2014-10-23 12:43:06 +11:00 |
|
cc9cii
|
fdee3fd919
|
Added debug lines to show ray hit position. Added highlighting the Entity hit by the ray. Incorporated user setting far clip distance.
|
2014-10-23 06:59:14 +11:00 |
|
cc9cii
|
4b53b8658b
|
Debug rendering toggled by double clicking the right mouse button. Raycasting works, but inaccurate.
|
2014-10-22 07:11:04 +11:00 |
|
cc9cii
|
8bcd415cca
|
Fix duplicate calls to OEngine. Use correct position, rotation and scale. Debug draw not working.
|
2014-10-19 07:25:54 +11:00 |
|
cc9cii
|
03a30c3f1d
|
Experimental, compiles but does not work.
|
2014-10-18 06:16:48 +11:00 |
|
Marc Zinnschlag
|
4b921c3876
|
user settings cleanup
|
2014-10-17 13:49:33 +02:00 |
|
Marc Zinnschlag
|
02acf60c0b
|
added tooltips for scopes in creator bar
|
2014-10-13 14:24:27 +02:00 |
|
Marc Zinnschlag
|
21b16f8425
|
Merge branch 'tables'
Conflicts:
apps/opencs/CMakeLists.txt
apps/opencs/model/world/data.cpp
apps/opencs/model/world/data.hpp
|
2014-10-10 16:11:54 +02:00 |
|
Marc Zinnschlag
|
9fd82212b3
|
Merge remote-tracking branch 'cc9cii/opencs-settings'
|
2014-10-03 13:11:05 +02:00 |
|
Marc Zinnschlag
|
f4c9897bbd
|
Merge branch 'master' into tables
|
2014-10-02 15:49:36 +02:00 |
|
Marc Zinnschlag
|
00073694c6
|
added pathgrid subview
|
2014-10-02 15:16:19 +02:00 |
|
cc9cii
|
8a0ff17c22
|
Update SceneWidget when relevant user settings change.
|
2014-09-28 14:08:14 +10:00 |
|
scrawl
|
7252cb63a6
|
Fix cppcheck issues
|
2014-09-26 17:48:14 +02:00 |
|
Marc Zinnschlag
|
23fd314294
|
added magic effects table
|
2014-09-26 13:12:17 +02:00 |
|
cc9cii
|
31fb160376
|
More cleanup.
|
2014-09-25 06:59:04 +10:00 |
|
Marc Zinnschlag
|
7ab4881661
|
added sound gen table
|
2014-09-23 13:21:54 +02:00 |
|
cc9cii
|
437fb774c5
|
Re-implemented subview minimum size setting.
|
2014-09-23 07:16:07 +10:00 |
|
cc9cii
|
c8ae8f4a6d
|
Added minimum width setting for subviews - regionmap, table, scene, preview and dialogue. It should be noted that the setting is not the starting minimum width, i.e. it won't be possible to reduce the width of the subview after the creation. Also, one setting applies to all subviews. It may be desirable to have individual settings.
|
2014-09-23 06:30:41 +10:00 |
|
Marc Zinnschlag
|
5c8ef842b6
|
Merge branch 'edit'
|
2014-09-22 09:54:44 +02:00 |
|
Marc Zinnschlag
|
51151bc43e
|
minor fix
|
2014-09-22 09:53:07 +02:00 |
|
Marc Zinnschlag
|
9d316a8745
|
Merge branch 'records'
|
2014-09-20 13:59:45 +02:00 |
|
Marc Zinnschlag
|
8499ceb35d
|
set default value for topic when cloning info records
|
2014-09-20 13:30:36 +02:00 |
|
Marc Zinnschlag
|
8ce87803c4
|
set default value for cell when cloning references
|
2014-09-20 12:54:25 +02:00 |
|
Marc Zinnschlag
|
b39cdb7645
|
fixed referenceable cloning (and as a side-effect enabled showing the type of the refereceable in the clone UI)
|
2014-09-20 12:48:51 +02:00 |
|
Marc Zinnschlag
|
90ad3f332a
|
extending refnum functionality to cloning (and also enable cloning of references to a different cell)
|
2014-09-20 12:37:25 +02:00 |
|
Marc Zinnschlag
|
3add4bdf35
|
rewrote refnum handling code (fixes broken reference creation, but not reference cloning yet)
|
2014-09-18 13:41:29 +02:00 |
|
Marc Zinnschlag
|
6fbffdb98f
|
fixed reference creator error handling
|
2014-09-18 12:39:29 +02:00 |
|
Marc Zinnschlag
|
e93ab383ea
|
set refnum and increment refnum counter when creating a new reference
|
2014-09-18 12:25:17 +02:00 |
|
Stanislav
|
313bdf4e78
|
fix
|
2014-09-18 10:25:33 +06:00 |
|
Stanislav
|
ebb223b2d3
|
Feature #1226: fixes
|
2014-09-17 09:03:02 +06:00 |
|
Marc Zinnschlag
|
70275350de
|
rewrote command generation in GenericCreator
|
2014-09-16 13:28:11 +02:00 |
|