Commit Graph

4742 Commits

Author SHA1 Message Date
Alexander Bock
35d87402b7 Merge branch 'feature/rapidprototyping'
# Conflicts:
#	support/cmake/handle_applications.cmake
2017-10-23 14:44:46 -07:00
Alexander Bock
97445f4f9f Add Scaling, Rotation, and Translation that is based on evaluation of Lua scripts 2017-10-23 14:43:25 -07:00
Alexander Bock
9fe27ba0d9 Fix CMake configuration regarding application settings 2017-10-23 13:01:45 -07:00
Alexander Bock
2200692e39 Fix CMake configuration regarding application settings 2017-10-23 12:58:27 -07:00
Alexander Bock
c204a1e9f0 Make RenderableConstellationBounds not crash if the file is missing 2017-10-21 10:27:14 -04:00
Alexander Bock
e80730e9bf Fix a variety of warnings 2017-10-21 10:10:40 -04:00
Alexander Bock
008896bdd7 Only add color layers and height layers through info files if they exist 2017-10-20 17:01:44 -04:00
Alexander Bock
fc4ff258b0 Make log file links work again (thank Emil) (closes #378) 2017-10-20 11:47:48 -04:00
Alexander Bock
ca968f805c Fix Bennu mod file 2017-10-20 10:33:18 -04:00
Alexander Bock
28cb52e900 Fix Osiris-Rex scene file 2017-10-20 10:20:51 -04:00
Alexander Bock
2bfbf82403 Fix Tully download
Guard against stray .data files
2017-10-19 23:56:16 -04:00
Alexander Bock
ae51be09fd Fix download links for Digital Universe 2017-10-19 23:22:54 -04:00
Alexander Bock
b26db7548b Allow setting the default enabled state for renderables 2017-10-19 23:20:43 -04:00
Alexander Bock
4dacba868b Fix featured property display
Set correct blend mode for Themis on Mars
2017-10-19 22:52:25 -04:00
Alexander Bock
78aa164ccf Reset moon.mod 2017-10-19 15:14:04 -04:00
Alexander Bock
cbb6a6f095 Merge pull request #404 from OpenSpace/feature/libtorrent-as-submodule
Feature/libtorrent as submodule
2017-10-18 19:32:26 -04:00
Alexander Bock
2e7da84dbf Some minor ImGUI color changes 2017-10-18 19:30:32 -04:00
Alexander Bock
5a3bec253f Merge branch 'master' into feature/DU 2017-10-18 18:51:51 -04:00
Alexander Bock
4fc6f82e40 Add data files for digitaluniverse
Add files to gitignore file
2017-10-18 18:11:15 -04:00
Emil Axelsson
3307b3f3bc Update logo in Launcher 2017-10-18 17:12:30 +02:00
Emil Axelsson
7eb65c54be Guard against concurrent downloads of the same file 2017-10-18 16:57:38 +02:00
Alexander Bock
b3baf72f49 Correctly align shutdown information 2017-10-18 10:18:03 -04:00
Alexander Bock
40f52c54b0 Turn DU into a default module 2017-10-18 10:00:41 -04:00
Alexander Bock
1c61f56043 Various Mac related fixes 2017-10-18 09:58:12 -04:00
Emil Axelsson
1862b804a9 Use libtorrent as a git submodule. Support base library functions in Lua execution of the Launcher. 2017-10-18 14:47:01 +02: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
Alexander Bock
d628c1a667 Merge branch 'master' into feature/DU
# Conflicts:
#	data/scene/grids/grids.mod
#	ext/sgct
2017-10-17 17:09:37 -04:00
Alexander Bock
9a81b311f0 Generalize blending layer specification in default.scene
Make Utah server the default for WAC on Moon
2017-10-17 17:03:45 -04:00
Emil Axelsson
ed89587487 Remove libtorrent from repository 2017-10-17 14:20:55 +02:00
Alexander Bock
bc492d47bd Update version number 2017-10-16 17:13:44 -04:00
Alexander Bock
f8754115eb Various cleanup 2017-10-16 17:11:28 -04:00
Alexander Bock
b3a2cebaa6 Fix more GuiPaths 2017-10-16 16:51:35 -04:00
Alexander Bock
a303bf3aa8 Fix for mission visualization
Change default monospaced font
2017-10-16 16:27:32 -04:00
Alexander Bock
7520edab83 Added first version of mission visualization 2017-10-16 10:23:00 -04:00
Alexander Bock
cf01749e83 Simplify property tree if a tree node only has a single child and no scenegraph nodes 2017-10-13 19:32:54 -04:00
Alexander Bock
89cdd6103d Update Juno mission 2017-10-13 16:51:26 -04:00
Alexander Bock
bb5f4d4381 Rename GuiGrouping to GuiPath
Add GuiPath to existing scenegraph nodes
Add option to toggle tree representation
Add caption font to UI
2017-10-13 13:08:59 -04:00
Alexander Bock
ebd506975c Added initial scenegraph node grouping support 2017-10-13 00:17:28 -04:00
Jonathas Costa
27e6043857 Removed unused code. 2017-10-12 22:06:42 -04:00
Jonathas Costa
d545042b9c Updated fade-out of Milkyway. 2017-10-12 22:05:48 -04:00
Jonathas Costa
41bcfd91d7 Enabled caching for billboard clouds and removed debugging code. 2017-10-12 15:46:56 -04:00
Alexander Bock
f1fd2b1960 Add window to show featured scenegraph nodes 2017-10-12 12:13:55 -04:00
Jonathas Costa
75783a5352 Fixing cache system for DU files. 2017-10-11 18:20:38 -04:00
Jonathas Costa
7ff8064ef2 Improved grid rendering for DU meshes. 2017-10-11 17:02:39 -04:00
Alexander Bock
327779d88f Implemented Space/Time ImGui widget 2017-10-11 15:58:41 -04:00
Jonathas Costa
a5243cf4d1 Added luminosity/size and slum controls by datavar in plane clouds. 2017-10-11 14:51:26 -04:00
Alexander Bock
d97cfbe829 Change ImGUI look and feel
Add Arimo font to be used in UI
2017-10-11 10:54:19 -04:00
Alexander Bock
5ccc200258 Fix loading of RGB screenspace images 2017-10-11 09:13:20 -04:00
Alexander Bock
06550ea42f Add support for OpenGL 4.6
Compile fix in rawvolumewriter
2017-10-11 09:05:10 -04:00