d79d77f7e5
Add missing header
2020-09-25 15:51:10 +02:00
840424cc61
Resolve merge conflicts
2020-09-25 15:50:34 +02:00
eb330fed8f
Don't bind texture if nullptr
...
Lead to an exception when enabling the exoplanets renderablebillboardclouds during runtime. Should probably investigate why the renderBillboard function is called with a nullptr texture in the first place...
2020-09-25 08:55:41 +02:00
5860f6fcbf
Fix problem with extra symbol when returning string_view from format conversion
2020-09-23 10:43:37 +02:00
617dadb9d4
Merge pull request #1297 from OpenSpace/feature/orion_nebula
...
Feature/orion nebula
2020-09-16 23:16:24 +02:00
dffa7b914a
Minor cleaup
2020-09-16 23:07:32 +02:00
1a13a5a763
Merge pull request #1293 from OpenSpace/feature/cfitsio-update
...
Feature/cfitsio update
2020-09-16 21:51:55 +02:00
e84437345f
Fixed layer name on Linux.
2020-09-16 11:30:11 -04:00
98bfee301d
Various Xcode compile fixes
2020-09-14 10:38:46 +02:00
5f0b00da8a
Update Ghoul repository
2020-09-13 19:15:26 +02:00
a070a2ad8f
Update Ghoul repository
2020-09-13 19:08:35 +02:00
2a4ad44740
style cleanup
2020-09-10 17:50:33 -04:00
b55d93ad94
added orion nebula asset from DU, updated licence template to better support whitespace
2020-09-10 17:46:48 -04:00
a57003f272
Fix asteroids profile not running due to whitespace instead of tab
2020-09-09 13:35:41 +02:00
bbef4ea22b
Update keybindingmanager.cpp
...
Fix tiny typo
2020-09-09 11:04:46 +02:00
d2104df584
Merged master.
2020-09-08 11:16:38 -04:00
796fab40af
Merge branch 'master' into feature/cfitsio-update
2020-09-08 11:09:43 -04:00
9b8f2a8efc
Added missing header to fix compilation on Linux.
2020-09-08 11:07:51 -04:00
e0671700fc
Merge pull request #1281 from OpenSpace/issue/1277
...
Issue/1277 - Layer assets should add themselves on initialize
2020-09-07 15:41:12 +02:00
7c784e08c8
Merge pull request #1288 from OpenSpace/feature/openglstatecache
...
Feature/openglstatecache
2020-09-04 16:20:09 +02:00
13a62a5f79
Missing commit
2020-09-04 16:19:39 +02:00
463bb6b868
Update ghoul repository
2020-09-04 14:03:22 +02:00
af6e15da40
Merge remote-tracking branch 'origin/master' into feature/openglstatecache
...
# Conflicts:
# ext/ghoul
# modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
# modules/digitaluniverse/rendering/renderableplanescloud.cpp
# src/util/screenlog.cpp
2020-09-04 14:02:17 +02:00
539a8b8274
Merge pull request #1287 from OpenSpace/feature/general-performance
...
Feature/general performance
2020-09-04 13:53:11 +02:00
00a00c9cc8
Merge branch 'master' into feature/general-performance
...
# Conflicts:
# apps/OpenSpace/main.cpp
# modules/server/src/topics/timetopic.cpp
2020-09-04 13:49:00 +02:00
b99a4c7390
Update submodules
2020-09-04 13:47:26 +02:00
6eb0aea757
Address PR comments
2020-09-04 13:46:20 +02:00
20d1e391cb
Adding a new ImGui component for explicitly adding GIBS layer
2020-09-01 02:27:08 +02:00
1b69842cdc
Merge pull request #1290 from OpenSpace/feature/more-cleanup
...
Feature/more cleanup
2020-09-01 01:20:24 +02:00
7e06f310eb
Update submodules
...
Remove warnings and MSVC analyzer information messages
2020-09-01 01:18:17 +02:00
d0508be631
First commit
2020-08-30 22:00:13 +02:00
1cfc1abf1d
Updated cfitsio branch.
2020-08-27 10:58:03 -04:00
172b03b86a
Updated cfitsio and CCfits libraries.
2020-08-25 13:44:45 -04:00
313e1801a8
Update Ghoul repository
2020-08-25 13:53:26 +02:00
2cca451898
Coding style adaptations
...
Adapt to changes in Ghoul
2020-08-25 13:47:03 +02:00
19c110a4c2
Update gui hash
2020-08-25 13:08:54 +02:00
329798fa74
Merge pull request #1289 from OpenSpace/issue/1174
...
Delta time steps server code cleanup
2020-08-25 11:06:55 +02:00
63a61b3cba
Tiny cleanup (const is good)
2020-08-25 11:04:14 +02:00
fe13ff7e48
Some cleanup
2020-08-25 10:42:41 +02:00
64b23e172a
Include delta time steps in time topic
...
In case anyone wants to create a GUI that contains the delta time steps
2020-08-25 10:11:58 +02:00
157df5ff93
Clean-up: Include delta time steps in time topic
2020-08-25 08:55:30 +02:00
11ad1df863
Removed personal configuration.
2020-08-24 13:50:36 -04:00
25cd3fdc0b
Merged master again.
2020-08-24 13:44:26 -04:00
95db615dab
Merge branch 'master' into feature/general-performance
2020-08-24 15:09:45 +02:00
3b786c0bb8
Merge pull request #1282 from OpenSpace/issue/1174
...
Issue/1174 - step between delta time steps using GUI or keybindings
2020-08-24 14:17:30 +02:00
96625b8467
Merge pull request #1286 from OpenSpace/issue/1189
...
Add text to the render window if Tracy is enabled
2020-08-24 13:58:58 +02:00
dad5b8fb10
Merge branch 'master' into issue/1189
...
# Conflicts:
# CMakeLists.txt
2020-08-24 13:58:42 +02:00
a95b332441
Merge pull request #1280 from OpenSpace/feature/remove-asset-request
...
Feature/remove asset request
2020-08-24 13:54:04 +02:00
08b42f32de
Add a couple of test cases for delta time steps in profile
2020-08-24 11:32:32 +02:00
f8a31d11cc
Cleanup
2020-08-24 11:32:32 +02:00
Emma Broman