Commit Graph

7256 Commits

Author SHA1 Message Date
GPayne
66aa8bc4be MarkNodes and Meta support in profiles 2020-09-11 12:40:22 -06:00
GPayne
cd084d12be Keybindings support for profiles 2020-09-11 12:36:24 -06:00
GPayne
0cfbdfcbfc Added support for delta times in profile 2020-09-11 12:32:04 -06:00
GPayne
ca6260718b Added support for camera 2020-09-11 12:29:31 -06:00
GPayne
7e72d9fa8f Assets support 2020-09-11 12:26:59 -06:00
GPayne
0ec1cf69f8 New support for additional scripts in profile 2020-09-11 12:18:26 -06:00
GPayne
ded7f3cd66 Updated tree model for assets 2020-09-11 12:09:44 -06:00
GPayne
e2c8541421 Updated CMake cfg with moved src & include dirs 2020-09-11 11:58:07 -06:00
GPayne
61191d4f14 Moved to src and include directories 2020-09-11 11:53:32 -06:00
GPayne
bb1e8813c7 Replaced launcher and profile-edit windows with updated version 2020-09-11 11:42:50 -06:00
GPayne
23c3603304 Renamed keybindings member 2020-09-11 11:30:08 -06:00
GPayne
7d41cd5a49 Merged master in 2020-09-11 10:29:59 -06:00
Emma Broman
a57003f272 Fix asteroids profile not running due to whitespace instead of tab 2020-09-09 13:35:41 +02:00
Alexander Bock
bbef4ea22b Update keybindingmanager.cpp
Fix tiny typo
2020-09-09 11:04:46 +02:00
Jonathas Costa
9b8f2a8efc Added missing header to fix compilation on Linux. 2020-09-08 11:07:51 -04:00
Alexander Bock
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
Alexander Bock
7c784e08c8 Merge pull request #1288 from OpenSpace/feature/openglstatecache
Feature/openglstatecache
2020-09-04 16:20:09 +02:00
Alexander Bock
13a62a5f79 Missing commit 2020-09-04 16:19:39 +02:00
Alexander Bock
463bb6b868 Update ghoul repository 2020-09-04 14:03:22 +02:00
Alexander Bock
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
Alexander Bock
539a8b8274 Merge pull request #1287 from OpenSpace/feature/general-performance
Feature/general performance
2020-09-04 13:53:11 +02:00
Alexander Bock
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
Alexander Bock
b99a4c7390 Update submodules 2020-09-04 13:47:26 +02:00
Alexander Bock
6eb0aea757 Address PR comments 2020-09-04 13:46:20 +02:00
Alexander Bock
20d1e391cb Adding a new ImGui component for explicitly adding GIBS layer 2020-09-01 02:27:08 +02:00
Alexander Bock
1b69842cdc Merge pull request #1290 from OpenSpace/feature/more-cleanup
Feature/more cleanup
2020-09-01 01:20:24 +02:00
Alexander Bock
7e06f310eb Update submodules
Remove warnings and MSVC analyzer information messages
2020-09-01 01:18:17 +02:00
GPayne
1b07268324 Working instantiation of Profile obj from launcher 2020-08-30 19:01:25 -06:00
Alexander Bock
d0508be631 First commit 2020-08-30 22:00:13 +02:00
GPayne
b54612a502 Added profile object access to launcher 2020-08-29 20:32:35 -06:00
GPayne
8dad4ee9fe Initial working launcher without profile code access yet 2020-08-28 12:00:57 -06:00
Alexander Bock
313e1801a8 Update Ghoul repository 2020-08-25 13:53:26 +02:00
Alexander Bock
2cca451898 Coding style adaptations
Adapt to changes in Ghoul
2020-08-25 13:47:03 +02:00
Emma Broman
19c110a4c2 Update gui hash 2020-08-25 13:08:54 +02:00
Emma Broman
329798fa74 Merge pull request #1289 from OpenSpace/issue/1174
Delta time steps server code cleanup
2020-08-25 11:06:55 +02:00
Emma Broman
63a61b3cba Tiny cleanup (const is good) 2020-08-25 11:04:14 +02:00
Emma Broman
fe13ff7e48 Some cleanup 2020-08-25 10:42:41 +02:00
Emma Broman
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
Emma Broman
157df5ff93 Clean-up: Include delta time steps in time topic 2020-08-25 08:55:30 +02:00
Jonathas Costa
11ad1df863 Removed personal configuration. 2020-08-24 13:50:36 -04:00
Jonathas Costa
25cd3fdc0b Merged master again. 2020-08-24 13:44:26 -04:00
Alexander Bock
95db615dab Merge branch 'master' into feature/general-performance 2020-08-24 15:09:45 +02:00
Alexander Bock
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
Alexander Bock
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
Alexander Bock
dad5b8fb10 Merge branch 'master' into issue/1189
# Conflicts:
#	CMakeLists.txt
2020-08-24 13:58:42 +02:00
Alexander Bock
a95b332441 Merge pull request #1280 from OpenSpace/feature/remove-asset-request
Feature/remove asset request
2020-08-24 13:54:04 +02:00
Emma Broman
08b42f32de Add a couple of test cases for delta time steps in profile 2020-08-24 11:32:32 +02:00
Emma Broman
f8a31d11cc Cleanup 2020-08-24 11:32:32 +02:00
Emma Broman
6475b1154d Update some documentation for interpolating functions 2020-08-24 11:32:32 +02:00
Emma Broman
43a628e321 Add negative versions of the time steps per default and remove duplicates 2020-08-24 11:32:32 +02:00