c4932bcbae
Jenkins compile fix
2017-12-29 00:05:26 +01:00
9389e31164
Jenkins compile fix
2017-12-28 20:16:03 +01:00
b337c3aa1e
Windows compile fix
2017-12-28 14:15:06 -05:00
8c7d220335
Some fixes for Jenkins build
2017-12-28 16:58:19 +01:00
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
fac3780ce9
Remove warnings on MacOS
2017-12-26 23:06:11 +01:00
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
0d6a94789a
Remove todo comment
2017-12-26 19:47:13 +01:00
91a32c7b93
Change renderproperties from value checking to changed flag
...
Make matrix fromLuaConversion functions actually work
2017-12-25 10:32:27 +01:00
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
c7c4f01f26
Make SyncTask work with globebrowsing scripts
...
Add additional error information to http request
2017-12-24 01:45:22 +01:00
079627e4c1
Merge branch 'feature/data-management' of https://github.com/OpenSpace/OpenSpace into feature/data-management
2017-12-23 23:25:38 +01:00
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
fd2568fdab
Let http synchronizations overwrite files
2017-12-23 17:54:22 +01:00
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
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
3ea918b818
Multiples fixes and added max text size for grids.
2017-12-19 17:49:30 -05:00
1c72561bff
Fixes introduced.
2017-12-19 12:56:09 -05:00
d40d2abc9a
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-12-19 12:56:12 +01:00
09182c9274
Cleanup code
2017-12-19 11:48:30 +01:00
f7dc598f60
Small code cleanup
2017-12-19 11:17:56 +01:00
db668b5342
Some changes to PR #432
2017-12-18 16:25:02 -05:00
a3185a0cfa
Merge branch 'master' into feature/NewAtmosphere
...
# Conflicts:
# modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
2017-12-18 14:49:08 -05:00
966df322cf
Added additional absPath where necessary
2017-12-18 14:47:58 -05:00
5ad7fa94f3
Merge branch 'master' into feature/NewAtmosphere
2017-12-18 12:21:08 -05:00
0b0ad54028
Reenable digital universe on default
...
Fix refresh rate setting in configuration_helper
2017-12-18 11:58:22 -05:00
8230e8d1e5
Add preprocessor flag
2017-12-18 17:50:07 +01:00
ef2633980b
Allow sync module to be compiled without libtorrent
2017-12-18 17:36:52 +01:00
c7a784f01e
Updated absPath in shaders compilation.
2017-12-18 10:26:26 -05:00
90243cf388
Improve loading screen
2017-12-18 15:00:57 +01:00
d4278f9adc
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-12-17 18:30:00 +01:00
df259f6d02
Multithreaded scene initialization
2017-12-17 17:34:46 +01:00
7cc05ba2e0
More code cleanup
2017-12-16 15:37:46 +01:00
84dfbe7b80
Clean up asset related code
2017-12-16 12:51:46 +01:00
61b2c82b92
Improved code.
2017-12-15 13:21:14 -05:00
603078af53
Add sync task
2017-12-15 13:28:24 +01:00
75cf6dcf71
Asset work in progress
2017-12-15 13:21:10 +01:00
eead4b7f25
Merged master into NewAtmosphere.
2017-12-14 15:55:27 -05:00
f78c10168f
Merge branch 'master' of https://github.com/OpenSpace/OpenSpace
2017-12-14 11:23:30 -05:00
23a446cb2c
Update Ghoul repository
...
Adapt to changes that absPath is not called automatically as often anymore
Remove atmosphereearth.scene
2017-12-13 21:55:29 -05:00
167222c814
Feature/dashboard ( #431 )
...
Merging Dashboard branch that introduces the Dashboard, DashboardItem and moves most of the screen rendering code into a component-based layout that can also be displayed as a screenspace renderable
* Add Onscreen Dashboard
* Add Dashboard class
* Add DashboardItem classes and subclasses
* Added font and fontsize customization to dashboarditems
* Add default dashboard specifications to all scenes
* Add tests.scene to test dashboard items
* Add configuration options to DashboardItemDistance
* Fix distance conversion to correctly use singular or plural values
* Make DashboardItems unique when adding them to a dashboard
* Correctly position test with different font sizes
* Add Dashboard Item that enables spacing between other items
* Add performance measurement to dashboard rendering
* Add method to DashboardItemDistance that computes distance to surface
* Add DashboardItemAngle that computes and prints the angle between three objects
* Add DashboardItemInstruments that shows the instruments on New Horizons
* Add ability to OpenSpaceModules to return a list of Luascripts defined by child objects
* Make it possible for ScreenSpaceDashboard to work with its own dashboard or the main one
2017-12-13 17:11:54 -05:00
f6ab44ee12
Improved previous correction.
2017-12-13 15:32:06 -05:00
5fe200ad7f
Fixed squared texture noise on surface' planets when seeing from far away.
2017-12-13 14:53:57 -05:00
7b956aa214
Fixed bug in AMD cards.
2017-12-12 18:08:07 -05:00
7e2d6bf3ab
Coding style adherence
2017-12-12 17:08:24 -05:00
4c0f0333af
New Fade-in controlled range for planes cloud.
2017-12-12 16:47:47 -05:00
6109b0c031
New Fade-in controlled range.
2017-12-12 16:20:20 -05:00
952f8e8e13
Merged master into NewAtmosphere.
2017-12-12 13:43:40 -05:00
91c7395a09
Merged.
2017-12-12 13:19:17 -05:00
a08c678bb0
Remove erraneous enabled OpenGL checking code
...
Remove warnings
Reset using the star glare texture as billboard for the Sun
2017-12-12 13:07:56 -05:00
Alexander Bock