cb07af4a2b
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-10 16:07:58 +01:00
afa1d6d33e
Add strict test for whitespace at end of line
...
More work on coding style
2017-11-09 23:47:51 -05:00
aa20c677dd
Move onscreen rendering into SGCT's render2D function ( closes #181 )
...
Same fix makes GUI windows work again (closes #412 )
2017-11-09 18:12:13 -05:00
b50b52d351
Cleanup for coding style
...
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06:00
80f5706049
Remove warnings on Clang
2017-11-07 09:19:45 -06:00
157d91d631
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-10-26 13:43:49 +02: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
e80730e9bf
Fix a variety of warnings
2017-10-21 10:10:40 -04:00
4dacba868b
Fix featured property display
...
Set correct blend mode for Themis on Mars
2017-10-19 22:52:25 -04:00
78aa164ccf
Reset moon.mod
2017-10-19 15:14:04 -04:00
27dea20520
Work on asset loading
2017-10-19 13:24:21 +02:00
97f78a09df
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-10-19 10:27:34 +02:00
2e7da84dbf
Some minor ImGUI color changes
2017-10-18 19:30:32 -04:00
f8754115eb
Various cleanup
2017-10-16 17:11:28 -04:00
a303bf3aa8
Fix for mission visualization
...
Change default monospaced font
2017-10-16 16:27:32 -04:00
7520edab83
Added first version of mission visualization
2017-10-16 10:23:00 -04:00
2623912ec9
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-10-16 11:07:24 +02:00
cf01749e83
Simplify property tree if a tree node only has a single child and no scenegraph nodes
2017-10-13 19:32:54 -04:00
bb5f4d4381
Rename GuiGrouping to GuiPath
...
Add GuiPath to existing scenegraph nodes
Add option to toggle tree representation
Add caption font to UI
2017-10-13 13:08:59 -04:00
ebd506975c
Added initial scenegraph node grouping support
2017-10-13 00:17:28 -04:00
f1fd2b1960
Add window to show featured scenegraph nodes
2017-10-12 12:13:55 -04:00
327779d88f
Implemented Space/Time ImGui widget
2017-10-11 15:58:41 -04:00
d97cfbe829
Change ImGUI look and feel
...
Add Arimo font to be used in UI
2017-10-11 10:54:19 -04:00
aa969795cc
Factor ScreenSpaceImage into separate classes for local loading and online download ( closes #296 )
2017-10-10 14:16:55 -04:00
16a865337e
Fix compile error in GlobeBrowsing module without GDAL ( closes #396 )
2017-09-30 15:47:11 -06:00
8a30251fcb
Work on asset management
2017-09-18 12:56:55 +02:00
bf45937619
Compile fix in asset and assetloader
2017-09-15 11:13:46 +02:00
4cdae984e9
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-09-11 11:52:31 +02:00
222bbe22ab
Feature/gb gui ( #390 )
...
Implemented new GUI component to handle WMS servers
* Add Lua scripts to support adding GIBS datasets (closes #222 )
* Add Lua function to load WMS servers from a predefined file
* Workaround for Visual Studio 15.3 compile fix in Windows headers
* Initial support for parsing GetCapabilities file and automatically add layers
* Add a Trigger property to remove a layer
* Support default servers
* Add default file
* Move WMS server code from GUI component into GlobeBrowsingModule
* Add Lua scripts for loading and removing WMS servers
Automatically load default servers on startup
* Reset tile provider before removing a layer tolimit the crash risk
Add "From focus" button to switch globebrowsing gui to the same node as the focus
* Remove warnings
Remove compile error with nonexisting GDALOpenEx function
2017-08-19 20:23:08 -04:00
2426545a05
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
...
Conflicts:
src/rendering/renderengine.cpp
src/scene/scene.cpp
src/scene/sceneloader.cpp
tests/test_concurrentjobmanager.inl
tests/test_concurrentqueue.inl
tests/test_sceneloader.inl
2017-08-15 11:43:18 +02:00
ae06112fdc
Fix coding style issues
2017-08-14 13:49:13 -04:00
c275b2f833
Feature/cmake cleanup ( #381 )
...
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31 )
* Cleaning up CMake files
* Restructure application specification
* Add parameter for library mode to all modules
* Add functions to handle global variable state
* Misc/remove warnings (#383 )
* Increase build timeout and do a clean rebuild every commit
2017-08-14 09:38:32 -04:00
Emil Axelsson