mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-03 19:08:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,513 Commits 84 Branches 46 Tags
d4e7885a71ae3f750d46efac5aeb02bf169cd71e
Commit Graph

6513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alexander Bock
071d4af9dc Remove warnings duplicating property initialization for renderabletrails 2019-08-22 16:09:54 +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
Alexander Bock
d32b4d9f1f Update Ghoul to fix the commandline parsing (closes #950) 2019-08-22 14:34:45 +02:00
Emil Axelsson
3fd6cd5ae6 Update webgui 2019-08-22 13:55:06 +02:00
Emil Axelsson
13cb950480 Fix bug with camera following anchor node 2019-08-22 10:29:03 +02:00
Alexander Bock
0f36cf0dd4 Always add transformation property owners, even if the defaults are not overwritten 2019-08-22 09:52:35 +02:00
Alexander Bock
5675a495b0 GCC compile fix 2019-08-22 09:39:01 +02:00
Alexander Bock
21d799dd29 Force an even number of vertices for the RenderableSpheres (closes #957) 2019-08-22 09:31:07 +02:00
Jonathas Costa
38ae383db9 Merge branch 'feature/FXAA' of https://github.com/OpenSpace/OpenSpace into feature/FXAA 2019-08-21 11:25:42 -04:00
Jonathas Costa
b51eb799a5 Clean up and re-nameing. 2019-08-21 11:25:38 -04:00
Alexander Bock
9d2d3d8a83 Merge branch 'master' into feature/FXAA 2019-08-21 15:58:02 +02:00
Alexander Bock
dd76a9bd7b Improve information presented for current frame number in stereo mode and when swap groups are used 2019-08-21 15:57:29 +02:00
eriksunden
8bfea472d5 Increased shine of galaxy stars to match volume nicer. 2019-08-21 10:23:18 +02:00
Jonathas Costa
33ce712e3a Fixed Model rendering to work with the new HDR. 2019-08-20 15:34:48 -04:00
Alexander Bock
dfd85fddb6 Merge branch 'feature/FXAA' into integration/FXAA_Vol_Milkway 2019-08-20 14:49:31 +02:00
Alexander Bock
aa3ac0e3f2 Merge branch 'master' into feature/FXAA 
# Conflicts:
#	include/openspace/rendering/framebufferrenderer.h
#	include/openspace/rendering/renderer.h
#	src/rendering/framebufferrenderer.cpp
 2019-08-20 14:47:01 +02:00
eriksunden
7509d1abd6 Proper discard of stars if the volume is not visible. 2019-08-20 10:59:42 +02:00
Alexander Bock
2806935c64 Merge pull request #943 from OpenSpace/feature/hdrOS 
HDR Rendering Branch
 2019-08-20 02:05:42 -06:00
Alexander Bock
ed6082aace Some smaller fixes 2019-08-20 10:04:20 +02:00
Alexander Bock
223d6a8903 Hide error in webgui deinitialization 2019-08-20 09:31:07 +02:00