 Emil Axelsson
|
0396832ae5
|
Change notification mechanisms for assets
|
2017-12-08 17:36:45 +01:00 |
|
|
Emil Axelsson
|
f3dfade201
|
Start adding support for removing assets
|
2017-12-08 16:02:45 +01:00 |
|
|
Emil Axelsson
|
3968961434
|
Show resource sync progress in gui
|
2017-12-08 14:37:34 +01:00 |
|
|
Jonathas Costa
|
5eb11cfc49
|
Merged master into NewAtmosphere.
|
2017-12-07 11:31:51 -05:00 |
|
|
Emil Axelsson
|
f33b24d551
|
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
|
2017-12-07 11:44:14 +01:00 |
|
|
Emil Axelsson
|
9630e735db
|
An asset can only be considered synchronized when all required assets are synchronized
|
2017-12-07 11:07:15 +01:00 |
|
|
Alexander Bock
|
a96707c2ee
|
Merge branch 'master' into feature/guisorting
|
2017-12-06 17:30:47 -05:00 |
|
|
Alexander Bock
|
32da94262f
|
Fix uninitialized member variable in Loading screen
|
2017-12-06 17:29:14 -05:00 |
|
|
Alexander Bock
|
be98c3d784
|
Add TemplateProperty<std::vector<std::string>> as StringListProperty
Add default gui sorting to all scenes
|
2017-12-06 17:04:10 -05:00 |
|
|
Alexander Bock
|
6be6149e02
|
Remove deprecation warning from camera functions
Fix compile warning
|
2017-12-06 17:00:50 -05:00 |
|
|
Emil Axelsson
|
175d21de9a
|
Remove experimental code
|
2017-12-06 15:16:52 +01:00 |
|
|
Emil Axelsson
|
79581c8556
|
Add lua function to set camera state without loading from file
|
2017-12-06 14:58:14 +01:00 |
|
|
Emil Axelsson
|
d16efef3d9
|
Automatically initialize assets
|
2017-12-05 16:01:59 +01:00 |
|
|
Jonathas Costa
|
f698a3de09
|
Merged master into NewAtmosphere.
|
2017-12-04 12:19:40 -05: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
|
87b4ec03eb
|
Display error message on loading screen in case of catastrophic scene loading (closes #423)
|
2017-11-30 21:49:39 -05:00 |
|
|
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
|
8e0fde947d
|
Cleanup ScreenSpaceFramebuffer (fix orientation issue)
Add Dashboard for on-screen information (#closes 201)
|
2017-11-26 14:46:54 -05:00 |
|
|
Jonathas Costa
|
6363fc0bb2
|
Added missing include and merged master into NewAtmosphere.
|
2017-11-25 22:39:18 -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
|
07a8cb8bac
|
Simplify specification of properties
|
2017-11-25 15:56:07 -05:00 |
|
|
Alexander Bock
|
8380b8f421
|
Provide more information in case of Lua table to dictionary conversion error
|
2017-11-24 13:27:37 -05:00 |
|
|
Alexander Bock
|
0c18263de7
|
Issue/417 (#421)
Added support for multiple windows in ImGui
|
2017-11-24 11:00:53 -05:00 |
|
|
Emil Axelsson
|
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 |
|
|
Alexander Bock
|
f597b119ed
|
Set more reasonable follow focus node rotation distance value for OrbitalNavigator
|
2017-11-17 13:58:31 -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 |
|
|
Alexander Bock
|
669078201a
|
Add check for usage of ghoul_assert instead of plain old assert
Update Ghoul
|
2017-11-16 16:12:54 -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
|
816de9b29a
|
Asset compile fix
|
2017-11-16 14:11:22 +01:00 |
|
|
Jonathas Costa
|
0264a3026c
|
Merged master into NewAtmosphere.
|
2017-11-15 18:12:58 -05:00 |
|
|
Jonathas Costa
|
67033c4583
|
Tentative fix for billbords alingment problems.
|
2017-11-15 17:35:00 -05: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
|
fb5057ba36
|
Jenkins compile fix
|
2017-11-12 12:37:55 -05:00 |
|
|
Alexander Bock
|
907ea891cf
|
Address PR comment
|
2017-11-12 10:50:24 -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 |
|