Emil Axelsson
|
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 |
|
Alexander Bock
|
0c18263de7
|
Issue/417 (#421)
Added support for multiple windows in ImGui
|
2017-11-24 11:00:53 -05:00 |
|
Alexander Bock
|
719130b6b7
|
Jenkinswarnings (#419)
* Remove more warnings
* Removing more warnings
* More warning fixes
* More warnings
* More warnings
* Update ghoul
|
2017-11-16 21:19:28 -05:00 |
|
Emil Axelsson
|
f3aeecaf23
|
Callbacks for asset state changes
|
2017-11-17 00:15:54 +01:00 |
|
Emil Axelsson
|
436062381e
|
Asset loading and synchronization
|
2017-11-16 19:29:45 +01:00 |
|
Alexander Bock
|
0ff9c93512
|
Enable the disabling of Tooltips in ImGUI
|
2017-11-16 09:06:17 -05:00 |
|
Jonathas Costa
|
0264a3026c
|
Merged master into NewAtmosphere.
|
2017-11-15 18:12:58 -05:00 |
|
Emil Axelsson
|
6b182bdfad
|
Start with Gui for assets
|
2017-11-15 09:40:37 +01:00 |
|
Emil Axelsson
|
62f58a9749
|
Start on asset gui
|
2017-11-14 20:46:03 +01:00 |
|
Alexander Bock
|
3a7f221793
|
Remove GCC warnings
|
2017-11-13 16:22:07 -05:00 |
|
Emil Axelsson
|
62c5506250
|
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
|
2017-11-13 11:18:00 +01:00 |
|
Alexander Bock
|
b6d841c677
|
Correctly use group identifier name in property rendering
Fix indexing in Dropbox of OptionProperty
Finishing touches on FixedRotation (closes #137)
|
2017-11-12 12:33:10 -05:00 |
|
Emil Axelsson
|
19812af629
|
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
|
2017-11-11 19:10:42 +01:00 |
|
Alexander Bock
|
758e26789c
|
More coding style conformance
|
2017-11-11 11:25:49 -05:00 |
|
Alexander Bock
|
f29b15a37f
|
Add a rotation method that follows a fixed scene graph node
Add missing file for ImGui
|
2017-11-10 17:15:00 -05:00 |
|
Emil Axelsson
|
cb07af4a2b
|
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
|
2017-11-10 16:07:58 +01:00 |
|
Alexander Bock
|
bc95d13c31
|
Updated ImGui external
|
2017-11-10 09:58:53 -05:00 |
|
Alexander Bock
|
afa1d6d33e
|
Add strict test for whitespace at end of line
More work on coding style
|
2017-11-09 23:47:51 -05:00 |
|
Alexander Bock
|
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 |
|
Jonathas Costa
|
929bd9ae05
|
Merged.
|
2017-11-09 15:46:46 -05:00 |
|
Alexander Bock
|
b50b52d351
|
Cleanup for coding style
Add strict mode to check_style_guide script
|
2017-11-08 10:35:39 -06:00 |
|
Alexander Bock
|
80f5706049
|
Remove warnings on Clang
|
2017-11-07 09:19:45 -06:00 |
|
Emil Axelsson
|
157d91d631
|
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
|
2017-10-26 13:43:49 +02:00 |
|
Alexander Bock
|
50fd9309ba
|
Merge branch 'master' into feature/NewAtmosphere
# Conflicts:
# src/rendering/renderengine.cpp
|
2017-10-24 15:30:22 -04: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
|
e80730e9bf
|
Fix a variety of warnings
|
2017-10-21 10:10:40 -04:00 |
|
Alexander Bock
|
518abc5f87
|
Merge branch 'master' into feature/NewAtmosphere
# Conflicts:
# data/scene/default.scene
# data/scene/digitaluniverse/tully/tully.data
|
2017-10-20 10:42:18 -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 |
|
Jonathas Costa
|
637e74a9dc
|
Merged master into NewAtmosphere.
|
2017-10-19 14:23:06 -04:00 |
|
Emil Axelsson
|
27dea20520
|
Work on asset loading
|
2017-10-19 13:24:21 +02:00 |
|
Emil Axelsson
|
97f78a09df
|
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
|
2017-10-19 10:27:34 +02:00 |
|
Jonathas Costa
|
55d71af9a4
|
Fixed double declaration of style variable.
|
2017-10-18 21:46:20 -04:00 |
|
Alexander Bock
|
2e7da84dbf
|
Some minor ImGUI color changes
|
2017-10-18 19:30:32 -04:00 |
|
Jonathas Costa
|
d36e32e560
|
Merged master into NewAtmosphere.
|
2017-10-17 20:14:41 -04:00 |
|
Alexander Bock
|
f8754115eb
|
Various cleanup
|
2017-10-16 17:11:28 -04:00 |
|
Alexander Bock
|
a303bf3aa8
|
Fix for mission visualization
Change default monospaced font
|
2017-10-16 16:27:32 -04:00 |
|
Alexander Bock
|
7520edab83
|
Added first version of mission visualization
|
2017-10-16 10:23:00 -04:00 |
|
Emil Axelsson
|
2623912ec9
|
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
|
2017-10-16 11:07:24 +02:00 |
|
Alexander Bock
|
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 |
|
Alexander Bock
|
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 |
|
Alexander Bock
|
ebd506975c
|
Added initial scenegraph node grouping support
|
2017-10-13 00:17:28 -04:00 |
|
Alexander Bock
|
f1fd2b1960
|
Add window to show featured scenegraph nodes
|
2017-10-12 12:13:55 -04:00 |
|
Alexander Bock
|
327779d88f
|
Implemented Space/Time ImGui widget
|
2017-10-11 15:58:41 -04:00 |
|
Alexander Bock
|
d97cfbe829
|
Change ImGUI look and feel
Add Arimo font to be used in UI
|
2017-10-11 10:54:19 -04:00 |
|
Alexander Bock
|
aa969795cc
|
Factor ScreenSpaceImage into separate classes for local loading and online download (closes #296)
|
2017-10-10 14:16:55 -04:00 |
|
Alexander Bock
|
16a865337e
|
Fix compile error in GlobeBrowsing module without GDAL (closes #396)
|
2017-09-30 15:47:11 -06:00 |
|
Emil Axelsson
|
8a30251fcb
|
Work on asset management
|
2017-09-18 12:56:55 +02:00 |
|
Emil Axelsson
|
bf45937619
|
Compile fix in asset and assetloader
|
2017-09-15 11:13:46 +02:00 |
|
Emil Axelsson
|
4cdae984e9
|
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
|
2017-09-11 11:52:31 +02:00 |
|