mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-10 23:38:38 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,796 Commits 82 Branches 46 Tags
2650f8c6b678aef3c8cb09ca71bca13f7650b1fc
Commit Graph

3360 Commits

Author SHA1 Message Date
GPayne
2650f8c6b6 Merged with master before pull request 2020-02-11 22:52:14 -07:00
GPayne
2a6db6b1ee Removed unnecessary data fields in SBDB data file support 2020-02-11 22:16:49 -07:00
Alexander Bock
b37698a705 Make it possible again to remove globe browsing layers (closes #960) 2020-02-12 00:42:59 +01:00
Alexander Bock
81fda6c8db Update Ghoul repository 
Adapt to changes in Ghoul
 2020-02-12 00:01:24 +01:00
Alexander Bock
c8799dcc80 Cherrypick remaining changes from the feature/catch2 branch sans the big switch to SGCT 3.0 2020-02-11 00:21:42 +01:00
Alexander Bock
9cb1169d58 Merge pull request #1063 from OpenSpace/bug/macosbuild 
macos compile and build (still needs ring shader const fix)
 2020-02-10 23:39:39 +01:00
Micah Acinapura
faccb3d948 conditional uniform set for macos 2020-02-10 16:55:21 -05:00
Alexander Bock
d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +01:00
Micah Acinapura
db8a0d16c9 Merge branch 'master' into bug/macosbuild 2020-02-10 15:43:44 -05:00
Alexander Bock
6fe993820f Remove spaces from property owners 2020-02-10 21:22:05 +01:00
Alexander Bock
8f81360628 Move the OpenSpace unit tests from GTest to Catch2 
Fix for default.scene
 2020-02-10 21:10:35 +01:00
Alexander Bock
da8458ab40 Merge pull request #1052 from OpenSpace/feature/instrument-images-and-sequences 
added sequenceTypeImageAndInstrumentTimes as option for partially comp…
 2020-02-10 18:08:03 +01:00
Alexander Bock
752a013eb8 Merge pull request #1066 from OpenSpace/feature/iss-asset 
Feature/iss asset
 2020-02-10 18:07:51 +01:00
Alexander Bock
a37a64d691 Merge branch 'master' into feature/iss-asset 
Fix the rotation used for TLE elements by removing a factor of 2
Add interesting satellites to the default scene/profile
 2020-02-10 18:05:45 +01:00
Alexander Bock
3c88ee5de3 Merge pull request #1068 from OpenSpace/issue/1065 
Issue/1065
 2020-02-10 14:54:03 +01:00
Alexander Bock
49c793d976 Update Ghoul version 
Add initial Tracy profiling macros
 2020-02-10 14:50:41 +01:00
Alexander Bock
9491f73803 More GLM initialization fixes 2020-02-10 01:18:27 +01:00
Alexander Bock
24ce773da9 Update GLM version 
Correctly initialize all values as they are no longer default-initialized
 2020-02-10 00:09:31 +01:00
Jonathas Costa
e23efd61ad Updated shader file name on Apple. 2020-02-03 13:00:04 -05:00
Jonathas Costa
d2e442203d Added new shaders and code for Apple's trails lines. 2020-02-03 12:59:29 -05:00
Your Name
b61efaf965 Updated trail fade property 2020-01-31 11:42:34 -05:00
Micah Acinapura
f15dc43e9d uniform cleanup 2020-01-31 10:31:41 -05:00
Micah Acinapura
1b4e32d8f2 cleanup of ringshader; fix singlefisheyegui 2020-01-31 10:28:37 -05:00
Your Name
58b1400051 Renamed ext to FileSuffix 2020-01-31 10:17:00 -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
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
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
Alexander Bock
6a94b2267e Merge pull request #1053 from OpenSpace/feature/profile 
Feature/profile
 2020-01-27 16:18:01 -05: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
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
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
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
Alexander Bock
b73b4270ed Merge pull request #1026 from OpenSpace/feature/AALines2 
Feature/aa lines2
 2020-01-24 21:41:24 +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