 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 |
|
|
Alexander Bock
|
9577f2dd49
|
Start adding loading screen code
|
2017-11-02 16:56:49 -04:00 |
|
|
Jonathas Costa
|
45df1d498a
|
Fixed ATM acne after changing the MSAA patterns.
|
2017-11-02 15:05:32 -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 |
|
|
Jonathas Costa
|
024e53e738
|
Merge branch 'master' into feature/NewAtmosphere
|
2017-11-01 16:08:12 -04:00 |
|
|
Emil Axelsson
|
c7f16189d8
|
Compile fix for macOS
|
2017-11-01 14:31:14 +01:00 |
|
|
Emil Axelsson
|
a7a0715200
|
Restructure sync directories and change sync API
|
2017-11-01 12:31:40 +01:00 |
|
|
Emil Axelsson
|
2313a275d3
|
Resource syncing infrastructure
|
2017-10-31 17:46:48 +01:00 |
|
|
Emil Axelsson
|
fba556b11f
|
Always create a camera
|
2017-10-31 10:55:20 +01:00 |
|
|
Emil Axelsson
|
19393feac8
|
Work on syncing and initialization of assets
|
2017-10-31 10:04:02 +01:00 |
|
|
Alexander Bock
|
0f8adec9aa
|
Show on-screen information about friction status
|
2017-10-30 14:28:03 -04:00 |
|
|
Emil Axelsson
|
a9c74977fd
|
Work on asset management
|
2017-10-27 14:42:45 +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 |
|
|
Jonathas Costa
|
698bb25342
|
Access to the number of samples in msaa.
|
2017-10-25 15:05:33 -04:00 |
|
|
Jonathas Costa
|
72e6474816
|
Added MSAA sampling pattern retriever.
|
2017-10-25 14:11:20 -04:00 |
|
|
Jonathas Costa
|
2b0d00b785
|
Merge branch 'feature/NewAtmosphere' of https://github.com/OpenSpace/OpenSpace into feature/NewAtmosphere
|
2017-10-24 21:15:20 -04:00 |
|
|
Jonathas Costa
|
0b49973971
|
Fixing MSAA problems with ATM.
|
2017-10-24 19:20:37 -04: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
|
1c2622248c
|
Remove unused shaders
|
2017-10-24 03:35:41 -07: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 |
|
|
Alexander Bock
|
97445f4f9f
|
Add Scaling, Rotation, and Translation that is based on evaluation of Lua scripts
|
2017-10-23 14:43:25 -07:00 |
|
|
Emil Axelsson
|
6d8ec8a7c6
|
Compile fix for clang
|
2017-10-22 20:54:55 +02:00 |
|
|
Alexander Bock
|
e80730e9bf
|
Fix a variety of warnings
|
2017-10-21 10:10:40 -04:00 |
|
|
Jonathas Costa
|
637e74a9dc
|
Merged master into NewAtmosphere.
|
2017-10-19 14:23:06 -04:00 |
|
|
Emil Axelsson
|
9e5a033cd2
|
Use shared pointers for assets
|
2017-10-19 15:48:07 +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
|
d36e32e560
|
Merged master into NewAtmosphere.
|
2017-10-17 20:14:41 -04:00 |
|
|
Alexander Bock
|
d628c1a667
|
Merge branch 'master' into feature/DU
# Conflicts:
# data/scene/grids/grids.mod
# ext/sgct
|
2017-10-17 17:09:37 -04:00 |
|
|
Emil Axelsson
|
81298f10be
|
Work on asset synchronization and initialization
|
2017-10-16 19:08:22 +02: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
|
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 |
|
|
Emil Axelsson
|
18c50afeb5
|
Work on data management. Add some tests
|
2017-10-13 16:56:53 +02:00 |
|
|
Alexander Bock
|
ebd506975c
|
Added initial scenegraph node grouping support
|
2017-10-13 00:17:28 -04:00 |
|
|
=
|
6ebfb92a8d
|
Work on asset loading
|
2017-10-12 19:00:51 +02:00 |
|
|
=
|
6f3cc8f6a5
|
Work on asset loading
|
2017-10-11 17:06:51 +02: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
|
93534d13bc
|
Fix error with preInitialization timestep being overwritten
|
2017-10-10 12:34:11 -04:00 |
|
|
Emil Axelsson
|
c0b9e1d1a7
|
Clean up code
|
2017-10-10 16:43:12 +02:00 |
|