Alexander Bock
7bc48f859e
Jenkins compile fix
2016-12-04 14:20:25 +01:00
Alexander Bock
d2fa5c1011
Jenkins compile fix
2016-12-04 14:18:15 +01:00
Alexander Bock
dc3ded891b
Started with code cleanup of Globebrowsing
2016-12-04 10:34:25 +01:00
kalbl
0df09d23ad
Add possibility to switch geographic position
2016-11-29 13:29:02 +01:00
kalbl
d914261bd2
Solve conflict
2016-11-08 00:08:28 +01:00
Alexander Bock
85f298a659
Add documentation to openspace.bindKeys script
2016-11-05 16:23:05 +01:00
kalbl
156c6bab41
Merge branch 'develop' into feature/globebrowsing
2016-10-29 14:12:39 +02:00
Emil Axelsson
73e6fcf865
Sort documentation sections, fix json parse error for keybindings and add detailed documentation to html output
2016-10-27 17:09:56 +02:00
kalbl
6ca7cc997c
Merge branch 'feature/retina' into feature/globebrowsing
2016-10-20 21:04:18 +02:00
kalbl
2f32e67b87
Set interaction to properly depend on delta time.
2016-10-20 18:37:18 +02:00
Alexander Bock
542f92e768
Add a fix to the window resolution for Retina displays
...
Add a new setting to the ConfigurationManager that can specify whether to scale the onscreen text by window size or resolution
2016-10-18 18:52:30 +02:00
kalbl
7f62bd7206
Create namespace globebrowsing.
2016-10-18 15:40:27 +02:00
kalbl
670497c16d
Update file structure in globebrowsing
2016-10-15 13:22:22 +02:00
kalbl
c516dc5b25
Solve conflict in scripts/common.lua
2016-10-11 17:51:57 +02:00
kalbl
6ef366afdd
Add smooth transition when resetting camera direction.
2016-10-05 01:47:49 +02:00
kalbl
423c55ba38
Update structure of properties for renderable globes.
2016-10-02 21:30:26 +02:00
Emil Axelsson
b448b0ec5e
Move all network namespace members into the openspace namespace
2016-09-30 14:13:36 +02:00
Emil Axelsson
4f61479190
Move network status into parallel connection class
2016-09-30 13:36:35 +02:00
Emil Axelsson
14a42b1bd8
Potentially fix compile errors
2016-09-30 13:06:27 +02:00
Emil Axelsson
0230acb005
Merge branch 'feature/parallelconnection' into develop
...
Conflicts:
src/interaction/interactionhandler.cpp
2016-09-30 11:01:37 +02:00
kalbl
831664c032
Update all interaction to be possible without a middle mouse button.
2016-09-29 22:20:35 +02:00
Emil Axelsson
5da86a0f34
improve look and feel of keybinding documentation
2016-09-29 14:35:46 +02:00
kalbl
0ec66e9fc2
Make interaction sensitivity proportional to distance to surface.
2016-09-29 00:34:03 +02:00
Alexander Bock
77db054959
Make fontrenderer, gui, and console depend on the window resolution rather than the framebuffer resolution (closing #140 )
2016-09-26 19:26:41 +02:00
Emil Axelsson
cd325686ad
Merge branch 'develop' of github.com:OpenSpace/OpenSpace into feature/parallelconnection
...
Conflicts:
include/openspace/engine/openspaceengine.h
src/engine/openspaceengine.cpp
src/interaction/interactionhandler.cpp
src/network/parallelconnection.cpp
src/scripting/scriptengine.cpp
2016-09-22 19:33:05 +02:00
kalbl
3028b1f317
Fix problem with inaccurate interaction at high delta time.
2016-09-22 17:44:12 +02:00
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
Alexander Bock
d3f7139f5e
Merge branch 'feature/globebrowsing' into syncing
...
Conflicts:
modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp
openspace.cfg
src/engine/openspaceengine.cpp
src/interaction/interactionhandler.cpp
2016-09-20 14:48:28 +02:00
Emil Axelsson
fa8eee5386
sync camera movement over parallel connection
2016-09-19 14:49:57 +02:00
Emil Axelsson
13610b390d
distinguish between local and remote scripting
2016-09-16 14:53:20 +02:00
Alexander Bock
76f1c7166a
Add HTML output to keybindings
2016-09-16 11:27:59 +02:00
Alexander Bock
7e35cf5823
Make InteractionHandler not crash if the Camera focus node is not found
2016-09-15 18:02:13 +02:00
Alexander Bock
1da148c8be
Fix Interactionhandler output file
2016-09-15 13:27:44 +02:00
Alexander Bock
bb52c33b04
Ability for LuaDocumentationFile, PropertyDocumentationFile, and KeyboardMapping to write HTML output
...
Adding those html files to the gitignore
2016-09-14 13:34:45 +02:00
Gene Payne
002d1e5a71
Made changes to accomodate Mac clang compiler
2016-09-13 12:52:41 -06:00
Emil Axelsson
41fafcb5df
begin refactor parallel connection
2016-09-08 18:04:06 +02:00
Alexander Bock
965f3eded0
Clang compile fixes
2016-09-08 13:22:34 +02:00
Erik Broberg
c20cd80eaa
Merge globebrowsing, resolve conflicts
...
Reduce SizeReference font size - TextureAtlas threw InvalidRegionException
Use Mars and Earth Barycenter and not center of mass
Use name Mars instead of LodMars, same for Earth
Move init of font manager to be done prior to scene init
Debug log what modules are added
Debug log when creating SceneGraphNode from dictionary
2016-09-07 17:37:27 -04:00
Erik Broberg
047e754369
Remove serialize() and deserialize() from InteractionHandler and InteractionMode
2016-09-06 13:53:31 -04:00
Erik Broberg
c837edae5b
Testing new syncing scheme
2016-09-04 03:44:50 -04:00
Erik Broberg
649d8d2f67
Remove shared and synced versions of data members in MouseStates
2016-09-03 22:54:02 -04:00
Erik Broberg
2116f5c987
Rename preSync and postSync in InteractionHandler to more descriptive names
2016-09-03 22:14:10 -04:00
Erik Broberg
3a887fef02
Remove non-descriptive preSync and postSync methods from Camera class
2016-09-03 21:02:30 -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
dfa0709b11
More work into removing gdal dependency to libOpenspace
2016-08-29 02:12:33 +02:00
Alexander Bock
6d20c8301f
Remove Globebrowsing restrictions from InteractionHandler header file
2016-08-29 01:07:27 +02:00
Alexander Bock
be67131c33
Remove Globebrowsing restrictions from InteractionHandler header file
2016-08-29 00:56:28 +02:00
Erik Broberg
23c4a05a96
Merge from globebrowsing
2016-08-17 20:25:58 -04:00
Kalle Bladin
c01808ce10
Convert tabs to spaces.
2016-08-17 00:30:53 -04:00
Kalle Bladin
b0d8dd59f4
Update function focusPosition in Camera and add a solar path for OSIRIS REx.
2016-08-12 16:13:24 -04:00
