Commit Graph

23 Commits

Author SHA1 Message Date
Alexander Bock 04c6398d6a Fix case dependent kernels in OsirisRex
Fix stitched trail rendering for RenderableTrailTrajectory
Adapt Lua scheduler helper scripts to new Dictionary layout
Make Spice throw exceptions on default again
Enable caching on default for CTX and MOLA data
Add NOAA rt data (commented out in LodEarth)
2016-12-06 18:47:46 +01:00
kalbl a617261bde Solve conflict 2016-11-23 13:34:38 +01:00
Alexander Bock f711e192fb Replace explicit Lua commands to toggle onscreen gui with a global property 2016-11-22 09:49:22 +01:00
kalbl d914261bd2 Solve conflict 2016-11-08 00:08:28 +01:00
Alexander Bock 286eb89048 Add more documentation to the bindKey functions of NewHorizons and OsirisRex 2016-11-07 00:21:55 +01:00
Alexander Bock 572257d3b0 Move the rendertime into a property and remove the toggleFrametimeType
Make OptionProperty work in Radio mode
Rename DROPDOWN and RADIO to Dropdown and Radio
2016-11-06 22:15:52 +01:00
Alexander Bock c469be26c3 Make toggling the performance measurements a BoolProperty of RenderEngine 2016-11-06 02:00:42 +01:00
Alexander Bock 85f298a659 Add documentation to openspace.bindKeys script 2016-11-05 16:23:05 +01:00
kalbl c516dc5b25 Solve conflict in scripts/common.lua 2016-10-11 17:51:57 +02:00
kalbl 19842ac05d Update key bindongs for friction. 2016-09-28 23:05:50 +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 13610b390d distinguish between local and remote scripting 2016-09-16 14:53:20 +02:00
Erik Broberg af5c0c71e8 More explicit scheduled script helpers and set osiris rex trails enabled values at launch 2016-08-30 15:37:33 -04:00
Erik Broberg 69681ea36e Move helper lua functions for script scheduling to scripts/common.lua 2016-08-30 14:03:19 -04:00
Matthew Territo 08c9862c32 Merge branch 'develop' into feature/globebrowsing 2016-08-11 21:59:38 -06:00
Matthew Territo cc0dfdf5d1 Add simple ability to cycle through FPS (instead of Frametime) with t / Shift+t 2016-08-11 20:56:18 -06:00
Erik Broberg 244c18fdc7 Solve merge conflicts: develop --> globebrowsing 2016-08-02 18:50:10 -04:00
Matthew Territo 9a435ac74d Extended temporary fade functionality
Fade in on initialization, toggleFade Lua binding to "w", prevent trying to fade out/in if already at min/max
2016-07-27 19:25:49 -06:00
Kalle Bladin 541fbba322 Merge with develop and solve conflicts. 2016-07-18 17:26:30 -04:00
Alexander Bock 6d8a16f19e Rendering ImGui, ScreenLog, and Information as a post-processing step to make it work in fisheye rendering (closing #119)
Disable SGCT ESC terminate handling and implement a method that optionally waits before closing the application (closing #120)
 - ESC key is now bound to a call to "openspace.toggleShutdown()" that will initiate a shutdown in 3 seconds unless ESC is pressed again
 - The countdown timer is set in the openspace.cfg
2016-07-17 02:33:45 +02:00
Kalle 718a5d69e6 Change lua common script to toggle three types of interaction friction. 2016-07-13 12:01:50 -04:00
Alexander Bock 5a5ffd76bb Add InteractionHandler to global property gui
Add property to interactionhandler to enable/disable rotational and zoom friction
2016-06-29 22:42:12 +02:00
Alexander Bock 52c5d3a406 Add common Lua functions for scene definitions
Adapt New Horizons scene to use new common.lua file
2016-05-30 13:25:31 +02:00