820bde4a13
Merged.
2017-12-07 11:01:35 -05: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
2044371719
Update Ghoul
2017-12-06 18:50:59 -05:00
11b054b007
Move selection of Tree layout into GuiPropertyComponent property
2017-12-06 18:40:54 -05:00
a96707c2ee
Merge branch 'master' into feature/guisorting
2017-12-06 17:30:47 -05:00
32da94262f
Fix uninitialized member variable in Loading screen
2017-12-06 17:29:14 -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
6be6149e02
Remove deprecation warning from camera functions
...
Fix compile warning
2017-12-06 17:00:50 -05:00
bc61200724
Added missing include.
2017-12-01 15:49:52 -05:00
87b4ec03eb
Display error message on loading screen in case of catastrophic scene loading ( closes #423 )
2017-11-30 21:49:39 -05:00
12ddfae337
Compile fix in TimeConversion
...
Reenable display of shutdown timer
Add prompt informing the user of ability to abort
2017-11-30 21:20:16 -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
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
f0d5b313b0
Add scene for Voyager 1 and Voyager 2 missions
2017-11-25 16:09:59 -05:00
07a8cb8bac
Simplify specification of properties
2017-11-25 15:56:07 -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
8380b8f421
Provide more information in case of Lua table to dictionary conversion error
2017-11-24 13:27:37 -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
99e097b441
Volume rendeirng fixes: Premultiply alpha in transfer function.Update transfer function on propery change. More reasonable opacity multiplier range.
2017-11-22 19:04:19 +01:00
aa490a97c6
Adding MOLA HRSC dataset
2017-11-20 11:42:20 -05:00
f597b119ed
Set more reasonable follow focus node rotation distance value for OrbitalNavigator
2017-11-17 13:58:31 -05:00
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
669078201a
Add check for usage of ghoul_assert instead of plain old assert
...
Update Ghoul
2017-11-16 16:12:54 -05:00
0ff9c93512
Enable the disabling of Tooltips in ImGUI
2017-11-16 09:06:17 -05:00
3a7f221793
Remove GCC warnings
2017-11-13 16:22:07 -05:00
3f6e5e6ace
Merge pull request #415 from OpenSpace/feature/loadingscreen-refactor
...
Feature/loadingscreen refactor
2017-11-12 13:24:48 -06:00
fb5057ba36
Jenkins compile fix
2017-11-12 12:37:55 -05:00
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
5080cc13b3
Merge branch 'master' into feature/loadingscreen-refactor
2017-11-12 11:17:48 -05:00
bbd019e8dd
Jenkins build hotfix
2017-11-12 10:52:26 -05:00
907ea891cf
Address PR comment
2017-11-12 10:50:24 -05:00
f227767492
Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor
...
# Conflicts:
# modules/volume/rendering/renderabletimevaryingvolume.cpp
2017-11-12 10:50:11 -05:00
76b26c0128
Change to different libTorrent version
2017-11-11 16:06:02 -05:00
6911a0cade
Revert libtorrent back to an RC version
2017-11-11 15:41:57 -05:00
758e26789c
More coding style conformance
2017-11-11 11:25:49 -05:00
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
28e1298be6
Only include touchbar file if on Apple
2017-11-10 13:38:47 -05:00
f183b9536f
Implement GUI button and featured elements on touchbar
2017-11-10 13:19:46 -05:00
bc95d13c31
Updated ImGui external
2017-11-10 09:58:53 -05:00
953d1581ae
Update libTorrent repository
2017-11-10 09:47:37 -05:00
7e4bb0b2c6
Merge branch 'master' into feature/loadingscreen-refactor
2017-11-09 22:49:07 -06:00
afa1d6d33e
Add strict test for whitespace at end of line
...
More work on coding style
2017-11-09 23:47:51 -05:00
7b12a241ed
Remove BOMs
...
Fix coding style and script
2017-11-09 19:10:32 -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
51a71d5ce2
Compile fix to adjust to runTime method not existing anymore
2017-11-09 14:58:43 -05:00
5fe98b85ff
Merge pull request #403 from OpenSpace/feature/fieldlineSequence
...
Feature/fieldlinesSequence
2017-11-09 12:23:13 -06:00
Jonathas Costa