Commit Graph

2572 Commits

Author SHA1 Message Date
Jonathas Costa f6ab44ee12 Improved previous correction. 2017-12-13 15:32:06 -05:00
Jonathas Costa 5fe200ad7f Fixed squared texture noise on surface' planets when seeing from far away. 2017-12-13 14:53:57 -05:00
Jonathas Costa 7b956aa214 Fixed bug in AMD cards. 2017-12-12 18:08:07 -05:00
Alexander Bock 7e2d6bf3ab Coding style adherence 2017-12-12 17:08:24 -05:00
Jonathas Costa 4c0f0333af New Fade-in controlled range for planes cloud. 2017-12-12 16:47:47 -05:00
Jonathas Costa 6109b0c031 New Fade-in controlled range. 2017-12-12 16:20:20 -05:00
Jonathas Costa 952f8e8e13 Merged master into NewAtmosphere. 2017-12-12 13:43:40 -05:00
Jonathas Costa 91c7395a09 Merged. 2017-12-12 13:19:17 -05:00
Alexander Bock a08c678bb0 Remove erraneous enabled OpenGL checking code
Remove warnings
Reset using the star glare texture as billboard for the Sun
2017-12-12 13:07:56 -05:00
Emil Axelsson 1926b59f91 Thread safety in torrentclient. Add syncfile to torrentsync. 2017-12-12 18:36:09 +01:00
Alexander Bock 0f0fb78a63 Cherry pick 0d83df09bf 2017-12-12 00:30:38 -05:00
Alexander Bock a631b7e0a3 Making most logger categories constexpr 2017-12-11 23:46:34 -05:00
Jonathas Costa 57abd18c80 Merge branch 'feature/NewAtmosphere' of https://github.com/OpenSpace/OpenSpace into feature/NewAtmosphere 2017-12-11 21:58:43 -05:00
Jonathas Costa 0d83df09bf Added max text size control for DU objects. 2017-12-11 21:58:33 -05:00
Alexander Bock d70078dca8 Merge branch 'master' into feature/NewAtmosphere 2017-12-11 11:22:52 -05:00
Alexander Bock 7dfa3374fc Update version number
Correctly layout tooltips in space/time widget
Fall back on old Digital Universe stars
Move settings of tooltip delay into each GuiComponent
2017-12-11 11:22:22 -05:00
Alexander Bock 2152c3ee88 Merge remote-tracking branch 'origin/master' into feature/NewAtmosphere
# Conflicts:
#	modules/imgui/src/renderproperties.cpp
2017-12-11 09:12:13 -05:00
Jonathas Costa 52da2297be Changed names in DU following Carter's asking. Fixed bug in min plane size clipping procedure. 2017-12-08 16:11:58 -05:00
Jonathas Costa b031245a19 Changed behaviou of max billboard sizes. 2017-12-08 13:03:36 -05:00
Alexander Bock 66b3117064 Add a delay to the display of tooltips (closes #426) 2017-12-08 11:37:56 -05:00
Emil Axelsson 0396832ae5 Change notification mechanisms for assets 2017-12-08 17:36:45 +01:00
Emil Axelsson 3968961434 Show resource sync progress in gui 2017-12-08 14:37:34 +01:00
Alexander Bock 0af3233f53 Move Space/Time component into simple menu version
Move regular menu to F3
Move easy menu to F2
Remove extra text
2017-12-07 17:06:55 -05:00
Emil Axelsson 4a43ca44f2 Render asset tree in gui 2017-12-07 18:44:08 +01:00
Jonathas Costa 5eb11cfc49 Merged master into NewAtmosphere. 2017-12-07 11:31:51 -05:00
Jonathas Costa 820bde4a13 Merged. 2017-12-07 11:01:35 -05:00
Jonathas Costa eb35b8420a Merge branch 'feature/NewAtmosphere' of https://github.com/OpenSpace/OpenSpace into feature/NewAtmosphere 2017-12-07 10:16:29 -05:00
Emil Axelsson f33b24d551 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-07 11:44:14 +01:00
Emil Axelsson da1a8f0796 Allow user to close asset gui window 2017-12-07 11:37:13 +01:00
Alexander Bock a406aaf039 Merge branch 'feature/guisorting'
# Conflicts:
#	modules/imgui/include/guipropertycomponent.h
#	modules/imgui/src/guipropertycomponent.cpp
2017-12-07 01:15:52 -05:00
Alexander Bock 20bdb7b2b4 Use the 4K milkyway texture on default for better performance
Make featured properties and space/time widget easy to disable
Add setting for setting the bounds of the delta time slider
Add exponent to all numerical properties and use where appropriate
Add properties to Guicomponents that collapse the title bar
Add new F2 key to only display the main property window
2017-12-07 01:05:03 -05:00
Alexander Bock 11b054b007 Move selection of Tree layout into GuiPropertyComponent property 2017-12-06 18:40:54 -05:00
Alexander Bock be98c3d784 Add TemplateProperty<std::vector<std::string>> as StringListProperty
Add default gui sorting to all scenes
2017-12-06 17:04:10 -05:00
Jonathas Costa 56854012a5 Fixed bug in local normals. 2017-12-06 12:40:33 -05:00
Emil Axelsson 79581c8556 Add lua function to set camera state without loading from file 2017-12-06 14:58:14 +01:00
Jonathas Costa 743ffb51bd Merged. 2017-12-05 11:08:12 -05:00
Jonathas Costa f698a3de09 Merged master into NewAtmosphere. 2017-12-04 12:19:40 -05:00
Jonathas Costa f2b6149787 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2017-12-04 11:16:13 -05:00
Jonathas Costa 24d3c5e8d2 Improved fade-io/out controls in GUI. Changed default behavior for unknown textures in renderable planes cloud. 2017-12-04 11:15:39 -05:00
Emil Axelsson fb675dfeab Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-04 10:52:12 +01:00
Jonathas Costa a797c2b6db Merged master into NewAtmosphere 2017-12-01 17:13:04 -05:00
Jonathas Costa bc61200724 Added missing include. 2017-12-01 15:49:52 -05:00
Jonathas Costa 8243d09188 Fixed bug in RenderablePlanesCloud and added better fade-in gui values. 2017-12-01 15:12:20 -05:00
Jonathas Costa c543d0d4bf Added fade-in/out effect for min/max billboard size. 2017-11-30 14:46:04 -05:00
Jonathas Costa 676db460cb Commented testing line. 2017-11-30 12:43:23 -05:00
Jonathas Costa ae9da60356 Improve Earth's night side. 2017-11-30 12:38:50 -05:00
Jonathas Costa 5825a94e56 Improved mesh precision. 2017-11-30 12:38:30 -05:00
Alexander Bock 38338725b9 Strict coding style adherence 2017-11-26 14:57:26 -05:00
Alexander Bock 8e0fde947d Cleanup ScreenSpaceFramebuffer (fix orientation issue)
Add Dashboard for on-screen information (#closes 201)
2017-11-26 14:46:54 -05:00
Jonathas Costa 6363fc0bb2 Added missing include and merged master into NewAtmosphere. 2017-11-25 22:39:18 -05:00