Commit Graph

5340 Commits

Author SHA1 Message Date
Alexander Bock
dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock
cc178d03f3 Remove clang warnings
Update SGCT repository
2017-12-29 19:47:33 +01:00
Alexander Bock
c9a3c68f19 Fix style guide issues
Update Ghoul repository
2017-12-29 19:18:06 +01:00
Alexander Bock
023b654c16 Add simplified GUI button to the Touchbar on MacOS 2017-12-29 11:35:00 +01:00
Alexander Bock
c4932bcbae Jenkins compile fix 2017-12-29 00:05:26 +01:00
Alexander Bock
9389e31164 Jenkins compile fix 2017-12-28 20:16:03 +01:00
Alexander Bock
b337c3aa1e Windows compile fix 2017-12-28 14:15:06 -05:00
Alexander Bock
8c7d220335 Some fixes for Jenkins build 2017-12-28 16:58:19 +01:00
Alexander Bock
1ddde4b6e1 Merge commit 'a9661f681e115ebed096f5d25343dc99aad0f33f' into feature/data-management
# Conflicts:
#	data/scene/default.scene
#	data/scene/digitaluniverse/abell/abell.mod
#	data/scene/digitaluniverse/backgroundradiation/backgroundradiation.mod
#	data/scene/digitaluniverse/constellations/constellations.mod
#	data/scene/digitaluniverse/grids/grids.mod
#	data/scene/digitaluniverse/quasars/quasars.mod
#	data/scene/digitaluniverse/sloandss/sloandss.mod
#	data/scene/digitaluniverse/tully/tully.data
#	data/scene/digitaluniverse/tully/tully.mod
#	data/scene/earth/earth.mod
#	data/scene/grids/grids.mod
#	data/scene/mars/mars.mod
#	data/scene/milkyway/digitaluniverse/digitaluniverse.mod
#	data/scene/moon/moon.mod
#	data/scene/satellites/tle/geo.txt
#	data/scene/satellites/tle/gps-ops.txt
#	data/scene/satellites/tle/stations.txt
#	modules/imgui/src/renderproperties.cpp
#	modules/sync/ext/libtorrent
#	openspace.cfg
#	src/rendering/renderengine.cpp
2017-12-27 19:39:40 +01:00
Jonathas Costa
a9661f681e Merge pull request #432 from OpenSpace/feature/NewAtmosphere
Feature/new atmosphere
2017-12-27 09:40:19 -05:00
Alexander Bock
03c7cf0108 Remove resetting the current working directory as it is no longer needed when OpenSpace is a bundle 2017-12-27 15:00:48 +01:00
Alexander Bock
3201bab8d6 Add icons to Sync and TaskRunner applications 2017-12-26 23:38:51 +01:00
Alexander Bock
7520241387 Make OpenSpace an AppBundle on MacOS
Add icon to AppBundle
2017-12-26 23:06:31 +01:00
Alexander Bock
fac3780ce9 Remove warnings on MacOS 2017-12-26 23:06:11 +01:00
Alexander Bock
59916bc0c1 Renaming path tokens
- ${BASE_PATH} -> ${BASE}
  - ${OPENSPACE_DATA} -> ${DATA}
  - Make use of new token ${WEB}
