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 |
|