50fd9309ba
Merge branch 'master' into feature/NewAtmosphere
...
# Conflicts:
# src/rendering/renderengine.cpp
2017-10-24 15:30:22 -04:00
a599516f2c
Merge pull request #408 from OpenSpace/feature/various-fixes
...
Feature/various fixes
* Remove runTime from OpenSpaceEngine and place in WindowWrapper instead
* Add the ability to remove Tags
* Add display for current time and ability to return to today to the sp… …
* Clean up RenderEngine
* Remove unused shaders
* Add Lua method to check whether a scenegraphnode is present in the scene …
* Make use of the function to guard mark_interesting_nodes against a nonexisting scenegraph node
2017-10-24 10:33:39 -07:00
a1b2695765
Add Lua method to check whether a scenegraphnode is present in the scene
...
Make use of the function to guard mark_interesting_nodes against a nonexisting scenegraph node
2017-10-24 03:41:02 -07:00
1c2622248c
Remove unused shaders
2017-10-24 03:35:41 -07:00
9b6028028a
Clean up RenderEngine
2017-10-24 03:16:29 -07:00
10bcd9a3d3
Add display for current time and ability to return to today to the space/time component
2017-10-24 02:53:51 -07:00
5a9ebe552b
Add the ability to remove Tags
2017-10-24 01:47:14 -07:00
269dda8aff
Remove runTime from OpenSpaceEngine and place in WindowWrapper instead
2017-10-24 01:33:53 -07:00
c2724ad228
Merge pull request #407 from OpenSpace/feature/newlicense
...
Add SceneLicense information to the Scene
2017-10-23 21:24:43 -04:00
eaca6c7487
Add SceneLicense information to the Scene
...
Add documentation generator to SceneLicense
2017-10-23 18:11:09 -07:00
35d87402b7
Merge branch 'feature/rapidprototyping'
...
# Conflicts:
# support/cmake/handle_applications.cmake
2017-10-23 14:44:46 -07:00
97445f4f9f
Add Scaling, Rotation, and Translation that is based on evaluation of Lua scripts
2017-10-23 14:43:25 -07:00
9fe27ba0d9
Fix CMake configuration regarding application settings
2017-10-23 13:01:45 -07:00
2200692e39
Fix CMake configuration regarding application settings
2017-10-23 12:58:27 -07:00
c204a1e9f0
Make RenderableConstellationBounds not crash if the file is missing
2017-10-21 10:27:14 -04:00
e80730e9bf
Fix a variety of warnings
2017-10-21 10:10:40 -04:00
008896bdd7
Only add color layers and height layers through info files if they exist
2017-10-20 17:01:44 -04:00
a5bcae6d67
Merge branch 'master' into feature/NewAtmosphere
2017-10-20 11:53:34 -04:00
fc4ff258b0
Make log file links work again (thank Emil) ( closes #378 )
2017-10-20 11:47:48 -04:00
518abc5f87
Merge branch 'master' into feature/NewAtmosphere
...
# Conflicts:
# data/scene/default.scene
# data/scene/digitaluniverse/tully/tully.data
2017-10-20 10:42:18 -04:00
ca968f805c
Fix Bennu mod file
2017-10-20 10:33:18 -04:00
28cb52e900
Fix Osiris-Rex scene file
2017-10-20 10:20:51 -04:00
2bfbf82403
Fix Tully download
...
Guard against stray .data files
2017-10-19 23:56:16 -04:00
ae51be09fd
Fix download links for Digital Universe
2017-10-19 23:22:54 -04:00
b26db7548b
Allow setting the default enabled state for renderables
2017-10-19 23:20:43 -04:00
a554580723
Fix Tully download file
2017-10-19 22:53:36 -04:00
4dacba868b
Fix featured property display
...
Set correct blend mode for Themis on Mars
2017-10-19 22:52:25 -04:00
dc0dbde93d
Merge branch 'master' into feature/NewAtmosphere
2017-10-19 15:14:35 -04:00
78aa164ccf
Reset moon.mod
2017-10-19 15:14:04 -04:00
f3bea7455d
Fixed Tully wrong scale for galaxies pics.
2017-10-19 14:49:01 -04:00
1aa66e934c
New Ghoul reference.
2017-10-19 14:30:13 -04:00
637e74a9dc
Merged master into NewAtmosphere.
2017-10-19 14:23:06 -04:00
ccb76b91da
Fixed transformation matrix in DU.
2017-10-19 14:18:04 -04:00
1f5eb36c48
Change shadow group name.
2017-10-19 11:44:38 -04:00
a925d0646a
Added lunar eclipses back.
2017-10-19 11:41:36 -04:00
55d71af9a4
Fixed double declaration of style variable.
2017-10-18 21:46:20 -04:00
6638fb52d0
Merge branch 'master' of https://github.com/OpenSpace/OpenSpace
2017-10-18 20:31:40 -04:00
6fdb587cca
Fixed precision issue in eclipses. Removed unused code for atm with renderableplanets.
2017-10-18 20:29:52 -04:00
cbb6a6f095
Merge pull request #404 from OpenSpace/feature/libtorrent-as-submodule
...
Feature/libtorrent as submodule
2017-10-18 19:32:26 -04:00
2e7da84dbf
Some minor ImGUI color changes
2017-10-18 19:30:32 -04:00
5a3bec253f
Merge branch 'master' into feature/DU
2017-10-18 18:51:51 -04:00
4fc6f82e40
Add data files for digitaluniverse
...
Add files to gitignore file
2017-10-18 18:11:15 -04:00
3307b3f3bc
Update logo in Launcher
2017-10-18 17:12:30 +02:00
7eb65c54be
Guard against concurrent downloads of the same file
2017-10-18 16:57:38 +02:00
b3baf72f49
Correctly align shutdown information
2017-10-18 10:18:03 -04:00
40f52c54b0
Turn DU into a default module
2017-10-18 10:00:41 -04:00
1c61f56043
Various Mac related fixes
2017-10-18 09:58:12 -04:00
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
b91a826d70
Added Eclipses for NewAtmosphere (Missing change spaces for precision).
2017-10-18 02:09:14 -04:00
7377d63794
Clean up digitaluniverse data folder
...
Add mod files
Add Moon WAC wms file
2017-10-17 21:36:54 -04:00
Alexander Bock