mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-30 07:49:31 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,858 Commits 84 Branches 48 Tags
bf8d365017c7f9dfdf2bc02da95e4228fc42c719
Commit Graph

2858 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Bock bf8d365017 Started cleanup of OnScreenGui code 2016-06-22 16:55:44 +02:00
Alexander Bock debe475647 Updating to newest Ghoul version 
Reenabling default.scene as the default scene
releases/v0.3.4 		2016-06-22 15:30:16 +02:00
Alexander Bock 5cc5f52abd Merge branch 'develop' into release/ips 
# Conflicts:
#	ext/ghoul
 2016-06-22 10:01:48 +02:00
Alexander Bock c913979d6f Add Resolution tag to the single file, enforcing a smaller framebuffer resolution on Mac systems 2016-06-22 10:00:27 +02:00
Alexander Bock 37e18441dc Support GDAL on non-Windows platforms 
Fix compile fix with TileProviderManager
Fix projection error on PlanetProjection
 2016-06-22 08:51:58 +02:00
Alexander Bock c3b3e1107e Updated Ghoul version 2016-06-22 08:28:01 +02:00
Alexander Bock 342ed2f161 Let Downloadmanager use new thread methods 2016-06-22 08:27:24 +02:00
Alexander Bock e671a59ede Merge branch 'develop' into release/ips 2016-06-21 14:24:53 +02:00
Alexander Bock 3775bbe6b1 Always write values to the projected texture even when normal-test fails (closing #103) 2016-06-21 14:24:23 +02:00
Alexander Bock f7502de92f Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips 2016-06-17 22:06:58 +02:00
Kalle Bladin dd70733c2a Add gdal_data folder and pointing to it using CPLSetConfigOption to remove need of setting environment variable. 2016-06-17 15:52:32 -04:00
Alexander Bock c3eda5e4e6 Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips 2016-06-17 21:37:43 +02:00
Kalle Bladin 153d239790 Catch exceptions when not able to read a GDAL dataset. 2016-06-17 13:07:15 -04:00
Alexander Bock da0190ae1c Remove default-performance measurements from default scene 2016-06-17 18:31:51 +02:00
Alexander Bock 82f97943c5 Use correct histograms for ENLIL 2016-06-17 18:31:39 +02:00
Alexander Bock 8bf06cdff2 Set fieldlines scene to the correct time of January 1st, 2015 2016-06-17 18:30:56 +02:00
Alexander Bock 0cefde84d2 Fix shader compile error for inside volume raycasting 2016-06-17 18:30:39 +02:00
Alexander Bock c587b5cdb9 Fix tabs 2016-06-17 18:30:12 +02:00
Alexander Bock 190bd4726f Add performance measurements to ABufferRenderer 2016-06-17 18:30:01 +02:00
Alexander Bock a4b0d36048 Reenable up-vector definition in RenderableModelProjection 2016-06-17 17:00:45 +02:00
Alexander Bock 9282d7e66b Remove warnings from missing 'Atmosphere' definitions for Jupiter and its moons 2016-06-17 17:00:30 +02:00
Kalle Bladin 1f08bb413c Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-06-17 10:52:58 -04:00
Kalle Bladin 101795aa00 Group layer categories in gui. 2016-06-17 10:52:44 -04:00
Alexander Bock 4e240ddb19 Add 'atmosphereearth' scene node 2016-06-17 16:50:00 +02:00
Alexander Bock e1460575f5 Reenable up-vector definition in RenderablePlanetProjection 2016-06-17 16:49:04 +02:00
Alexander Bock e5662df36d Remove warnings from missing 'Atmosphere' definitions for Pluto moons 2016-06-17 16:48:34 +02:00
Alexander Bock 87bf04c1da Merge branch 'develop' into release/ips 2016-06-17 15:46:59 +02:00
Alexander Bock 5c8bd32ae5 Merge branch 'feature/globebrowsing' into release/ips 2016-06-17 15:46:46 +02:00
Alexander Bock 0a6bff628b Remove atmosphere from default earth for now 2016-06-17 15:46:38 +02:00
Alexander Bock c328feb663 Reset default.scene 2016-06-17 15:34:08 +02:00
Alexander Bock 86dce766ad Correctly align Earth trail relative to SSB instead of Earth barycenter 2016-06-17 15:23:46 +02:00
Alexander Bock 5c6f1c2815 Ignore ScriptLog file 2016-06-17 15:22:38 +02:00
Alexander Bock 9d70944d2a Merge branch 'develop' into release/ips 2016-06-17 14:00:36 +02:00
Alexander Bock f8fd806d48 Add fieldlines scene file 2016-06-17 14:00:06 +02:00
Alexander Bock d3d5bd45c5 Add volumetric milkyway scene, torrent, and data files 2016-06-17 13:59:16 +02:00
Alexander Bock 78aef91a03 Merge branch 'develop' into release/ips 2016-06-17 13:31:16 +02:00
Alexander Bock ced0de7c08 Update .gitignore to take into account new data files 2016-06-17 13:22:56 +02:00
Alexander Bock ac10c20a4f Merge branch 'release/ips' of https://github.com/OpenSpace/OpenSpace-Development into release/ips 2016-06-17 13:13:28 +02:00
Alexander Bock f2347a5f56 Merge remote-tracking branch 'origin/feature/iSWA' into release/ips 2016-06-17 11:31:33 +02:00
Alexander Bock cbb7a3e1db Merge remote-tracking branch 'origin/feature/globebrowsing' into release/ips 2016-06-17 11:31:17 +02:00
Alexander Bock 3d4e1ec19c Merge branch 'develop' into release/ips 
Conflicts:
	tests/main.cpp
 2016-06-17 11:31:11 +02:00
Alexander Bock 227ad39e5b Make unit tests compile again 
Update Ghoul version
 2016-06-17 11:28:50 +02:00
Alexander Bock b416f9fba2 Fix linking error in ScalarProperty with wchar_t 2016-06-17 11:28:32 +02:00
Kalle Bladin 96d7a1dd44 Solve synching bug in time class. 2016-06-16 17:50:19 -04:00
Michael Nilsson f9411385d6 remove unnecessary includes from dataprocessor 2016-06-16 16:56:30 -04:00
Alexander Bock c253e5734f Add a todo to Launcher 
Update to newest Ghoul
 2016-06-16 22:37:55 +02:00
Michael Nilsson 35c3d3ce8b Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA 2016-06-16 14:40:39 -04:00
Michael Nilsson 268ca0ea75 change method for adding data values in dataprocessortext 2016-06-16 14:40:26 -04:00
Kalle Bladin db4a35fd05 Merge branch 'develop' into feature/globebrowsing 2016-06-16 12:21:24 -04:00
wundahful 66eb47ea95 Merge branch 'develop' of github.com:OpenSpace/OpenSpace-Development into develop 2016-06-16 17:38:48 +02:00