Commit Graph

6754 Commits

Author SHA1 Message Date
Alexander Bock
d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +01: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
f6507b9b57 Warn when user tries to map a command to Shift+Keypad on Windows (#closes 1069) 2020-02-10 18:38:07 +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
0b34c0bb9f Merge pull request #1075 from OpenSpace/feature/new-glm
Feature/new glm
2020-02-10 11:28:40 +01:00
Alexander Bock
d2ae5f1ca2 Fix rendering issue due to uninitialized variables 2020-02-10 11:27:02 +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
Mikael Pettersson
b96fa43b27 Changed glm include path 2020-02-07 13:25:08 +01:00
liuloppan
4d500fc6dc Reset cef web gui scale
Resetting to use the default GUI scale of 1
2020-02-06 15:06:18 +01:00
Alexander Bock
1c35459ba9 Update SGCT and Ghoul repository to newest stable version 2020-02-04 09:46:43 +01:00
Lovisa Hassler
4cb9587522 Removed unused satellite image 2020-02-04 09:13:22 +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
liuloppan
d07a41a7b6 Remove satImages
We do not use this
2020-02-03 17:07:38 +01:00
Your Name
f8330d18b9 Applying rotations facing Earth 2020-01-31 16:55:39 -05:00
Your Name
b076a6f3c6 Removed unnecessary scale 2020-01-31 16:11:42 -05:00
Your Name
b61efaf965 Updated trail fade property 2020-01-31 11:42:34 -05:00
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
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
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
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