 Emil Axelsson
|
d16efef3d9
|
Automatically initialize assets
|
2017-12-05 16:01:59 +01:00 |
|
|
Emil Axelsson
|
fb675dfeab
|
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
|
2017-12-04 10:52:12 +01:00 |
|
|
Alexander Bock
|
38338725b9
|
Strict coding style adherence
|
2017-11-26 14:57:26 -05:00 |
|
|
Alexander Bock
|
8e0fde947d
|
Cleanup ScreenSpaceFramebuffer (fix orientation issue)
Add Dashboard for on-screen information (#closes 201)
|
2017-11-26 14:46:54 -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 |
|
|
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 |
|
|
Emil Axelsson
|
7c80384d12
|
Decentralize asset synchronization
|
2017-11-16 15:09:55 +01:00 |
|
|
Emil Axelsson
|
816de9b29a
|
Asset compile fix
|
2017-11-16 14:11:22 +01:00 |
|
|
Emil Axelsson
|
c52ce23156
|
Asset management
|
2017-11-15 22:53:04 +01:00 |
|
|
Emil Axelsson
|
27823e9af6
|
Asset syncing
|
2017-11-15 13:12:10 +01:00 |
|
|
Emil Axelsson
|
95e6592f68
|
Asset synchronization
|
2017-11-15 09:38:42 +01:00 |
|
|
Emil Axelsson
|
62f58a9749
|
Start on asset gui
|
2017-11-14 20:46:03 +01:00 |
|
|
Emil Axelsson
|
ce9b75117e
|
More work on assets (not compiling)
|
2017-11-14 17:23:58 +01:00 |
|
|
Emil Axelsson
|
6a4f938bac
|
Thread safety in http requests
|
2017-11-14 13:47:22 +01:00 |
|
|
Emil Axelsson
|
c032e4a66e
|
Add missing constructors
|
2017-11-14 11:26:23 +01:00 |
|
|
Emil Axelsson
|
81f45aed71
|
Work on http synchronization
|
2017-11-13 23:01:22 +01:00 |
|
|
Alexander Bock
|
3a7f221793
|
Remove GCC warnings
|
2017-11-13 16:22:07 -05:00 |
|
|
Emil Axelsson
|
c171e6ae86
|
Work on http download interface
|
2017-11-13 19:03:58 +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
|
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 |
|
|
Emil Axelsson
|
a73f2e0d00
|
Work on asset synchronization
|
2017-11-11 18:48:07 +01:00 |
|
|
Alexander Bock
|
758e26789c
|
More coding style conformance
|
2017-11-11 11:25:49 -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
|
dc85ee6cd7
|
Highlight nodes if they have an error
|
2017-11-09 10:51:07 -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 |
|
|
Alexander Bock
|
80f5706049
|
Remove warnings on Clang
|
2017-11-07 09:19:45 -06:00 |
|
|
Emil Axelsson
|
3d9481a4fc
|
Make screen log thread safe
|
2017-11-07 00:14:50 +01:00 |
|
|
Emil Axelsson
|
3d8c7ad0a4
|
Make screen log thread safe
|
2017-11-06 22:11:58 +01:00 |
|
|
Emil Axelsson
|
87595812d2
|
Remove BOM
|
2017-11-06 21:22:43 +01:00 |
|
|
Emil Axelsson
|
e201dec907
|
Start work on TorrentSynchronization
|
2017-11-06 19:07:52 +01:00 |
|
|
Alexander Bock
|
bc4e0e4af0
|
Refactor item overlap and add standoff distance
|
2017-11-06 11:02:58 -06: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 |
|
|
Emil Axelsson
|
03aab55a1f
|
Asset synchronization using HTTP
|
2017-11-05 19:02:31 +01:00 |
|
|
Alexander Bock
|
6ecb180ac0
|
Some more work on rendering loading screen information
|
2017-11-04 11:12:22 -04:00 |
|
|
Alexander Bock
|
735d6378d9
|
More work on loading screen
Multithreaded SceneGraphNode initialization
|
2017-11-03 14:06:51 -04:00 |
|