db668b5342
Some changes to PR #432
2017-12-18 16:25:02 -05:00
a3185a0cfa
Merge branch 'master' into feature/NewAtmosphere
...
# Conflicts:
# modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
2017-12-18 14:49:08 -05:00
966df322cf
Added additional absPath where necessary
2017-12-18 14:47:58 -05:00
5ad7fa94f3
Merge branch 'master' into feature/NewAtmosphere
2017-12-18 12:21:08 -05:00
0b0ad54028
Reenable digital universe on default
...
Fix refresh rate setting in configuration_helper
2017-12-18 11:58:22 -05:00
8230e8d1e5
Add preprocessor flag
2017-12-18 17:50:07 +01:00
ef2633980b
Allow sync module to be compiled without libtorrent
2017-12-18 17:36:52 +01:00
c7a784f01e
Updated absPath in shaders compilation.
2017-12-18 10:26:26 -05:00
90243cf388
Improve loading screen
2017-12-18 15:00:57 +01:00
d4278f9adc
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-12-17 18:30:00 +01:00
df259f6d02
Multithreaded scene initialization
2017-12-17 17:34:46 +01:00
7cc05ba2e0
More code cleanup
2017-12-16 15:37:46 +01:00
84dfbe7b80
Clean up asset related code
2017-12-16 12:51:46 +01:00
61b2c82b92
Improved code.
2017-12-15 13:21:14 -05:00
603078af53
Add sync task
2017-12-15 13:28:24 +01:00
75cf6dcf71
Asset work in progress
2017-12-15 13:21:10 +01:00
eead4b7f25
Merged master into NewAtmosphere.
2017-12-14 15:55:27 -05:00
f78c10168f
Merge branch 'master' of https://github.com/OpenSpace/OpenSpace
2017-12-14 11:23:30 -05:00
23a446cb2c
Update Ghoul repository
...
Adapt to changes that absPath is not called automatically as often anymore
Remove atmosphereearth.scene
2017-12-13 21:55:29 -05:00
167222c814
Feature/dashboard ( #431 )
...
Merging Dashboard branch that introduces the Dashboard, DashboardItem and moves most of the screen rendering code into a component-based layout that can also be displayed as a screenspace renderable
* Add Onscreen Dashboard
* Add Dashboard class
* Add DashboardItem classes and subclasses
* Added font and fontsize customization to dashboarditems
* Add default dashboard specifications to all scenes
* Add tests.scene to test dashboard items
* Add configuration options to DashboardItemDistance
* Fix distance conversion to correctly use singular or plural values
* Make DashboardItems unique when adding them to a dashboard
* Correctly position test with different font sizes
* Add Dashboard Item that enables spacing between other items
* Add performance measurement to dashboard rendering
* Add method to DashboardItemDistance that computes distance to surface
* Add DashboardItemAngle that computes and prints the angle between three objects
* Add DashboardItemInstruments that shows the instruments on New Horizons
* Add ability to OpenSpaceModules to return a list of Luascripts defined by child objects
* Make it possible for ScreenSpaceDashboard to work with its own dashboard or the main one
2017-12-13 17:11:54 -05:00
f6ab44ee12
Improved previous correction.
2017-12-13 15:32:06 -05:00
5fe200ad7f
Fixed squared texture noise on surface' planets when seeing from far away.
2017-12-13 14:53:57 -05:00
7b956aa214
Fixed bug in AMD cards.
2017-12-12 18:08:07 -05:00
7e2d6bf3ab
Coding style adherence
2017-12-12 17:08:24 -05:00
4c0f0333af
New Fade-in controlled range for planes cloud.
2017-12-12 16:47:47 -05:00
6109b0c031
New Fade-in controlled range.
2017-12-12 16:20:20 -05:00
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
Alexander Bock