Commit Graph

4763 Commits

Author SHA1 Message Date
Alexander Bock
b50b52d351 Cleanup for coding style
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06:00
Emil Axelsson
d94408224c Compile fix for Windows 2017-11-07 18:04:35 +01:00
Alexander Bock
80f5706049 Remove warnings on Clang 2017-11-07 09:19:45 -06:00
Emil Axelsson
3d9481a4fc Make screen log thread safe 2017-11-07 00:14:50 +01:00
Emil Axelsson
81e81d04e4 Force Cmake flags for Libtorrent 2017-11-05 20:04:01 +01:00
Alexander Bock
7ab79ce687 Update Digital Universe stars 2017-11-04 09:45:10 -04:00
Alexander Bock
ca69408366 Enable minimum picking distance in NDC 2017-11-02 12:05:09 -04:00
Alexander Bock
4a449f3668 Update starlabels.data file 2017-11-02 12:05:04 -04:00
Alexander Bock
3ea8f0e129 Add constellation files to GitIgnore
Add spherical mirror configuration file
Add the Spout output configration file
2017-10-31 08:12:27 -04:00
Alexander Bock
0f8adec9aa Show on-screen information about friction status 2017-10-30 14:28:03 -04:00
Alexander Bock
a2e7614112 Update Ghoul
Fix AssImp CMake warnings
2017-10-30 09:49:10 -04:00
Alexander Bock
fc78360374 Update Ghoul to fix Assimp to run in OSX with a native Assimp library 2017-10-26 14:03:24 -04:00
Alexander Bock
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
Alexander Bock
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
Alexander Bock
1c2622248c Remove unused shaders 2017-10-24 03:35:41 -07:00
Alexander Bock
9b6028028a Clean up RenderEngine 2017-10-24 03:16:29 -07:00
Alexander Bock
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
Alexander Bock
5a9ebe552b Add the ability to remove Tags 2017-10-24 01:47:14 -07:00
Alexander Bock
269dda8aff Remove runTime from OpenSpaceEngine and place in WindowWrapper instead 2017-10-24 01:33:53 -07:00
Alexander Bock
c2724ad228 Merge pull request #407 from OpenSpace/feature/newlicense
Add SceneLicense information to the Scene
2017-10-23 21:24:43 -04:00
Alexander Bock
eaca6c7487 Add SceneLicense information to the Scene
Add documentation generator to SceneLicense
2017-10-23 18:11:09 -07:00
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