Aesylwinn
2b72a04e7a
Update 1st person up axis ASAP.
2016-03-18 14:02:55 -04:00
Aesylwinn
999869da24
Position camera above, near, and looking at the scene.
2016-03-18 14:02:24 -04:00
Aesylwinn
fcccacc0fa
Define a constant for the World Up vector
2016-03-18 13:57:48 -04:00
Aesylwinn
59f59a3385
Fix indentation
2016-03-14 00:45:36 -04:00
Aesylwinn
08fe914ba1
Preliminary editor camera
2016-03-14 00:45:18 -04:00
Aesylwinn
2cff2cd643
Remove unnecessary override.
2016-03-14 00:45:08 -04:00
Aesylwinn
9ed2cf6581
Fix callback being skipped
2016-03-14 00:44:56 -04:00
Aesylwinn
ebdc212886
Moved selectNavigationMode to SceneWidget class, centralized camera selection.
2016-03-14 00:44:46 -04:00
Aesylwinn
9afb0e0f90
Input restructuring.
2016-03-14 00:42:15 -04:00
Aesylwinn
f4f7afb53b
Removed now unnecessary installation of event filter.
2016-03-14 00:41:57 -04:00
Aesylwinn
38059593a7
Removed workaround for OSG input handling in RenderWidget.
2016-03-14 00:41:04 -04:00
Marc Zinnschlag
900378a31e
changed 'not implemented' warning message for object movement
2016-03-12 13:26:33 +01:00
Marc Zinnschlag
d6b8033b46
handle cell transitions when moving objects
2016-03-12 13:19:51 +01:00
Marc Zinnschlag
fa9689c5e7
delay command execution until call to Object::apply has finished (avoids cutting off the branch we are sitting on)
2016-03-11 14:04:47 +01:00
Marc Zinnschlag
6a2fe564ef
Merge branch 'master' into move
2016-03-11 12:47:33 +01:00
Marc Zinnschlag
b2181fae20
safer handling of command macros
2016-03-08 10:48:44 +01:00
Marc Zinnschlag
b5005f7812
keep sub mode over mode changes
2016-03-05 11:41:42 +01:00
Marc Zinnschlag
a63453846b
properly clear drag mode at the end of a drag
2016-03-05 11:14:08 +01:00
Marc Zinnschlag
51a4e3fa7d
properly abort drags from outside the worldspace widget (code was leaving unclean dragging flags behind)
2016-03-05 10:56:54 +01:00
Marc Zinnschlag
70745487f3
cancel instance move on editing lock becoming active
2016-03-05 10:44:46 +01:00
Marc Zinnschlag
b1fb64bf68
added missing drag mode resets
2016-03-04 16:25:30 +01:00
Marc Zinnschlag
dd564daba0
do not start move drags while the document is locked for editing
2016-03-04 16:24:02 +01:00
Marc Zinnschlag
1726393963
cancel instance move on edit mode change
2016-03-04 15:31:50 +01:00
Marc Zinnschlag
25effc4222
cancel instance move on sub mode change
2016-03-04 15:30:28 +01:00
Marc Zinnschlag
1240e0c716
cancel instance move on drag abort
2016-03-04 15:19:26 +01:00
Marc Zinnschlag
d57021b23c
some code simplification
2016-03-04 12:02:45 +01:00
Marc Zinnschlag
c2a8be9048
confine move marker drags to a single axis
2016-03-04 12:00:05 +01:00
Marc Zinnschlag
4cd24715cb
Merge remote-tracking branch 'pi03k/bug_2570'
2016-03-04 09:41:21 +01:00
pi03k
128508882a
Changed some zeros to NULLs in view.cpp
2016-03-03 11:46:56 +01:00
pi03k
3bfab9c2c9
extracted creation of scroll area to separate method
2016-03-03 11:46:56 +01:00
pi03k
9539925f3e
Fixed typo in updateSubViewIndices. Changed 0 to NULL for pointers.
2016-03-03 11:46:56 +01:00
pi03k
bf9aa2e131
Extracted resizing of window's width to separate method
2016-03-03 11:46:56 +01:00
Aesylwinn
9d985d883b
added grid icon
2016-03-02 20:45:04 -05:00
Aesylwinn
fa1bd72bc0
fix usage of deprecated function
2016-03-02 15:48:05 -05:00
Aesylwinn
7fb6807e65
cell border markers
2016-03-02 15:02:06 -05:00
Marc Zinnschlag
a19ac72215
render marker
2016-03-01 15:48:34 +01:00
Marc Zinnschlag
6f619ea85f
Merge branch 'master' into move
...
Conflicts:
apps/opencs/view/render/object.cpp
2016-03-01 12:17:53 +01:00
Rob Cutmore
d60786b5da
Do not show cell markers for interior cells
2016-02-26 07:42:05 -05:00
Marc Zinnschlag
01497ac8db
Merge remote-tracking branch 'origin/master'
2016-02-24 13:37:34 +01:00
Marc Zinnschlag
9f14247562
Merge remote-tracking branch 'aesylwinn/topic-info-editor-improvements'
2016-02-24 13:37:16 +01:00
Aesylwinn
f4ed389496
InfoCondition autocompletion
2016-02-22 15:48:25 -05:00
scrawl
a6621626aa
Don't use multiple parent node paths in CSVRender::Object
2016-02-22 15:22:37 +01:00
scrawl
1c24cba46a
Don't use multiple parental node paths.
2016-02-22 15:13:31 +01:00
Marc Zinnschlag
22e717161a
split object base node into two node (one for position, one for everything else)
2016-02-21 15:19:31 +01:00
Marc Zinnschlag
dececf6c38
instance moving via drag in 3D scenes
2016-02-16 16:02:29 +01:00
scrawl
647a5e091f
Add osgQt to the repository
...
Ensures that it will be built against the correct Qt version.
2016-02-15 15:16:48 +01:00
Marc Zinnschlag
dad38d901c
Merge remote-tracking branch 'rcutmore/feature-3043'
2016-02-14 17:38:20 +01:00
Rob Cutmore
25744aaadd
Update cell marker appearance
...
- Added bounding box around marker text. Box is black when cell exists
otherwise it is red.
- Changed format of marker text.
- Changed marker text's pivot point to be at center of text.
2016-02-14 10:28:41 -05:00
Rob Cutmore
61b6806a62
Allow toggling of cell markers
2016-02-09 20:23:00 -05:00
scrawl
e28dc3e72f
Preload instances in SceneManager
2016-02-09 18:35:26 +01:00