 Alexander Bock
|
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 |
|
|
Alexander Bock
|
38338725b9
|
Strict coding style adherence
|
2017-11-26 14:57:26 -05:00 |
|
|
Alexander Bock
|
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 |
|
|
Emil Axelsson
|
436062381e
|
Asset loading and synchronization
|
2017-11-16 19:29:45 +01:00 |
|
|
Emil Axelsson
|
7c80384d12
|
Decentralize asset synchronization
|
2017-11-16 15:09:55 +01:00 |
|
|
Emil Axelsson
|
62f58a9749
|
Start on asset gui
|
2017-11-14 20:46:03 +01:00 |
|
|
Emil Axelsson
|
27f36209fa
|
Improve implementation and interface of http downloads
|
2017-11-13 14:59:39 +01:00 |
|
|
Emil Axelsson
|
62c5506250
|
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
|
2017-11-13 11:18:00 +01:00 |
|
|
Emil Axelsson
|
2fa42859cd
|
Decentralize resource synchronization. Remove notion of SynchronizationJob.
|
2017-11-12 19:09:16 +01:00 |
|
|
Alexander Bock
|
fb5057ba36
|
Jenkins compile fix
|
2017-11-12 12:37:55 -05:00 |
|
|
Alexander Bock
|
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 |
|
|
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
|
28e1298be6
|
Only include touchbar file if on Apple
|
2017-11-10 13:38:47 -05:00 |
|
|
Alexander Bock
|
f183b9536f
|
Implement GUI button and featured elements on touchbar
|
2017-11-10 13:19:46 -05:00 |
|
|
Emil Axelsson
|
c479cb5079
|
Merge branch 'feature/data-management' of github.com:OpenSpace/OpenSpace into feature/data-management
|
2017-11-10 16:10:41 +01: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
|
7e4bb0b2c6
|
Merge branch 'master' into feature/loadingscreen-refactor
|
2017-11-09 22:49:07 -06: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 |
|
|
Alexander Bock
|
0015cbb6f6
|
Finalize the loadingscreen before initializing GL part of the scene
Correctly use screen aspect ratio to render the loading screen box
|
2017-11-09 12:47:28 -05:00 |
|
|
Alexander Bock
|
5f391de33c
|
Fix crash when adding layers through globebrowsing interface due to missing initialization
Fix crash that would happen if the resetting of the tile layer would throw an exception
|
2017-11-09 12:01:35 -05:00 |
|
|
Alexander Bock
|
acdfefe46d
|
Merge branch 'master' into feature/loadingscreen-refactor
# Conflicts:
# modules/base/rendering/renderabletrailorbit.h
# modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
# modules/digitaluniverse/rendering/renderableplanescloud.cpp
# modules/digitaluniverse/rendering/renderablepoints.cpp
# modules/galaxy/rendering/renderablegalaxy.cpp
# modules/galaxy/rendering/renderablegalaxy.h
# modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
# modules/kameleonvolume/rendering/renderablekameleonvolume.h
# modules/spacecraftinstruments/rendering/renderablefov.h
# modules/spacecraftinstruments/rendering/renderableplaneprojection.h
# modules/toyvolume/rendering/renderabletoyvolume.cpp
# modules/toyvolume/rendering/renderabletoyvolume.h
# modules/volume/rendering/renderabletimevaryingvolume.cpp
# modules/volume/rendering/renderabletimevaryingvolume.h
|
2017-11-08 19:10:59 -06:00 |
|
|
Alexander Bock
|
b50b52d351
|
Cleanup for coding style
Add strict mode to check_style_guide script
|
2017-11-08 10:35:39 -06:00 |
|
|
Emil Axelsson
|
e201dec907
|
Start work on TorrentSynchronization
|
2017-11-06 19:07:52 +01:00 |
|
|
Emil Axelsson
|
1f33359697
|
Cleanup and better configuration of resource syncs
|
2017-11-05 23:17:51 +01:00 |
|
|
Alexander Bock
|
dc9831b6a6
|
Add progress bar to the loading screen
Add configuration options to customize the loading screen
|
2017-11-05 14:49:46 -05:00 |
|
|
Emil Axelsson
|
43664d34b7
|
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
|
2017-11-05 20:04:47 +01:00 |
|
|
Alexander Bock
|
4465c4b322
|
Set time-to-live for loading messages
|
2017-11-04 12:08:35 -04:00 |
|
|
Alexander Bock
|
6ecb180ac0
|
Some more work on rendering loading screen information
|
2017-11-04 11:12:22 -04:00 |
|
|
Alexander Bock
|
b886925616
|
Move OpenGL in globebrowsing from constructors into initialization functions
Place entire scene loading into separate thread
|
2017-11-03 16:25:06 -04:00 |
|
|
Alexander Bock
|
735d6378d9
|
More work on loading screen
Multithreaded SceneGraphNode initialization
|
2017-11-03 14:06:51 -04:00 |
|
|
Alexander Bock
|
9577f2dd49
|
Start adding loading screen code
|
2017-11-02 16:56:49 -04:00 |
|
|
Alexander Bock
|
78e3320cde
|
Separate Renderable::initialize into initialize and initializeGL functions
Handle initialize in a separate thread and display rudimentary loading screen
|
2017-11-02 14:27:35 -04:00 |
|
|
Emil Axelsson
|
96f512484b
|
Asset loading fix on mac
|
2017-11-01 14:54:03 +01:00 |
|
|
Emil Axelsson
|
fba556b11f
|
Always create a camera
|
2017-10-31 10:55:20 +01:00 |
|
|
Alexander Bock
|
0f8adec9aa
|
Show on-screen information about friction status
|
2017-10-30 14:28:03 -04:00 |
|
|
Emil Axelsson
|
8059fb05e9
|
More work on asset management
|
2017-10-27 16:43:04 +02:00 |
|
|
Emil Axelsson
|
f9ec20812d
|
Introduce AssetManager
|
2017-10-27 10:57:39 +02: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
|
9b6028028a
|
Clean up RenderEngine
|
2017-10-24 03:16:29 -07:00 |
|
|
Alexander Bock
|
5a9ebe552b
|
Add the ability to remove Tags
|
2017-10-24 01:47:14 -07:00 |
|
|
Alexander Bock
|
269dda8aff
|
Remove runTime from OpenSpaceEngine and place in WindowWrapper instead
|
2017-10-24 01:33:53 -07:00 |
|
|
Alexander Bock
|
eaca6c7487
|
Add SceneLicense information to the Scene
Add documentation generator to SceneLicense
|
2017-10-23 18:11:09 -07:00 |
|
|
Emil Axelsson
|
6d8ec8a7c6
|
Compile fix for clang
|
2017-10-22 20:54:55 +02:00 |
|
|
Emil Axelsson
|
9e5a033cd2
|
Use shared pointers for assets
|
2017-10-19 15:48:07 +02: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 |
|
|
Emil Axelsson
|
81298f10be
|
Work on asset synchronization and initialization
|
2017-10-16 19:08:22 +02:00 |
|
|
Emil Axelsson
|
18c50afeb5
|
Work on data management. Add some tests
|
2017-10-13 16:56:53 +02:00 |
|