eb53d41cc2
Added keycommands for wow-room demo
2019-09-09 09:01:34 -04:00
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
3c35c8d246
Merged with master branch, date of master branch 4/9/2019
2019-09-06 08:14:55 -04:00
58b93cda23
change polarity fl colors and add option (in comments) for white and gray texture
2019-09-04 15:48:02 -04:00
7e5b0ca105
variablename
2019-09-04 14:35:42 -04:00
067fca0ff1
suntexture manager now takes wsa and makes it black, blue and red
2019-09-04 14:34:54 -04:00
d45c167b95
Auto stash before merge of "thesis/2019/spaceweather-stream" and "origin/thesis/2019/spaceweather-stream"
2019-08-28 16:37:25 -04:00
19d99c6332
Auto stash before merge of "thesis/2019/spaceweather-stream" and "origin/thesis/2019/spaceweather-stream"
2019-08-28 16:29:43 -04:00
14d3372932
Merge remote-tracking branch 'origin/thesis/2019/spaceweather-stream' into thesis/2019/spaceweather-stream
2019-08-28 15:38:12 -04:00
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
ae58cdc093
Merged
2019-08-22 17:35:19 -04:00
7064c02738
Merge branch 'feature/FXAA' into integration/FXAA_Vol_Milkway
2019-08-22 17:45:43 +02:00
071d4af9dc
Remove warnings duplicating property initialization for renderabletrails
2019-08-22 16:09:54 +02:00
21d799dd29
Force an even number of vertices for the RenderableSpheres ( closes #957 )
2019-08-22 09:31:07 +02:00
8e76c5648b
Added check to suntexturemanager, to see if the server is online(has to be made general in the future, currently specific with the local server)
2019-08-21 13:01:27 -04:00
b51eb799a5
Clean up and re-nameing.
2019-08-21 11:25:38 -04:00
33ce712e3a
Fixed Model rendering to work with the new HDR.
2019-08-20 15:34:48 -04:00
2806935c64
Merge pull request #943 from OpenSpace/feature/hdrOS
...
HDR Rendering Branch
2019-08-20 02:05:42 -06:00
ed6082aace
Some smaller fixes
2019-08-20 10:04:20 +02:00
c01e59635c
Restored ability to change trail colors in satellite asset files.
2019-08-15 08:51:18 -06:00
b99389ae30
Fixed problem with satellite trails rendered at a time prior to TLE epoch. Also debris added shader files to CMake file for space module.
2019-08-14 16:07:14 -06:00
ba07837865
Merge branch 'thesis/2019/spaceDebris' into feature/satellitesgroupednodes
2019-08-13 09:56:51 -06:00
1cba7e1d88
Render trails last
2019-08-13 11:57:08 +02:00
904811f60d
Small cleanup
2019-08-13 11:28:33 +02:00
3a0b5f0c15
Changed rendering order back for orbits and other improvements.
2019-08-01 12:20:36 -04:00
482631aa54
Fixed failed merging of master.
2019-07-31 15:05:52 -04:00
c7c8375ca0
Coding style fixes
2019-07-31 11:13:29 +02:00
029e67797f
merging
2019-07-22 16:25:47 -06:00
46c22488d7
wrapping up thesis project 2019 space debris
2019-07-22 16:16:21 -06:00
67ba8a14dc
Fixed problems after merging master into this branch.
2019-07-22 17:52:30 -04:00
a6b90991b2
Merging Master
2019-07-22 16:47:58 -04:00
8f112fa219
Compile and runtime fixes when running in Debug
...
Do not crash if ScreenSpaceLocalImage does not exist
Add ability to specify identifier/name when adding screenspace items in the UI
2019-07-22 14:14:12 +02:00
e3378bc615
Final Merge
2019-07-19 10:09:03 -06:00
9934fc03b9
Fix scaling issue with screenspace renderables ( #939 )
2019-07-19 11:09:04 +02:00
277aee5c0c
Make constructor of Time explicit
...
Module breaking change
2019-07-17 15:39:43 +02:00
c97d5126ec
Feature/timeline translation ( #931 )
...
* Work on timeline translations
* Add Apollo 11 Descent data
* Ability to display negative altitudes
* Expose globe translation properties
* Added timeline rotation, and some scene updates.
* Cleaning up apollo_sites scene; fixing boulder 1 in place to adress heightmap issue
* Use quaternion slerp instaet of linear interpolation + Cleanup
* Change to old lem model while waiting for new version to be pushed to data repo
* Small fixes
2019-07-17 15:21:13 +02:00
0f09c36aa2
Bring back changes for transparency and added new error protection for big components.
2019-07-15 10:31:08 -04:00
e9fdd31c56
Feature/flying fixes ( #924 )
...
* Removing various warnings
* Fix the rendering of the touchbar on Mac
* More warnings
* Add ghoul deinitialize
* Update SGCT repository
2019-07-04 09:28:42 +02:00
8764ff9c0c
downloads initial dataset
2019-07-01 16:25:10 -04:00
561bcd4a0f
double jinx
2019-06-26 11:27:16 -04:00
3f3fb09d80
n00bs be trippin'
2019-06-26 11:20:12 -04:00
65a0c17a09
resolved conflicts
2019-06-26 09:02:43 -04:00
1dbb0b5b29
Added direction to fl-shader, to be able to have different directions in field lines
2019-06-26 08:58:20 -04:00
d3bb858a41
create base for new class
2019-06-21 15:28:10 -04:00
6b5ce52173
Merged master. It broke the bloom filter.
2019-06-19 20:47:37 -04:00
de55212c8d
fixed unordered map bug
2019-06-18 14:53:07 -04:00
d0c04cfc6b
Various code cleanup
2019-06-18 10:47:15 +02:00
bd9c8be95d
Introduced new member variable to suntexturemanager, that keeps the direction that the user of openspace is moving in
2019-06-11 09:47:36 -04:00
027fb1ae56
Solved merge conflicts
2019-06-07 16:14:44 -04:00
6d9c4db8e1
Added a check to only apply a texture once that timeframe has been passed
2019-06-07 16:01:18 -04:00
Kollberg