Jonathas Costa
|
0264a3026c
|
Merged master into NewAtmosphere.
|
2017-11-15 18:12:58 -05:00 |
|
Jonathas Costa
|
929bd9ae05
|
Merged.
|
2017-11-09 15:46:46 -05:00 |
|
Alexander Bock
|
acdfefe46d
|
Merge branch 'master' into feature/loadingscreen-refactor
# Conflicts:
# modules/base/rendering/renderabletrailorbit.h
# modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
# modules/digitaluniverse/rendering/renderableplanescloud.cpp
# modules/digitaluniverse/rendering/renderablepoints.cpp
# modules/galaxy/rendering/renderablegalaxy.cpp
# modules/galaxy/rendering/renderablegalaxy.h
# modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
# modules/kameleonvolume/rendering/renderablekameleonvolume.h
# modules/spacecraftinstruments/rendering/renderablefov.h
# modules/spacecraftinstruments/rendering/renderableplaneprojection.h
# modules/toyvolume/rendering/renderabletoyvolume.cpp
# modules/toyvolume/rendering/renderabletoyvolume.h
# modules/volume/rendering/renderabletimevaryingvolume.cpp
# modules/volume/rendering/renderabletimevaryingvolume.h
|
2017-11-08 19:10:59 -06:00 |
|
Alexander Bock
|
b50b52d351
|
Cleanup for coding style
Add strict mode to check_style_guide script
|
2017-11-08 10:35:39 -06:00 |
|
Alexander Bock
|
80f5706049
|
Remove warnings on Clang
|
2017-11-07 09:19:45 -06:00 |
|
Alexander Bock
|
78e3320cde
|
Separate Renderable::initialize into initialize and initializeGL functions
Handle initialize in a separate thread and display rudimentary loading screen
|
2017-11-02 14:27:35 -04:00 |
|
Jonathas Costa
|
4194395e7e
|
Fixed DU meshes g-buffer.
|
2017-10-30 13:24:56 -04:00 |
|
Alexander Bock
|
e80730e9bf
|
Fix a variety of warnings
|
2017-10-21 10:10:40 -04:00 |
|
Alexander Bock
|
1c61f56043
|
Various Mac related fixes
|
2017-10-18 09:58:12 -04:00 |
|
Alexander Bock
|
7377d63794
|
Clean up digitaluniverse data folder
Add mod files
Add Moon WAC wms file
|
2017-10-17 21:36:54 -04:00 |
|
Alexander Bock
|
791a3c5e20
|
Fix indentation
|
2017-10-17 18:56:08 -04:00 |
|
Jonathas Costa
|
7ff8064ef2
|
Improved grid rendering for DU meshes.
|
2017-10-11 17:02:39 -04:00 |
|
Jonathas Costa
|
d67a89a6ed
|
Fixed alignment problem in AMNH dome. Added dedbug code for testing the fix on the dome.
|
2017-10-10 15:24:50 -04:00 |
|
Jonathas Costa
|
f1135afdea
|
Fixed bug in DU mesh rendering.
|
2017-10-09 11:32:19 -04:00 |
|
Jonathas Costa
|
00757ec692
|
Added missing files. Fixed color in renderable du meshes.
|
2017-10-09 08:38:21 -04:00 |
|
Jonathas Costa
|
f510b4f8cb
|
Finished du meshes. Added constellations.
|
2017-10-08 17:16:55 -04:00 |
|
Jonathas Costa
|
4ab735b883
|
Adding DU meshes.
|
2017-10-08 16:42:09 -04:00 |
|
Jonathas Costa
|
e7f2f22f3d
|
DU branch Quasar and WMAP.
|
2017-09-12 12:58:42 -04:00 |
|