Enable Phobos and Deimos on default
Remove unused cdflist file
2017-12-26 20:49:17 +01:00
Alexander Bock
339c45a7f6 Add specialized TaskRunner application "Sync" that only synchronizes all scenes in the asset folder
Replace TaskRoot in openspace.cfg with ${TASK} in Taskrunner
Remove Launcher
2017-12-26 20:13:23 +01:00
Alexander Bock
0d6a94789a Remove todo comment 2017-12-26 19:47:13 +01:00
Alexander Bock
fb8114f5fc Cleanup of Earth, Moon, and Mars WMS configuration files 2017-12-26 19:45:33 +01:00
Alexander Bock
ee730b79a0 Fix touchbar GUI script 2017-12-26 18:55:49 +01:00
Alexander Bock
5fc297cdcf Add Phobos and Deimos 2017-12-26 18:19:15 +01:00
Alexander Bock
dd689b6ac1 Fix size of the logo on the loading screen
Reduce the font size on the loading screen
Add moons to Neptune and Uranus
Fix specification of Mercury
2017-12-26 17:20:06 +01:00
Alexander Bock
28750b3926 Add Saturn minor moons 2017-12-26 12:16:09 +01:00
Alexander Bock
fef18e549d Exchange old jup260 kernel for updated jup310 and 341
Add asset files for Jupiter's minor moons
2017-12-26 10:53:15 +01:00
Alexander Bock
376135a748 Add color specification for synchronization phase to the loading screen
Increase the buffer size in the SpiceManager to prepare for larger jupiter kernels
2017-12-26 10:52:02 +01:00
Alexander Bock
91a32c7b93 Change renderproperties from value checking to changed flag
Make matrix fromLuaConversion functions actually work
2017-12-25 10:32:27 +01:00
Alexander Bock
08ba7fada5 Fix Gui paths for Voyager 1 and Voyager 2 2017-12-25 10:29:18 +01:00
Alexander Bock
fad87fc4e9 Add old Pluto image to the selection of textures
Have newhorizons.asset require all child assets to ensure initialization
2017-12-25 09:31:25 +01:00
Alexander Bock
1079d67c9a Have the documentation print out more information if an error occurs
Add other scene files (commented out) to the openspace.cfg
2017-12-25 09:10:22 +01:00
Alexander Bock
d749c43a54 Enable multiple directories for image sequence
Set correct maximum text size values for Exoplanets and Starlabels
Fix Rosetta scene and rendering on MacOS
Add Voyager scene
2017-12-25 09:09:19 +01:00
Alexander Bock
7920c97767 Fix the map configurations for Mars
Include hotfix for limiting the number of concurrent downloads
2017-12-24 18:23:18 +01:00
Alexander Bock
c7c4f01f26 Make SyncTask work with globebrowsing scripts
Add additional error information to http request
2017-12-24 01:45:22 +01:00
Alexander Bock
079627e4c1 Merge branch 'feature/data-management' of https://github.com/OpenSpace/OpenSpace into feature/data-management 2017-12-23 23:25:38 +01:00
Alexander Bock
4c92b9ccbb First steps towards making OpenSpaceEngine resilient against SGCT configuration errors 2017-12-23 20:39:23 +01:00
Alexander Bock
570ce9813d Add CMake configure file that writes the Git branch and commit hash into a file 2017-12-23 20:27:54 +01:00
Alexander Bock
e74801b490 Enable RenderablePlanetProjection to have a selection of possible targets and change and hotload them at runtime
Makke RenderablePlanetProjection work if no base texture is loaded
2017-12-23 20:24:19 +01:00
Alexander Bock
0e96632586 Add ability to OptionProperty to return the currently selected Option 2017-12-23 20:23:36 +01:00
Emil Axelsson
2fad096a28 Add directory constant to asset table 2017-12-23 18:17:45 +01:00
Emil Axelsson
fd2568fdab Let http synchronizations overwrite files 2017-12-23 17:54:22 +01:00
Alexander Bock
32534e43c7 Specify New Horizons location relative to Pluto rather than SSB 2017-12-23 17:38:54 +01:00
Emil Axelsson
624167744d Report failure for http requests with response code different from 200 2017-12-23 17:37:55 +01:00
Alexander Bock
ecaba9c9dc Clear .gitignore file 2017-12-23 17:34:46 +01:00
Alexander Bock
0149162fbe Move deinitialization of Assets from OpenSpaceEngine::destroy into OpenSpaceEngine::deinitialize as some of its components might be needed in the asset's deinitialization (like MissionManager)
Add function to unload Mission file
2017-12-23 17:32:28 +01:00
Alexander Bock
310bdf6be9 Completed conversion of of scene/mod files 2017-12-23 16:39:27 +01:00
Alexander Bock
a8ea93da17 Make regular settings default in RenderableGlobe and GDALWrapper
Fix spelling error in Asset
Wrap initializeGL in try/catch block to catch error
2017-12-23 16:31:17 +01:00
Emil Axelsson
5139f7df4f Slight improvement of error handling
- Do not try to reinitialize assets whose initialization failed.
- Fail gracefully when adding a scenegraphnode with a name that already exists
2017-12-23 10:17:08 +01:00
Alexander Bock
4b65e20570 Support loading of .asset and .scene files
Fix hardcoded paths to placeholder image add placeholder image to repository
Disable launcher in SyncWidget to keep it compiling until deletion
2017-12-23 08:08:12 +01:00
Emil Axelsson
ca6263ed1e Add support for absolute asset paths and explicit specification of .asset suffix. 2017-12-22 17:06:42 +01:00
Emil Axelsson
2baa0cbb6d Fix bug with assets changing state prematurely, while loading 2017-12-22 00:15:23 +01:00
Jonathas Costa
73354e87d8 Removed pointer from renderer. 2017-12-21 11:11:50 -05:00
Emil Axelsson
abb22b4aaa Small fix to fix state inconsistency bug 2017-12-21 10:10:55 +01:00