Commit Graph

1722 Commits

Author SHA1 Message Date
Erik Broberg
b258c9fc54 Only list scene file name when selecting scene from GUI 2016-10-17 19:18:34 +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
Emil Axelsson
e21b69cab8 Remove sgct dependency from renderengine 2016-10-10 17:46:26 +02:00
Emil Axelsson
5e2ea10bcd Add http proxy support for GDAL 2016-10-07 20:42:32 +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
9506f053fd Add missing include 2016-09-30 11:58:33 +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
6b64400cdf add javascript and css to html log 2016-09-29 20:45:40 +02:00
Emil Axelsson
5da86a0f34 improve look and feel of keybinding documentation 2016-09-29 14:35:46 +02:00
Emil Axelsson
ea1ca95df9 improve look and feel of scenegraph node property documentation 2016-09-29 13:58:18 +02:00
kalbl
0ec66e9fc2 Make interaction sensitivity proportional to distance to surface. 2016-09-29 00:34:03 +02:00
Emil Axelsson
7d1e3f2d32 improve look and feel of factory docs 2016-09-27 17:38:52 +02:00
Emil Axelsson
b308890027 improve look and feel for lua scripting docs 2016-09-27 16:52:27 +02:00
Emil Axelsson
15e83394c3 improve look and feel of the html documentation 2016-09-27 14:45:26 +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
Alexander Bock
f7378f9a6f Update the text and json documentation of DocumentationEngine 2016-09-26 18:59:50 +02:00
Alexander Bock
26f4975b17 Clear up MissionManager
Consolidate core class registrations
2016-09-26 18:46:20 +02:00
Alexander Bock
9892e0c37d Continuing mission cleanup 2016-09-26 15:33:46 +02:00
Alexander Bock
7ddccd8172 Rename Ephemeris files to Translation 2016-09-26 13:49:17 +02:00
Alexander Bock
a688a1eee9 Rename Ephemeris to Translation 2016-09-26 13:34:22 +02:00
Alexander Bock
0d95da0959 Sort offenses and warnings in the Documentation/Specification testing 2016-09-25 14:44:08 +02:00
Alexander Bock
cc9a72a60b Clean up and add documentation to Mission
Clean up and add documentation to MissionManager
Clean up and add documentation to TimeRange

Prevent a crash in DocumentationEngine when ReferencingVerifier could not be found
2016-09-25 14:25:01 +02:00
Alexander Bock
3d894c38e3 Some work on cleaning up Missions 2016-09-24 20:28:03 +02:00
Alexander Bock
49308c658c Moved Missions from NewHorizons module into core 2016-09-24 19:32:42 +02:00
Alexander Bock
616a115536 Adding a Lua function to manually enable/disable the frame synchronization 2016-09-24 14:55:20 +02:00
Alexander Bock
8cf39cdd29 Only enable syncing after the first frame due to high initialization load 2016-09-24 09:07:15 +02:00
Alexander Bock
e1b2877525 Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace into develop 2016-09-23 23:25:17 +02:00
Alexander Bock
3dce9f0f21 Add DeprecationVerifier to the list of available verifiers
Add unit tests for DeprecationVerifier
2016-09-23 23:24:03 +02:00
Emil Axelsson
0812230554 remove incorrect comment 2016-09-23 00:33:30 +02:00
Emil Axelsson
e8f9d4b37b clean up time sync 2016-09-23 00:31:47 +02:00
Emil Axelsson
8efdddde39 avoid oversampling in time sync 2016-09-23 00:27:06 +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
Emil Axelsson
112fe7fc54 synchronize time over parallel connection 2016-09-22 18:42:19 +02:00
Alexander Bock
fa136ecb99 Merge branch 'feature/synchronization' into develop 2016-09-22 17:58:05 +02:00
kalbl
3028b1f317 Fix problem with inaccurate interaction at high delta time. 2016-09-22 17:44:12 +02:00
Alexander Bock
6938b59f00 Add application of blending and warping to the takeScreenshot function 2016-09-22 10:28:10 +02:00
Alexander Bock
8048a436d1 Include correct header in SyncEngine 2016-09-22 08:07:26 +02:00
Alexander Bock
6271c7d9f6 Fix a GCC compile error in SyncEngine 2016-09-22 08:05:31 +02:00
Alexander Bock
2ed8042667 Add methods to disable synchronization during scene loading as the application will get killed by the sync timeout otherwise 2016-09-21 22:29:52 +02:00
Alexander Bock
a85356dcff Add a commandline argument to override the cache directory 2016-09-21 22:10:59 +02:00
Alexander Bock
a45621948d Making PerformanceMeasurement not crash when memory is deallocated 2016-09-21 09:07:22 +02:00
Alexander Bock
428f488bb6 Add documentation to Ephemeris classes
Remove unused "Reference" specification from mod files
Add osirisrex files to gitgnore
Make Ephemeris values into properties
2016-09-20 19:24:14 +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