Kollberg
4ec00dc977
Merge branch 'thesis/2019/spaceweather-stream' of https://github.com/OpenSpace/OpenSpace into thesis/2019/spaceweather-stream
2019-09-06 08:15:21 -04:00
Kollberg
3c35c8d246
Merged with master branch, date of master branch 4/9/2019
2019-09-06 08:14:55 -04:00
Sovanny Huy
58b93cda23
change polarity fl colors and add option (in comments) for white and gray texture
2019-09-04 15:48:02 -04:00
Micah Acinapura
56a6ed62aa
updated mars atmosphere with carter and jonathas
2019-09-04 15:11:13 -04:00
Sovanny Huy
eeb0638827
Merge remote-tracking branch 'origin/thesis/2019/spaceweather-stream' into thesis/2019/spaceweather-stream
2019-09-04 14:35:52 -04:00
Sovanny Huy
7e5b0ca105
variablename
2019-09-04 14:35:42 -04:00
Sovanny Huy
067fca0ff1
suntexture manager now takes wsa and makes it black, blue and red
2019-09-04 14:34:54 -04:00
Kollberg
86fb1969c4
Bugfixes
2019-09-04 13:02:45 -04:00
Sovanny Huy
7e38292395
Merge remote-tracking branch 'origin/thesis/2019/spaceweather-stream' into thesis/2019/spaceweather-stream
2019-08-29 14:55:12 -04:00
Kollberg
6e77217ba3
Fixed bugg where openspace would crash because download worker didn't get to finish donwloading a file, also started to move out API-urls to asset file, so they are not hardcoded anymore
2019-08-29 11:09:05 -04:00
Sovanny Huy
d45c167b95
Auto stash before merge of "thesis/2019/spaceweather-stream" and "origin/thesis/2019/spaceweather-stream"
2019-08-28 16:37:25 -04:00
Sovanny Huy
19d99c6332
Auto stash before merge of "thesis/2019/spaceweather-stream" and "origin/thesis/2019/spaceweather-stream"
2019-08-28 16:29:43 -04:00
Sovanny Huy
14d3372932
Merge remote-tracking branch 'origin/thesis/2019/spaceweather-stream' into thesis/2019/spaceweather-stream
2019-08-28 15:38:12 -04:00
Kollberg
5ed0f924fc
Tried to fix bug where openspace crashed when closing, but still seems to be there, possibly has to do with downloads still running in the background
2019-08-28 15:06:34 -04:00
Kollberg
26f860398c
OpenSpace can now be powered by iSWA-servers, and is doing it asynchronously
2019-08-28 14:44:39 -04:00
Gene Payne
714ca5c636
Fix for Pluto ephemeris expiring on 2019-03-01 ( #962 )
...
Added plu043.bsp to Pluto asset SPICE kernels. This file is apparently synced already anyway, and handles orbits of Pluto and its moons until year 2100.
2019-08-28 08:58:49 -06:00
Alexander Bock
0e1c9be492
Update brightness values for default Moon layer
2019-08-28 16:35:20 +02:00
Jonathas Costa
ac800b13bd
Merge branch 'master' of https://github.com/OpenSpace/OpenSpace
2019-08-27 11:27:35 -04:00
Jonathas Costa
33c8ca719d
Fixed FXAA on Mac.
2019-08-27 11:27:31 -04:00
Emil Axelsson
93c6bf3429
Add missing operators
2019-08-27 16:49:56 +02:00
Alexander Bock
d4e7885a71
Correctly set camera space normal for local patches ( closes #945 )
2019-08-26 11:42:03 +02:00
Lovisa Hassler
54d294f905
Temp folder added to gitignore
2019-08-26 09:03:59 +02:00
Alexander Bock
6797bd54de
Add Apollo default to globebrowsing
2019-08-26 08:34:25 +02:00
Micah Acinapura
6c84170a59
readded globebrowsing cusomization asset;temp disabled fxaa on mac; temp not unsetting directories on deinit of webgui; added single_fisheye_gui.xml;
2019-08-23 13:47:27 -04:00
Jonathas Costa
fbbcc6fc56
Fixing shader on Mac.
2019-08-23 13:18:06 -04:00
Jonathas Costa
2b91640344
Disable Milky Way plane rendering now that we have the volumetric version.
2019-08-23 11:41:39 -04:00
Alexander Bock
fe4cb175c5
Merge pull request #955 from OpenSpace/integration/FXAA_Vol_Milkway
...
Integration/fxaa vol milkway
2019-08-23 16:37:12 +02:00
Alexander Bock
157c653afc
Moved the volume.asset from customization to scene/milkyway/milkyway/volume.asset
...
Make the Galaxy volume a default
Small changes here and there
2019-08-23 16:36:43 +02:00
Alexander Bock
b453f93feb
Merge remote-tracking branch 'origin/master' into integration/FXAA_Vol_Milkway
2019-08-23 16:25:28 +02:00
Alexander Bock
d3836b508c
Merge pull request #954 from OpenSpace/feature/FXAA
...
Feature/fxaa
2019-08-23 16:21:59 +02:00
Emil Axelsson
a53581d6c6
Cancel request when the version checker is destructed
2019-08-23 14:32:11 +02:00
Emil Axelsson
4f319d0612
Report unknown number of download bytes if nTotalDownloadBytes is 0
2019-08-23 14:25:52 +02:00
Emil Axelsson
a25106886b
Cancel version check when application closes
2019-08-23 14:19:24 +02:00
Jonathas Costa
cf3efb4591
Changed array type to old style in glsl.
2019-08-22 18:36:27 -04:00
Jonathas Costa
7cc9cf536d
Merge branch 'master' into integration/FXAA_Vol_Milkway
2019-08-22 18:15:48 -04:00
Jonathas Costa
0c48f5ef38
Added back resolveframebuffer.vert. It's used by volume rendering shaders.
2019-08-22 18:07:20 -04:00
Jonathas Costa
2c5fab7120
Removed unsused files and code.
2019-08-22 18:04:06 -04:00
Jonathas Costa
ae58cdc093
Merged
2019-08-22 17:35:19 -04:00
Jonathas Costa
d46b5d458c
Merge branch 'feature/DUUpdates' into integration/FXAA_Vol_Milkway
2019-08-22 17:04:59 -04:00
Jonathas Costa
8919a48ce9
Merge branch 'feature/FXAA' into integration/FXAA_Vol_Milkway
2019-08-22 17:04:41 -04:00
Jonathas Costa
fea10b358d
Clean up.
2019-08-22 17:03:12 -04:00
Jonathas Costa
ff2e6db26a
Merge branch 'master' into feature/FXAA
2019-08-22 16:03:14 -04:00
Jonathas Costa
766051c837
Changes to correct orient the Milky Way.
2019-08-22 16:01:04 -04:00
Micah Acinapura
e25ceb579e
fix for gpus that dont support const return values
2019-08-22 13:44:46 -04:00
Jonathas Costa
54a5746815
Changes in DU for have back old Stars colors and align Constellations and stars.
2019-08-22 13:02:02 -04:00
Alexander Bock
7064c02738
Merge branch 'feature/FXAA' into integration/FXAA_Vol_Milkway
2019-08-22 17:45:43 +02:00
Alexander Bock
e68de29ec6
Merge branch 'master' into integration/FXAA_Vol_Milkway
2019-08-22 17:45:20 +02:00
Alexander Bock
f7860b4311
Use the correct version number
2019-08-22 17:44:33 +02:00
Alexander Bock
6ae42d0b2f
Update version number for the release candidate
2019-08-22 17:08:53 +02:00
Alexander Bock
40545d99e5
Make Screenspace renderable work again ( closes #959 )
2019-08-22 16:31:55 +02:00
