 Alexander Bock
|
329986c0c6
|
Merge branch 'develop' into feature/globebrowsing
Conflicts:
modules/base/scale/staticscale.cpp
modules/base/scale/staticscale.h
modules/globebrowsing/meshes/trianglesoup.h
modules/globebrowsing/tile/tiledataset.cpp
modules/newhorizons/shaders/renderableModelProjection_fs.glsl
src/interaction/interactionhandler.cpp
src/rendering/renderengine.cpp
src/scene/scenegraphnode.cpp
|
2016-09-20 15:52:01 +02:00 |
|
|
Erik Broberg
|
047e754369
|
Remove serialize() and deserialize() from InteractionHandler and InteractionMode
|
2016-09-06 13:53:31 -04:00 |
|
|
Alexander Bock
|
e3d5a9ca38
|
Cleaned up Doxygen
Removed Doxygen warnings
Documented Property specializations (closing #10)
|
2016-09-05 17:01:32 +02:00 |
|
|
Erik Broberg
|
649d8d2f67
|
Remove shared and synced versions of data members in MouseStates
|
2016-09-03 22:54:02 -04:00 |
|
|
Alexander Bock
|
193e2bdc64
|
Fix linking error when OpenSpace is compiled without the globebrowsing module
|
2016-08-29 10:45:59 +02:00 |
|
|
Alexander Bock
|
be67131c33
|
Remove Globebrowsing restrictions from InteractionHandler header file
|
2016-08-29 00:56:28 +02:00 |
|
|
Kalle Bladin
|
d91dd3dbb7
|
Implement ability to update camera in two steps. still using old method.
|
2016-08-04 19:16:36 -04:00 |
|
|
Kalle
|
3c7d1e22fc
|
Globe browsing interaction mode follows the rotation of the globe.
|
2016-07-01 12:46:16 -04:00 |
|
|
kbladin
|
a89f474502
|
Solve merge conflict and add properties for friction and interaction parameters.
|
2016-06-30 14:07:51 -04:00 |
|
|
Kalle Bladin
|
161d722623
|
Enable setting of friction, sensitivity and followscalefactor in interaction handler.
|
2016-06-29 21:13:04 -04:00 |
|
|
Kalle Bladin
|
e5ccf185cd
|
Remove rotation state variables from interaction mode and enable more freely local rotation.
|
2016-06-28 22:28:56 -04:00 |
|
|
Erik Broberg
|
745c51c4e4
|
Add unimplemented initialize to InteractionModes
|
2016-06-22 18:22:46 -04:00 |
|
|
Erik Broberg
|
60da53c00e
|
Divide InteractionHandler and Interaction modes into different files
|
2016-06-22 14:42:24 -04:00 |
|