Commit Graph

1919 Commits

Author SHA1 Message Date
ElonOlsson 1ef4d9959e added some short gui-descriptions 2021-09-27 15:57:23 -04:00
ElonOlsson 8cac80f22c more specific identifiers and gui path. Restored old old transferfunction for volume 2021-09-27 15:05:48 -04:00
Malin E 15e9a59ddd Add JWST label 2021-09-27 15:52:25 +02:00
Malin E 779eb6c82f Add actions to set up the 2018 and 2021 launch times 2021-09-27 15:12:25 +02:00
Malin E a7bbea3fca Update hudf image with north arrow and licence info 2021-09-27 14:06:42 +02:00
Malin E eee84c3087 Update start time and adjust entire timeline to it 2021-09-27 14:05:28 +02:00
ElonOlsson 0737ae1834 last polishing questionmark 2021-09-24 13:08:10 -04:00
Malin E e4a5431c42 Adjust profile start state 2021-09-23 13:18:36 +02:00
Malin E de1ef3febc Some clean up 2021-09-23 11:38:15 +02:00
ElonOlsson f46d37e67b small fixes and polishing 2021-09-22 16:14:07 -04:00
Malin E 0076fd7613 Merge branch 'master' into feature/animation-fixes 2021-09-22 15:00:19 +02:00
Malin E 24a14b2aac Seperate the JWST mission to seperate assets 2021-09-22 14:57:58 +02:00
ElonOlsson 890d0a7bab removed some hotkeys, moved some and rebound to new keys 2021-09-21 14:54:02 -04:00
ElonOlsson 9d503ff86e Merge branch 'master' into thesis/2020/radiation 2021-09-17 11:06:15 -04:00
ElonOlsson 839e280a38 flux nodes shaders and interaction clean up 2021-09-16 16:29:42 -04:00
ElonOlsson 1833435172 removed flow functionality. Was never used and is more confusing than not imo. 2021-09-15 11:26:56 -04:00
ElonOlsson 5dea630b9d small fixes and merge of magnetogram images folders 2021-09-15 09:46:33 -04:00
Micah fff66c7855 update guihash for keyboard viewer 2021-09-14 12:55:43 -04:00
Micah af95d9895e update slidedeck example for actions 2021-09-14 12:25:05 -04:00
Malin Ejdbo 4c3622316a Add white frame around HUDF image 2021-09-14 17:46:55 +02:00
Malin Ejdbo a7cc3a46bd Merge branch 'master' into feature/animation-fixes 2021-09-14 13:05:18 +02:00
Malin E 1ed0d33f8d Add JWST animation timelapse using the scriptscheduler 2021-09-14 11:53:26 +02:00
Malin E a61afa6404 Update JWST animation 2021-09-14 11:51:03 +02:00
ElonOlsson 423d854615 Merge branch 'master' into thesis/2020/radiation 2021-09-13 18:23:33 -04:00
ElonOlsson a812f338a8 clean up 2021-09-13 18:22:36 -04:00
ElonOlsson 505215964a more pr comments fixed 2021-09-10 17:11:44 -04:00
ElonOlsson cd4ebd7532 more pr comment edits 2021-09-08 10:40:56 -04:00
ElonOlsson 70424290b7 some edits from PR comments 2021-09-08 09:50:58 -04:00
Emma Broman 82ecf60ea2 Issue/1527 - GlobeRotation (#1737)
* Add GlobeRotation and example

* Put latitude before longitude in GlobeTranslation files
2021-09-06 09:28:12 +02:00
ElonOlsson b8f7a234ee more generic path to transfer function. Borrowing one from the bastille day folder 2021-09-03 12:01:07 -04:00
ElonOlsson 92ac9c2459 masked and colored magnetosphere asset with minMaxRange property 2021-09-03 11:21:17 -04:00
Micah 19ab24374f update guihash for action cleanup and route 2021-09-02 16:42:04 -04:00
Micah 671894bd0b changes for action panel 2021-09-02 14:56:25 -04:00
ElonOlsson f4b2c08d55 back side cull face bug fixed 2021-09-02 11:54:21 -04:00
Malin E a39d18c752 Merge branch 'master' into feature/animation-fixes
* Resolve conflicts
2021-09-01 09:44:27 +02:00
Micah faf7a3d315 update guihash for tutorial link 2021-08-27 13:17:52 -04:00
ElonOlsson 4e6323cd8f just a few changes. Bug of cutplanes backside not showing up detected when sun is activated 2021-08-27 10:01:57 -04:00
Alexander Bock b649509bf0 Feature/model shader (#1723)
* Add support for RenderableModel to take custom shader code
 * Added example to highlight usage
2021-08-24 10:45:19 +02:00
ElonOlsson 21633a20c2 PR fixes, rotation corrected 2021-08-23 10:26:28 -04:00
Micah 2f32ddaf28 updating earth Terrain WMS to new esri server 2021-08-20 14:02:15 -04:00
Alexander Bock b2d12476dd Correctly specify the model size of the Apollo capsules (closes #1718) 2021-08-20 12:43:47 +02:00
Alexander Bock 34985f64a6 Feature/keybindings (#1708)
* Add action manager to handle actions in replacement of keyboard shortcuts
* Implement new Action concept
* Remove the shortcutscomponent as it is no longer needed
* Update profile version from 1.0 to 1.1
* Add action dialog
* Restructure of key specification in keys.h
* Remove solid field-of-view keybind from the newhorizons profile as the setting no longer exists
2021-08-18 10:58:20 +02:00
Emma Broman 2a5e6dc502 Make state machine's enter/exit scripts optional 2021-08-17 08:33:00 +02:00
ElonOlsson 743e2452f8 merge master to thesis branch 2021-08-16 15:23:49 -04:00
Emma Broman 8d7d8b9ba4 Feature/state machine (#1705)
* Fix script error in old state machine example

* Add a module with a more complex state machine, that can be created and controlled through the Lua API. Useful for interactive installations

* Add an example asset for the new state machine and rename the old linear "state machine" to luastatemachine


Co-authored-by: Malin Ejdbo <malin.ejdbo@gmail.com>
2021-08-16 09:29:45 +02:00
elon 9c2086170b easily fixed comments on PR 2021-08-13 15:39:13 -04:00
Gene Payne afe1f960cd Fixed image type for GHRSST L4 MUR sea temperature 2021-08-11 14:01:44 -06:00
Malin Ejdbo 54e4b4cbbe Update models to the new .osmodel format 2021-08-11 10:16:22 +02:00
Micah 8211b4a113 update apollo boulders for new model code 2021-08-03 14:38:05 -04:00
Micah 96c0b36c54 update pioneer model to include textures 2021-08-03 12:37:38 -04:00