952f8e8e13
Merged master into NewAtmosphere.
2017-12-12 13:43:40 -05:00
91c7395a09
Merged.
2017-12-12 13:19:17 -05:00
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
1926b59f91
Thread safety in torrentclient. Add syncfile to torrentsync.
2017-12-12 18:36:09 +01:00
0f0fb78a63
Cherry pick 0d83df09bf
2017-12-12 00:30:38 -05:00
a631b7e0a3
Making most logger categories constexpr
2017-12-11 23:46:34 -05:00
57abd18c80
Merge branch 'feature/NewAtmosphere' of https://github.com/OpenSpace/OpenSpace into feature/NewAtmosphere
2017-12-11 21:58:43 -05:00
0d83df09bf
Added max text size control for DU objects.
2017-12-11 21:58:33 -05:00
d70078dca8
Merge branch 'master' into feature/NewAtmosphere
2017-12-11 11:22:52 -05:00
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
2152c3ee88
Merge remote-tracking branch 'origin/master' into feature/NewAtmosphere
...
# Conflicts:
# modules/imgui/src/renderproperties.cpp
2017-12-11 09:12:13 -05:00
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
b031245a19
Changed behaviou of max billboard sizes.
2017-12-08 13:03:36 -05:00
66b3117064
Add a delay to the display of tooltips ( closes #426 )
2017-12-08 11:37:56 -05:00
0396832ae5
Change notification mechanisms for assets
2017-12-08 17:36:45 +01:00
3968961434
Show resource sync progress in gui
2017-12-08 14:37:34 +01:00
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
4a43ca44f2
Render asset tree in gui
2017-12-07 18:44:08 +01:00
5eb11cfc49
Merged master into NewAtmosphere.
2017-12-07 11:31:51 -05:00
820bde4a13
Merged.
2017-12-07 11:01:35 -05:00
eb35b8420a
Merge branch 'feature/NewAtmosphere' of https://github.com/OpenSpace/OpenSpace into feature/NewAtmosphere
2017-12-07 10:16:29 -05:00
f33b24d551
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-12-07 11:44:14 +01:00
da1a8f0796
Allow user to close asset gui window
2017-12-07 11:37:13 +01:00
a406aaf039
Merge branch 'feature/guisorting'
...
# Conflicts:
# modules/imgui/include/guipropertycomponent.h
# modules/imgui/src/guipropertycomponent.cpp
2017-12-07 01:15:52 -05:00
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
11b054b007
Move selection of Tree layout into GuiPropertyComponent property
2017-12-06 18:40:54 -05:00
be98c3d784
Add TemplateProperty<std::vector<std::string>> as StringListProperty
...
Add default gui sorting to all scenes
2017-12-06 17:04:10 -05:00
56854012a5
Fixed bug in local normals.
2017-12-06 12:40:33 -05:00
79581c8556
Add lua function to set camera state without loading from file
2017-12-06 14:58:14 +01:00
743ffb51bd
Merged.
2017-12-05 11:08:12 -05:00
f698a3de09
Merged master into NewAtmosphere.
2017-12-04 12:19:40 -05:00
f2b6149787
Merge branch 'master' of https://github.com/OpenSpace/OpenSpace
2017-12-04 11:16:13 -05:00
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
fb675dfeab
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-12-04 10:52:12 +01:00
a797c2b6db
Merged master into NewAtmosphere
2017-12-01 17:13:04 -05:00
bc61200724
Added missing include.
2017-12-01 15:49:52 -05:00
8243d09188
Fixed bug in RenderablePlanesCloud and added better fade-in gui values.
2017-12-01 15:12:20 -05:00
c543d0d4bf
Added fade-in/out effect for min/max billboard size.
2017-11-30 14:46:04 -05:00
676db460cb
Commented testing line.
2017-11-30 12:43:23 -05:00
ae9da60356
Improve Earth's night side.
2017-11-30 12:38:50 -05:00
5825a94e56
Improved mesh precision.
2017-11-30 12:38:30 -05:00
38338725b9
Strict coding style adherence
2017-11-26 14:57:26 -05:00
8e0fde947d
Cleanup ScreenSpaceFramebuffer (fix orientation issue)
...
Add Dashboard for on-screen information (#closes 201)
2017-11-26 14:46:54 -05:00
6363fc0bb2
Added missing include and merged master into NewAtmosphere.
2017-11-25 22:39:18 -05:00
bb805c1baf
Merged.
2017-11-25 21:10:59 -05:00
026f51735b
Show distance from current focus object
...
Add conversions for time and space to show distance and delta time in manageable units
Remove warnings
Add deinitializeGL call to Renderengine
2017-11-25 18:30:13 -05:00
182694422e
Per default set the length of Uranus to a shorter value to allow for earlier time jumps with exceeding the spice kernel range
...
Set correct min/max values for static rotations
Enable rendering of matrix properties in ImGUI
2017-11-24 15:31:19 -05:00
55afc617f3
Let performance measurement consume mouse events
2017-11-24 12:13:39 -05:00
13aebb78b2
Do not assume that string propeties are file paths. Fix proper escaping in lua script generation. ( #422 )
2017-11-24 11:01:19 -05:00
0c18263de7
Issue/417 ( #421 )
...
Added support for multiple windows in ImGui
2017-11-24 11:00:53 -05:00
Jonathas Costa