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
a617261bde
Solve conflict
2016-11-23 13:34:38 +01:00
f711e192fb
Replace explicit Lua commands to toggle onscreen gui with a global property
2016-11-22 09:49:22 +01:00
d914261bd2
Solve conflict
2016-11-08 00:08:28 +01:00
af7e43c66a
Rename bind_keys.lua script file to bind_common_keys.lua
...
Move SPICE kernel declaration from osirisrex.scene into the osirisrex mod file
2016-11-07 11:06:52 +01:00
4caa3d25ba
Add documentation to the rosetta scene keyboard bindings
2016-11-07 10:34:19 +01:00
286eb89048
Add more documentation to the bindKey functions of NewHorizons and OsirisRex
2016-11-07 00:21:55 +01:00
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
c469be26c3
Make toggling the performance measurements a BoolProperty of RenderEngine
2016-11-06 02:00:42 +01:00
85f298a659
Add documentation to openspace.bindKeys script
2016-11-05 16:23:05 +01:00
c516dc5b25
Solve conflict in scripts/common.lua
2016-10-11 17:51:57 +02:00
0230acb005
Merge branch 'feature/parallelconnection' into develop
...
Conflicts:
src/interaction/interactionhandler.cpp
2016-09-30 11:01:37 +02:00
19842ac05d
Update key bindongs for friction.
2016-09-28 23:05:50 +02:00
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
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
13610b390d
distinguish between local and remote scripting
2016-09-16 14:53:20 +02:00
34b1401d99
Some configuration update to 67P and key bindings
2016-09-01 09:34:08 +02:00
af5c0c71e8
More explicit scheduled script helpers and set osiris rex trails enabled values at launch
2016-08-30 15:37:33 -04:00
69681ea36e
Move helper lua functions for script scheduling to scripts/common.lua
2016-08-30 14:03:19 -04:00
06b7c0776e
Press F4 to reload scheduled scripts from file during run time
2016-08-30 12:28:35 -04:00
29d50e85fe
Bind keys to disable outer planets orbits
2016-08-30 11:07:13 +02:00
4c502b1258
Avoid bind common keys twice
2016-08-26 18:13:09 -04:00
8b4e6e855f
Mkae DeltaTimeKeys map to values relating to minutes, hours, days, years, etc
2016-08-26 17:41:44 -04:00
ef94fe3533
Add key bindings file for OsirisRex scene
2016-08-26 17:36:43 -04:00
08c9862c32
Merge branch 'develop' into feature/globebrowsing
2016-08-11 21:59:38 -06:00
cc0dfdf5d1
Add simple ability to cycle through FPS (instead of Frametime) with t / Shift+t
2016-08-11 20:56:18 -06:00
244c18fdc7
Solve merge conflicts: develop --> globebrowsing
2016-08-02 18:50:10 -04:00
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
541fbba322
Merge with develop and solve conflicts.
2016-07-18 17:26:30 -04:00
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
8fcaaf2799
Merge remote-tracking branch 'origin/develop' into feature/globebrowsing
2016-07-13 12:09:02 -04:00
718a5d69e6
Change lua common script to toggle three types of interaction friction.
2016-07-13 12:01:50 -04:00
5502c52b9a
Adapt Rosetta and New Horizons keybindings to restructuring of ProjectionComponent
2016-07-01 15:22:21 +02:00
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
6573a6dfce
add heroku baseurl and key bindings
2016-06-15 11:07:20 -04:00
fde537681f
Some work on fixing 67P projections for all available times
2016-05-30 15:26:47 +02:00
d3ab18ec93
Clean keybindings of Rosetta scene
2016-05-30 13:54:33 +02:00
884324c467
Cleanup of default.scene and keybindings
2016-05-30 13:36:55 +02:00
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
78c0ed902f
Correct displacement factor for planetary heightmap
...
Correctly bind F8 key for clearing rosetta projections
2016-05-30 11:41:14 +02:00
7b525d1b29
Move keybindings for the newhorizons scene into its own file
2016-05-19 17:20:38 +02:00
dba650c80d
Create separate key bindings for rosetta mission
...
Prolong rosetta trail
2016-05-18 21:37:27 +02:00
20532d704f
Rename Lua functions to preInitialization and postInitialization
...
Apply change to all scene files in the repository
Remove default_settings and default_startup as their functoins have moved into the scene file
2016-04-30 14:18:08 +02:00
7b1670ea0b
Remove startup warnings
2016-02-21 01:50:51 +01:00
a6a9537b6c
Merge with antialiased abuffer
2016-02-03 17:47:29 +01:00
d4ff8119d1
refactor abuffer and add msaa support. volumes temporarily disabled.
2016-02-02 11:30:27 +01:00
bae8d0aa76
Making OpenSpaceTest application compile with API change
...
Set default start to July 2015
Move default window out of the corner
Compile fixes
2016-01-14 16:05:29 +01:00
b6fe3a004a
Fixed bind_keys script
2015-07-09 11:36:31 +02:00
284989d48c
Cleanup and refractoring of RenderableFov.cpp
...
- Removed code causing memleaks
- Improved MVIC intersection when no cornerpoints intersect
- General readability and logical fixes (long overdue)
- Fix so arbitrary amount of fov-bound-vectors can be loaded
- Updated keybinds & data etc
2015-07-08 00:14:01 -04:00
e1dcfd4780
Adding / changing a few keybinds
2015-07-06 14:38:04 -04:00
Alexander Bock