Commit Graph

6727 Commits

Author SHA1 Message Date
Micah Acinapura 1b4e32d8f2 cleanup of ringshader; fix singlefisheyegui 2020-01-31 10:28:37 -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
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
Micah Acinapura 12b04f38bd macos compile and build (still needs ring shader const fix) 2020-01-29 21:43:06 -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 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 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
Alexander Bock 32caf0ab8c Update location of SGCT repository 2020-01-24 19:51:24 +01:00
Alexander Bock 182857cfb8 Update Ghoul and SGCT repositories 2020-01-24 19:38:27 +01:00
eriksunden e3b3aec1ed Fixed issue 1049(using first viewport size as framebuffer size) and 554(loading and ending screen will be visible on the first viewport only). Also fixed such that Lua Console adapts to window size and not framebuffer size. 2020-01-24 15:53:29 +01:00
Jonathas Costa 18ed125851 Merge branch 'master' into feature/AALines2 2020-01-22 12:41:28 -05:00
Jonathas Costa c2d98983c1 Merge branch 'master' into feature/RingShadows 2020-01-22 12:40:42 -05:00
Jonathas Costa 8ae8d53629 Fixed blinking (precision) problems. 2020-01-22 11:33:19 -05:00
Jonathas Costa 904350d89b Improved shadow blending. 2020-01-22 09:50:16 -05:00
Mikael Pettersson f481ff78b3 Merge pull request #1046 from OpenSpace/feature/touch-improvements
Feature/touch improvements
2020-01-15 10:36:16 +01:00
Mikael Pettersson f3659c2249 Forgot to add the property 2020-01-14 08:07:23 +01:00
Mikael Pettersson ebf3672bab Reworked zoom in boundaries in touch navigation
Should be able to focus a larger body and go back to a smaller one now.
2020-01-13 15:48:49 +01:00
Mikael Pettersson 629597f3d0 Added TouchActive as a field in TouchModule
This can be used to inactivate navigational touch input
2020-01-13 15:48:38 +01:00