Commit Graph

6792 Commits

Author SHA1 Message Date
Your Name 58b1400051 Renamed ext to FileSuffix 2020-01-31 10:17:00 -05:00
Your Name 30dada1fcc Replaced duplicated code with tle_helper 2020-01-31 10:16:26 -05:00
Micah Acinapura a69e9bc60f added loading screen fix for hdpi 2020-01-31 10:15:48 -05:00
Micah Acinapura 723e7e220e Merge branch 'issues/1062' into bug/macosbuild 2020-01-31 09:38:13 -05:00
Micah Acinapura a943ad5bb8 Merge branch 'bug/macosbuild' of github.com:OpenSpace/OpenSpace into bug/macosbuild 2020-01-31 09:36:54 -05:00
Alexander Bock 9b43b08368 Convert property owner identifiers to camel case 2020-01-31 08:22:40 -05:00
GPayne 1ba505d8cc Additional work on time quantizer 2020-01-31 02:55:26 -07:00
ElonOlsson 11aa87bd36 fix for mercury magnetosphere (#1064)
- updated transfer function
- removed extra text files
2020-01-30 19:39:48 -05:00
Your Name 99137de797 Added commment 2020-01-30 18:19:44 -05:00
GPayne 685579cd4f Work in progress for new quantization scheme 2020-01-30 16:16:06 -07:00
Your Name b05df8778e Iss asset with model added 2020-01-30 18:15:38 -05:00
Jonathas Costa 4651f6db38 Set the maximum number of samples to 7. 2020-01-30 18:10:16 -05:00
Jonathas Costa 823e83047d Second round adding constant parameters. 2020-01-30 17:46:53 -05:00
Micah Acinapura cbec45db3e Merge branch 'issues/1062' into bug/macosbuild 2020-01-30 15:13:10 -05:00
Jonathas Costa b6b1817160 Number of shadow samples are now a compiling constant. 2020-01-30 15:10:15 -05:00
Alexander Bock 04ce540102 Merge pull request #870 from OpenSpace/issue/848
Bring back stars to the Earth's night.
2020-01-30 14:56:39 -05:00
Micah Acinapura 12b04f38bd macos compile and build (still needs ring shader const fix) 2020-01-29 21:43:06 -05:00
Lovisa Hassler 826caf6954 Adding iss asset as a renderablesatellite 2020-01-27 18:38:18 -05:00
Gene Payne 199ddb6292 Added missing sun marker asset to osiris-rex asset 2020-01-27 16:26:55 -07:00
Your Name 55ecf2f6ef Changing conflicting keybindings in rosetta scene 2020-01-27 18:18:58 -05:00
Jonathas Costa 8d5edea6fb Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2020-01-27 17:24:24 -05:00
Alexander Bock aa5e4c05ff Use the default scene instead of the profile again 2020-01-27 23:23:42 +01:00
Jonathas Costa bfa64a6aae Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2020-01-27 17:23:13 -05:00
Jonathas Costa 607451e04b Changes to fix Dawn scene. 2020-01-27 17:23:05 -05:00
Your Name f560224143 GetProperty filter on groupname and update in base.asset 2020-01-27 16:49:36 -05:00
Alexander Bock 6a94b2267e Merge pull request #1053 from OpenSpace/feature/profile
Feature/profile
2020-01-27 16:18:01 -05:00
Alexander Bock 8a8748daaa Small fixes 2020-01-27 22:17:08 +01:00
Jonathas Costa 947a78a204 Changed night color behavior. 2020-01-27 14:58:05 -05:00
Jonathas Costa 6dcaa9e299 Merged master. 2020-01-27 14:26:21 -05:00
Jonathas Costa bf9df85327 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2020-01-27 12:21:53 -05:00
Alexander Bock 160790c03b Merge pull request #1051 from OpenSpace/feature/csv-bookmarks
Feature/csv bookmarks
2020-01-27 18:20:37 +01:00
Alexander Bock 975e46e4b2 Move local bookmarks file to new global asset folder 2020-01-27 18:20:17 +01:00
Jonathas Costa e2f0321e7a Commented gui size again. 2020-01-27 12:18:30 -05:00
Jonathas Costa 47e89d2d74 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2020-01-27 12:08:08 -05:00
Jonathas Costa b19147fba7 Fixed bug was making atm disapear when night/water layer weren't active. 2020-01-27 12:07:15 -05:00
Alexander Bock bba51efd70 Cleanup of asset files 2020-01-27 18:01:01 +01:00
Alexander Bock b545ab5c5b Merge pull request #1050 from OpenSpace/issue/1049
Fixed issue 1049 and 554 (multiple viewport problems and lua console scales)
2020-01-27 17:32:56 +01:00
GPayne f682352b53 Merging with master 2020-01-27 09:14:35 -07:00
Gene Payne f0a304dd19 Added option for using Utah Sync server (commented-out) 2020-01-27 10:45:21 -05:00
Micah 9be53ef77f adding bounding sphere to renderabeltrailtrajectory 2020-01-26 16:31:44 -05:00
Micah ba4972310d added sequenceTypeImageAndInstrumentTimes as option for patially complete missions 2020-01-26 12:35:27 -05:00
Micah 2332d6199e update local and fix openspace 2020-01-26 12:24:43 -05:00
Micah 0bc8bd5593 fix spaces and url 2020-01-26 09:18:10 -05:00
Micah ad29ea53f5 csv bookmark files 2020-01-26 09:13:48 -05:00
Alexander Bock b73b4270ed Merge pull request #1026 from OpenSpace/feature/AALines2
Feature/aa lines2
2020-01-24 21:41:24 +01:00
Alexander Bock 4440a2a554 Update Ghoul reference 2020-01-24 21:41:06 +01:00
Alexander Bock 4cef2be366 Small cleanup 2020-01-24 21:40:09 +01:00
Alexander Bock 49b6124dba Merge pull request #1027 from OpenSpace/feature/RingShadows
Feature/ring shadows
2020-01-24 21:23:59 +01:00
Alexander Bock 9901d2b6fc Merge pull request #1048 from OpenSpace/feature/distancelabels
Feature/distancelabels
2020-01-24 21:09:16 +01:00
Alexander Bock 87805f1db8 Coding style fixes 2020-01-24 21:08:54 +01:00