Commit Graph

3698 Commits

Author SHA1 Message Date
Jonathas Costa
e355d1ceba Merged develop into NewAtmosphere. 2016-10-07 11:39:07 -04:00
Jonathas Costa
2c3804ccac Added required header to allow compilation under MacOSX. 2016-10-06 14:47:25 -04:00
Emil Axelsson
0a47931b4b Rename shader files to lower case 2016-10-04 12:09:36 +02:00
Emil Axelsson
74dd1873f0 Clean up toy volume module 2016-10-04 12:04:06 +02:00
Emil Axelsson
3f3083b419 update toyvolume to new volume raycasting interface 2016-10-04 09:48:31 +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
Emil Axelsson
7698f97660 update ghoul 2016-09-29 20:56:08 +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
Emil Axelsson
7d1e3f2d32 improve look and feel of factory docs 2016-09-27 17:38:52 +02:00
Emil Axelsson
123b8600e0 clean up handlebars templates 2016-09-27 17:01:29 +02:00
Emil Axelsson
b308890027 improve look and feel for lua scripting docs 2016-09-27 16:52:27 +02:00
Emil Axelsson
8fd6b66d23 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into develop 2016-09-27 14:45:57 +02:00
Emil Axelsson
15e83394c3 improve look and feel of the html documentation 2016-09-27 14:45:26 +02:00
Alexander Bock
f5f70eb9db Adding Spice file for pluto to the pluto scene 2016-09-27 11:11:04 +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
6d9b12878b Update Ghoul 2016-09-26 13:50:19 +02:00
Alexander Bock
a0da1514c9 Making Galaxy, iSWA, and multiresvolume modules compile again 2016-09-26 13:50:08 +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
568ebd51ff Update SGCT, make use of new googletest submodule in Ghoul releases/v0.5.0 2016-09-25 19:50:59 +02:00
Alexander Bock
603e671a34 Fix GDAL unit test and make it independent from the scene directory 2016-09-25 14:44:36 +02:00
Alexander Bock
0d95da0959 Sort offenses and warnings in the Documentation/Specification testing 2016-09-25 14:44:08 +02:00
Alexander Bock
488fc9f994 Merge branch 'feature/missions' into develop 2016-09-25 14:26:09 +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
ad93f5a4ad Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace into develop 2016-09-24 08:31:37 +02:00
Alexander Bock
6cd33e23f5 Add a version of OsirisRex without globebrowsing 2016-09-24 08:30:58 +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
Alexander Bock
d8ca2965eb Update the OpenSpace version for Kulturnatten 2016-09-22 10:28:24 +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