Commit Graph

5843 Commits

Author SHA1 Message Date
Matthew Territo d7dddf5352 Merge commit '8ddc794cda8cc91c6c7cce5119aaaf0a2530f5c8' into feature/websocketnavigation
* commit '8ddc794cda8cc91c6c7cce5119aaaf0a2530f5c8':
  Feature/alex is flying (#729)
  Update ghoul repository
  Reenable the atmosphere on master
  Remove Clang warnings
  Feature/cmake cleanup (#727)
  Fix TaskRunner related issues

# Conflicts:
#	src/CMakeLists.txt
2018-10-08 16:44:47 -06:00
Alexander Bock 8ddc794cda Feature/alex is flying (#729)
* Correctly specify maximum text sizes for grids
 * Use StaticScale transformations in grids and remove fixed radius
 * Fix Verifier to let grids accept non-integer min and max sizes
 * Add a new scale that changes it's value based on the current time and a reference time
 * Add a proper radiosphere that grows in real time (closes #728)
 * Add default globe customization folders to the assets (closes #724)
 * Add new dashboarditem that shows the current camera velocity (closes #702)
 * Add ability to add interesting times to a scene (closes #715)
 * Reenable keybindings gui element
 * Add ShortcutManager
 * Add ability to bind keyless keybinds to use as arbitrary shortcuts (closes #710)
2018-10-08 03:00:35 -04:00
Alexander Bock 53eebb05ba Update ghoul repository 2018-10-08 00:43:49 -06:00
Alexander Bock 14ba7373b9 Reenable the atmosphere on master 2018-10-04 18:41:55 -04:00
Alexander Bock 4ed9fec9f9 Remove Clang warnings 2018-09-25 12:23:55 -04:00
Alexander Bock 0ca84d91f1 Feature/cmake cleanup (#727)
* Sweeping CMake cleanup
* Cleaning up message log in CMake
2018-09-21 14:25:51 -04:00
Emil Axelsson a91eeb11f0 Fix TaskRunner related issues 2018-09-18 23:02:49 +02:00
Matthew Territo c929589d89 Merge commit 'c03ddf76cc63c4922a49ae67c60b0a356c904960' into feature/websocketnavigation
* commit 'c03ddf76cc63c4922a49ae67c60b0a356c904960':
  Remove external control callback
  Fix for taking screenshots Update Ghoul version
  Add spherical mirror configuration file with GUI window
2018-09-17 18:58:18 -06:00
Alexander Bock c03ddf76cc Remove external control callback 2018-09-17 15:13:54 -04:00
Alexander Bock 9ac41c6586 Fix for taking screenshots
Update Ghoul version
2018-09-17 14:57:40 -04:00
Matthew Territo ff3e99cd0d Presync on deltaTime instead of averageDeltaTime. 2018-09-14 18:28:20 -06:00
Matthew Territo f185b2cee7 Add lua script payload to flight controller. Access websocket sensitivity in orbitalnavigator 2018-09-14 15:54:57 -06:00
Matthew Territo 6e92be0fd6 Fix to navigation: don't reset the input between WebsocketInput packets. Keeps OpenSpace in sync with the FlightController regardless of framerate 2018-09-11 18:05:13 -06:00
Alexander Bock d7cb847dda Add spherical mirror configuration file with GUI window 2018-09-09 11:31:22 -04:00
Matthew Territo 4f0cffdc44 Merge remote-tracking branch 'origin/master' into feature/websocketnavigation
# Conflicts:
#	src/interaction/orbitalnavigator.cpp
2018-09-06 19:15:59 -06:00
Matthew Territo b892642868 Merge commit '9f1c4e847d7c37e75f0e73d051c8f7c758f20147' into feature/websocketnavigation
* Update & cleanup WebsocketInputStates to be part of globals
* Update fmt library calls to handle non-standard objects (json, enum, etc.)

# Conflicts:
#	include/openspace/interaction/inputstate.h
#	src/interaction/inputstate.cpp
2018-09-06 18:54:40 -06:00
Alexander Bock 583c5b1866 MacOS fixes
Update Milkyway textures to use png instead of pbm
Update Exoplanets to use png instead of pbm
2018-09-05 16:08:11 -04:00
Emil Axelsson 43e115d651 Add shortcut to change focus interpolation time (#707)
Closes #707
2018-09-03 01:50:47 -04:00
Alexander Bock 04846e3adf Disable progress bar on default 2018-09-03 00:58:26 -04:00
Alexander Bock a993c8ef65 Remove quad from screenspacerenderable (working on #525) 2018-09-03 00:58:08 -04:00
Alexander Bock 40196262fb Use rendering helper in Luaconsole and Loading screen (working on #525) 2018-09-03 00:35:42 -04:00
Alexander Bock b3abcbdf4f Add support for disabling support for modules (closes # 650)
Disable SPOUT module on non-Windows machines
2018-09-02 14:45:25 -04:00
Alexander Bock ff1cd82f64 Add additional trace information for downloads 2018-09-02 13:33:49 -04:00
Alexander Bock f429959bba Register path tokens before the sgct configuration is loaded 2018-09-02 12:08:50 -04:00
Alexander Bock 24ef67afa0 Add helper methods to quickly render boxes (finalizing and #closes 696) 2018-09-02 02:18:40 -04:00
Alexander Bock 9f57d80541 Check_style fixes 2018-09-01 21:57:36 -04:00
Alexander Bock 35855de9f5 Remove warnings 2018-09-01 21:48:53 -04:00
Emil Axelsson 518b43db02 Fix compiler warnings 2018-08-31 14:30:35 +02:00
Alexander Bock 9f1c4e847d Feature/globals (#690)
* Move global objects out of OpenSpaceEngine
 * General cleanup of main.cpp
 * Add default_joystick asset to all scenes
 * No longer suppress mouse interaction on slave nodes
 * Window delegate uses function pointers rather than subclassing
 * Fix for false overwriting of ImGUI configuration file
 * Change default color and tilt angle of fisheye rendering
 * Restructured performance manager
 * Simplify screenshot handling
2018-08-30 11:38:47 -04:00
Matthew Territo 4c893e18fa Only disengageAutopilot if done 2018-08-29 22:00:16 -06:00
Matthew Territo 963b8d4880 Add friction toggle 2018-08-29 19:21:26 -06:00
Alexander Bock c287c03fe8 Update Ghoul
Adapt to glbindings changes
2018-08-29 17:32:53 -04:00
Matthew Territo b6a87b52f3 Merge branch 'feature/websocketnavigation' of https://github.com/OpenSpace/OpenSpace into feature/websocketnavigation
* 'feature/websocketnavigation' of https://github.com/OpenSpace/OpenSpace:
2018-08-29 14:09:47 -06:00
Alexander Bock 14cdaf49bd Update Ghoul (+1 squashed commit)
Squashed commits:
[00e1fe0] Fix scene graph node creation for local patch (closes #701)
2018-08-29 14:08:46 -06:00
Alexander Bock aa85c2afb2 Update Ghoul 2018-08-29 15:23:08 -04:00
Alexander Bock 00e1fe01bd Fix scene graph node creation for local patch (closes #701) 2018-08-29 14:34:41 -04:00
Matthew Territo 3a65b0820d Merge branch 'feature/websocketnavigation' of https://github.com/OpenSpace/OpenSpace into feature/websocketnavigation
* 'feature/websocketnavigation' of https://github.com/OpenSpace/OpenSpace:
2018-08-29 11:36:33 -06:00
Matthew Territo 16fedc73de Merge commit '64524e8f44763b4601895e0bb896f628f877782b' into feature/websocketnavigation
* commit '64524e8f44763b4601895e0bb896f628f877782b':
  Renamed "RenderOptionInfo" to "RenderOption" (closes #692)
  Add Lua functions to print cluster id (closes #704)
  Show current and total file size for each download (closes #705)
  Fix subscription bug introduced in code cleanup
  Update Ghoul and sgct repository
  Add strange units to the distance conversion (closes #703)
  Render text informing of ongoing shutdown (#696)
  Fix bug preventing specification of easing function for property setting (closes #695)
  Make it possible to not load an asset on default and later load it at runtime (closes #694)
  Remove extra opacity value from renderablebillboardscloud and make text labels listen to the opacity (closes #693)

Conflicts:
	ext/ghoul
2018-08-29 11:32:41 -06:00
Matthew Territo 2a88d75b08 Merge commit '64524e8f44763b4601895e0bb896f628f877782b' into feature/websocketnavigation
* commit '64524e8f44763b4601895e0bb896f628f877782b':
  Renamed "RenderOptionInfo" to "RenderOption" (closes #692)
  Add Lua functions to print cluster id (closes #704)
  Show current and total file size for each download (closes #705)
  Fix subscription bug introduced in code cleanup
  Update Ghoul and sgct repository
  Add strange units to the distance conversion (closes #703)
  Render text informing of ongoing shutdown (#696)
  Fix bug preventing specification of easing function for property setting (closes #695)
  Make it possible to not load an asset on default and later load it at runtime (closes #694)
  Remove extra opacity value from renderablebillboardscloud and make text labels listen to the opacity (closes #693)

Conflicts:
	ext/ghoul
2018-08-29 11:29:36 -06:00
Matthew Territo 0c444f09c1 Disengaged Autopilot on disconnect 2018-08-29 11:11:11 -06:00
Alexander Bock 64524e8f44 Renamed "RenderOptionInfo" to "RenderOption" (closes #692) 2018-08-29 12:20:14 -04:00
Alexander Bock 1f7b482efa Add Lua functions to print cluster id (closes #704) 2018-08-28 13:58:32 -04:00
Alexander Bock 8acddf74a9 Show current and total file size for each download (closes #705) 2018-08-28 13:45:42 -04:00
Emil Axelsson 54d243e86f Merge branch 'master' of github.com:OpenSpace/OpenSpace 2018-08-28 13:43:32 +02:00
Emil Axelsson c014d8b84d Fix subscription bug introduced in code cleanup 2018-08-28 13:42:31 +02:00
Matthew Territo 179a6d16ae Autopilot by disabling friction 2018-08-25 12:00:52 -06:00
Matthew Territo e43b813670 Initialializing for AutoPilot 2018-08-24 18:00:05 -06:00
Matthew Territo ef91e7328f Update Ghoul for mutex test 2018-08-24 15:18:26 -06:00
Alexander Bock 46c26b9b00 Update Ghoul and sgct repository 2018-08-24 13:37:54 -04:00
Alexander Bock 5c9e65c7f2 Add strange units to the distance conversion (closes #703) 2018-08-24 03:37:22 -06:00