Marc Zinnschlag
|
f28fa9fc16
|
clear instance selection on select click on nothing/something that isn't an instance
|
2015-09-29 13:53:47 +02:00 |
|
Marc Zinnschlag
|
319e3f24a3
|
on edit mode change clear selection of elements that are not affected by current edit mode (only support for instance for now since we do not have selection for other elements yet)
|
2015-09-29 13:48:04 +02:00 |
|
Marc Zinnschlag
|
981a8a2cc2
|
delegated editing and selection functions to mode objects
|
2015-09-27 16:18:22 +02:00 |
|
Marc Zinnschlag
|
9bf27c7e37
|
moved edit mode handling from SceneSubView to WorldspaceWidget
|
2015-09-27 14:38:12 +02:00 |
|
Marc Zinnschlag
|
5d9863aec1
|
removed a redundant check
|
2015-09-27 11:34:14 +02:00 |
|
Marc Zinnschlag
|
7bbc475bda
|
apply button mapping
|
2015-09-26 18:01:49 +02:00 |
|
Marc Zinnschlag
|
501ae6372d
|
factored out mouse picking into a separate function
|
2015-09-26 17:51:41 +02:00 |
|
Marc Zinnschlag
|
3844c94975
|
bit masking fix
|
2015-09-26 17:39:55 +02:00 |
|
Marc Zinnschlag
|
72bb33c2c4
|
filter mouse interaction by interaction mask
|
2015-09-26 12:24:41 +02:00 |
|
Marc Zinnschlag
|
71247a0186
|
inserted TagBase between ObjectTag and osg::Referenced
|
2015-09-26 12:18:18 +02:00 |
|
Marc Zinnschlag
|
748b13b45b
|
renamed ObjectHolder into ObjectTag
|
2015-09-26 12:05:44 +02:00 |
|
Marc Zinnschlag
|
d46eeb04cd
|
removed a left-over debugging statement
|
2015-09-25 14:16:41 +02:00 |
|
Marc Zinnschlag
|
5c34a02058
|
store mouse bindings in WorldspaceWidget
|
2015-09-25 13:11:40 +02:00 |
|
Marc Zinnschlag
|
d597bef2cd
|
refined selection related user settings
|
2015-09-25 10:58:20 +02:00 |
|
Marc Zinnschlag
|
62047b1868
|
Merge remote-tracking branch 'origin/master' into sceneinput
|
2015-09-24 16:07:39 +02:00 |
|
Marc Zinnschlag
|
3ada08af90
|
store lock state and pass it on to edit mode
|
2015-09-24 16:07:17 +02:00 |
|
Marc Zinnschlag
|
b2cb5f0374
|
pass on user settings updates to potentially interested parties within a scene subview
|
2015-09-24 15:51:16 +02:00 |
|
scrawl
|
12b8fcf0bf
|
OpenCS: Fix camera position retrieval in WorldspaceWidget
|
2015-09-23 23:37:09 +02:00 |
|
Marc Zinnschlag
|
7bef97bf33
|
fixed local variable caching issue in automatic error checking (Fixes #2927)
|
2015-09-22 15:36:00 +02:00 |
|
Marc Zinnschlag
|
8a37d3ad8c
|
Merge remote-tracking branch 'scrawl/sky'
|
2015-09-22 08:33:33 +02:00 |
|
scrawl
|
385f4f729c
|
Implement SunDiscSunsetColor, fade the sun during sunrise & sunset
|
2015-09-21 19:43:48 +02:00 |
|
scrawl
|
f7e5a40143
|
Fix typo
|
2015-09-21 17:58:57 +02:00 |
|
scrawl
|
1a1f1fae87
|
Minor cleanup
|
2015-09-21 17:50:36 +02:00 |
|
scrawl
|
d812434fee
|
Add a subtle fading effect to the sun flash texture
|
2015-09-21 17:48:24 +02:00 |
|
scrawl
|
854fd9fe05
|
Remove dead code
|
2015-09-21 17:20:09 +02:00 |
|
scrawl
|
9bb6c3f288
|
Improve accuracy of sun occlusion query (use circular shape)
|
2015-09-21 17:20:09 +02:00 |
|
scrawl
|
96b31d3bba
|
Scale the sun flash texture depending on occlusion query
|
2015-09-21 17:20:08 +02:00 |
|
scrawl
|
a2a4532e71
|
Add the full-screen sun glare effect
|
2015-09-21 17:20:08 +02:00 |
|
scrawl
|
ac5d0bf405
|
Render the sun flash (not adjusted based on occlusion yet)
|
2015-09-21 17:20:08 +02:00 |
|
scrawl
|
89d9323c2b
|
Document RenderBin numbers in a common header to keep them organised
|
2015-09-21 17:20:08 +02:00 |
|
scrawl
|
d191a52847
|
Create occlusion query nodes for the sun flash
|
2015-09-21 17:20:08 +02:00 |
|
scrawl
|
6bafa564d4
|
Move sun texture setting out of the Updater class so we can reuse the Updater for fading the flash texture
|
2015-09-21 17:19:53 +02:00 |
|
Marc Zinnschlag
|
39b7340580
|
added mouse button settings for 3D scene (not in use yet)
|
2015-09-21 15:32:18 +02:00 |
|
Marc Zinnschlag
|
41191ea367
|
Merge remote-tracking branch 'dteviot/FixStuckDraft'
|
2015-09-20 09:50:18 +02:00 |
|
scrawl
|
8de3ce90a7
|
Add comments for weather IDs
|
2015-09-19 18:04:24 +02:00 |
|
Marc Zinnschlag
|
1566f3568d
|
Merge remote-tracking branch 'origin/master'
|
2015-09-19 11:27:35 +02:00 |
|
dteviot
|
60d0ad9283
|
When stuck, try moving backwards as well as to side.
|
2015-09-19 16:14:00 +12:00 |
|
dteviot
|
5369d20682
|
Moved pathfinding logic from AiCombat to Pathfinding.
|
2015-09-19 15:34:02 +12:00 |
|
scrawl
|
a37dee09e2
|
Fix invisibility effect disappearing after a view mode switch
|
2015-09-18 21:30:02 +02:00 |
|
scrawl
|
18d0cae801
|
OpenCS: Select objects with the right mouse button
|
2015-09-18 18:31:43 +02:00 |
|
scrawl
|
41ea76fd83
|
OpenCS: Add selection outline effect to CSVRender::Object
|
2015-09-18 18:31:05 +02:00 |
|
scrawl
|
dac3b33efb
|
OpenCS: Pass events from the QGLWidget to the RenderWidget
|
2015-09-18 18:30:48 +02:00 |
|
scrawl
|
169fc6a61b
|
OpenCS: Remove margin around the render window
|
2015-09-18 18:29:22 +02:00 |
|
Marc Zinnschlag
|
b58a63e14e
|
Merge remote-tracking branch 'scrawl/deathanim'
|
2015-09-17 14:54:29 +02:00 |
|
Marc Zinnschlag
|
1aa926c7e0
|
restored T-shortcut (focus toolbar) in scene widget
|
2015-09-17 12:41:56 +02:00 |
|
Marc Zinnschlag
|
659b87b25f
|
more cleanup
|
2015-09-17 11:31:25 +02:00 |
|
Marc Zinnschlag
|
b3b4fb3efb
|
removed some left-over signal slot stuff that shouldn't have been there in the first place
|
2015-09-17 11:27:55 +02:00 |
|
Marc Zinnschlag
|
56163dcb2a
|
updated credits file
|
2015-09-17 09:39:42 +02:00 |
|
Marc Zinnschlag
|
96880b4dfe
|
Merge remote-tracking branch 'scrawl/tabs'
|
2015-09-17 09:30:31 +02:00 |
|
Marc Zinnschlag
|
c35ce88ee7
|
Merge remote-tracking branch 'scrawl/aiming'
|
2015-09-17 09:25:33 +02:00 |
|