Commit Graph

354 Commits

Author SHA1 Message Date
Micah Acinapura eec6b15781 Feature/user profiles assets (#1496)
* added user profile/asset tokens to config, launcher and profile editor


* creating one user directory for data, config, screenshots, recordings
2021-03-02 01:36:32 -05:00
Emma Broman b381bd83d3 Add module property for exoplanet habitable zone opacity 2021-02-22 09:38:59 +01:00
Emma Broman e21edaa13e Expose exoplanet creation settings to user as module properties (#1499)
* Expose exoplanet creation settings to user as module properties

* Set default textures from asset to avoid explicit paths to sync folder
2021-02-12 14:32:37 +01:00
Alexander Bock f5d3659e8a Updated SGCT configuration link (closes #1457) 2021-01-19 10:28:08 +01:00
Alexander Bock f3b373d249 Enable OpenGL debug context by default for the time being to prevent the frame stuttering from occurring 2020-11-17 11:22:38 +01:00
Alexander Bock 4d8dff01f5 Oops 2020-11-16 15:25:48 +01:00
Alexander Bock ef081d27aa Try to get the location of the sync folder from the OPENSPACE_SYNC environment variable first, before using the ${BASE}/sync
Update SGCT repository
2020-11-16 10:43:08 +01:00
Alexander Bock 4069d944bc Disable V-Sync again
Set the line fade for Voyager and Pioneer more properly
2020-10-13 17:09:53 +02:00
Alexander Bock 77907fc7df Rename ProfilesReadOnly -> ReadOnlyProfiles 2020-10-13 16:22:05 +02:00
Micah d88f6eda6b update of all profiles to json format, few asset fixes 2020-10-12 04:22:16 -04:00
Alexander Bock 4b26305340 Merge branch 'master' into feature/profile-gui
# Conflicts:
#	openspace.cfg
2020-10-11 11:18:45 +02:00
Alexander Bock 607d008cbf Fixing newlines at the end of files 2020-10-10 12:20:45 +02:00
Micah 7ed673e773 cleanup fixes 2020-10-08 23:41:50 -04:00
Micah f617331c33 update to solarsystem for description on scene graph node. added earth observing trails for planets 2020-10-08 23:39:30 -04:00
Micah 0ccf4dfd1f update for gui meta panel 2020-10-04 16:26:52 -04:00
Gene Payne 5d5bfd340b Added configuration file bypass launcher key option 2020-10-02 15:49:27 -06:00
Gene Payne ea26c18d9d Added feature to make 'standard' profiles read-only 2020-09-27 12:09:25 -06:00
Micah 2e61a0ba72 start of asset meta update 2020-09-25 17:14:41 -04:00
Alexander Bock fbd903b4ff Move profiles to their own folder 2020-06-22 09:33:00 +02:00
Alexander Bock d92982a097 Add suggested profiles to the openspace.cfg ifle 2020-06-20 23:17:18 +02:00
Alexander Bock 1e9df1cb4b Merge branch 'master' into feature/profiles
# Conflicts:
#	include/openspace/scene/assetloader.h
#	src/scene/assetloader.cpp
2020-06-14 17:54:25 +02:00
Micah Acinapura b43c234541 mars2020 landed 2020-06-12 21:08:20 -04:00
Alexander Bock 433d96bbb4 SGCT compile fix
First pass for pull request
2020-06-11 00:24:58 +02:00
Micah f82a0d14ad aded time range to voyager rotations; disabled spice exceptions by default; updated space module to read spiceexpection value; 2020-06-05 16:42:31 -04:00
GPayne 050029f16b Switched back to default scene in preparation for merge with master 2020-03-24 14:21:15 -06:00
GPayne bfdfd44910 Added GUI name title for sssb objects 2020-03-12 13:40:28 -06: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
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
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 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 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
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
Gene Payne f20645d24a Modified config file to use test profile instead of scene 2019-10-22 16:29:00 -06:00
liuloppan 78eb673611 Feature/gui for touch (#967)
Merging in feature gui for touch. Enable touch module to run.
Currently only run on development mode with the "touch" scene.
2019-09-18 23:49:51 +02:00
Alexander Bock af4dee8d01 Update version number to 0.15.0
Move AllowAddresses out of Interface into Server in openspace.cfg to circumvent potential stack corruption
Make lua_state not being copied
2019-09-17 18:38:40 +02:00
Micah Acinapura 9f88a7347b added swift tuttle, updated lem lighting, removed sat and debris scenes 2019-09-17 11:59:15 -04:00
Micah Acinapura 17233cfa2a updated config files to remove msaa sampling; added new configs; 2019-09-14 21:02:39 -04:00
Alexander Bock c6c2eb85fb Feature/du updates (#972)
* Updating DU for new data.
* Changed how OS handles partiview colormaps.
* Multiple changes to adapt OS' behavior for cmaps.
* Small tweaks. MW sphere is now fading in the correct spacetime.
* Added all the Star Orbits.
* Fixing bug in speck reading procedure.
* Changed code to allow comments into data region of a speck file.
* Added deep sky objects.
* Added Home label
* Fixed bug in drawelements.
* Added Sun as a separated star for better control.
* Update version numbers on DU assets
* Move starorbits into their own asset file
* Making some of the digital universe renderables fully opaque for performance gains
2019-09-09 13:46:57 +02:00
Alexander Bock 8ce9fde91b Enable the user to specify a custom temporary folder to keep the OS's temp folder clean
Change the configuration file to point the temp folder into the OpenSpace folder
Update Ghoul to not overwrite default font files (closes #944)
2019-08-22 15:37:08 +02:00
GPayne 7e6a9b71fa Changed to standard position method for renderablesatellites 2019-08-15 16:13:41 -06:00
GPayne 39f4dc33cb Initial pass of merging satellite debris into master and switching satellites to use grouped scenegraphnodes. 2019-08-13 15:39:06 -06:00
GPayne ba07837865 Merge branch 'thesis/2019/spaceDebris' into feature/satellitesgroupednodes 2019-08-13 09:56:51 -06:00