Commit Graph

547 Commits

Author SHA1 Message Date
Alexander Bock
a6bd29e679 Add a deprecation notice to the launcher for XML files 2022-01-25 14:48:48 +01:00
Alexander Bock
322e29e53c Show the full filename to configuration files in the Launcher 2022-01-25 14:12:22 +01:00
Alexander Bock
5050b27d09 Address PR comments 2022-01-25 12:08:24 +01:00
Alexander Bock
f903adc7c1 Merge remote-tracking branch 'origin/master' into feature/sgct-json 2022-01-21 17:43:36 +01:00
Alexander Bock
325f0ad6dc Address PR comments 2022-01-21 17:43:24 +01:00
Alexander Bock
2fb7a9eca2 Update SGCT repository, change configuration files accordingly 2022-01-21 16:36:13 +01:00
Alexander Bock
a85de067c8 Update SGCT submodule 2022-01-17 14:01:01 +01:00
Alexander Bock
a0a08e06a0 Fix issue with json configuration files not showing up in the launcher, Update SGCT submodule 2022-01-17 11:26:19 +01:00
Alexander Bock
2222d3d9e0 Update SGCT to enable taking screenshots of individual windows 2022-01-07 12:00:00 +01:00
Alexander Bock
c78ff28109 Update submodules, fix formatting for units 2022-01-05 17:06:47 +01:00
Alexander Bock
d7d279ea16 Happy new year 2022-01-01 12:32:55 +01:00
Malin E
01e17266b6 Merge pull request #1787 from OpenSpace/feature/multiple-joysticks
Feature/multiple joysticks
2021-12-22 13:22:01 +01:00
Alexander Bock
6ddf62f2ab Some more cleanup for configuration_helper script 2021-12-20 22:42:32 +01:00
Alexander Bock
af1e5c8cf8 Cleanup configuration helper 2021-12-20 22:00:36 +01:00
Alexander Bock
debcb43ade Feature/assets (#1784)
General overhaul of the Asset loading system
2021-12-19 18:04:01 +01:00
Alexander Bock
426c7fce42 Update SGCT repository 2021-12-19 10:19:48 +04:00
Alexander Bock
914316c526 Update SGCT repository 2021-12-19 09:29:25 +04:00
Alexander Bock
73a43041fd Convert XML to JSON files 2021-12-18 00:44:35 +04:00
Alexander Bock
d32af9117a Code style cleanup 2021-12-10 17:31:01 +01:00
Malin E
a3ba8ee808 Remove excess axes or buttons if too many present on joystick 2021-12-07 10:52:04 +01:00
Malin E
e14121741a Dont spam warning for too many axes or buttons on joystick 2021-12-07 09:05:16 +01:00
GPayne
49cdabe647 Second attempt at fixing tracy and websocketpp subs in sgct and ghoul 2021-12-06 17:32:35 -07:00
GPayne
0c0e6957f6 Updating version of sgct which uses OpenSpace fork of tracy 2021-12-03 12:17:03 -07:00
Alexander Bock
b966b29c05 Update SGCT repository to get rid of line ending issues 2021-11-24 15:31:20 +01:00
Alexander Bock
e3e468d5ef Update submodules again 2021-11-04 13:29:09 +01:00
Alexander Bock
f390051e1d Update submodules. Disable /ZI compile-flag when Tracy is enabled to prevent compile errors 2021-11-04 11:35:09 +01:00
Alexander Bock
8d26f6e167 Set the user-agent when requesting a download (closes #1765). Also report the error code if a download fails 2021-10-13 21:46:08 +02:00
Gene Payne
e78be1e4bc Merge pull request #1760 from OpenSpace/issue/1757
Fixes Problem with Profile Properties Not Handling Table Entries (Issue 1757)
2021-10-08 14:52:48 -06:00
GPayne
515bdd6b1f Fix for profile relative time errors 2021-10-06 15:47:10 -06:00
GPayne
95976bb225 Updated sgct submodule with display wall generation script 2021-09-28 11:46:41 -06:00
Alexander Bock
1505029bb1 Prevent the use of modifier keys as actual key bindings (closes #1744) 2021-09-28 12:05:50 +02:00
Alexander Bock
383fc8a0b0 Prevent saving keybinds without a key as that leads to a crash (fixes #1758) 2021-09-28 11:54:52 +02:00
GPayne
3572de551b Removed all filtering of approved paths in asset selection GUI 2021-09-20 15:38:21 -06:00
GPayne
ea070fc1c4 Switched to asset gui using filesystemaccess constructor without path filtering 2021-09-19 20:46:53 -06:00
Alexander Bock
8b59760a59 Update submodules 2021-08-21 11:45:38 +02:00
Alexander Bock
db472030de GCC warnings (#1725) 2021-08-21 11:42:44 +02:00
Alexander Bock
4fea3d8019 Explicitly request the Qt version 2021-08-20 16:30:27 +02:00
Malin E
e0312d32e8 Add support for Qt6 2021-08-20 15:41:01 +02:00
Alexander Bock
34985f64a6 Feature/keybindings (#1708)
* Add action manager to handle actions in replacement of keyboard shortcuts
* Implement new Action concept
* Remove the shortcutscomponent as it is no longer needed
* Update profile version from 1.0 to 1.1
* Add action dialog
* Restructure of key specification in keys.h
* Remove solid field-of-view keybind from the newhorizons profile as the setting no longer exists
2021-08-18 10:58:20 +02:00
Emma Broman
bfe25c311b Merge branch 'master' into thesis/2019/camera-paths
# Conflicts:
#	src/rendering/abufferrenderer.cpp
2021-08-09 15:21:08 +02:00
Micah
88708e3bf4 fixed an issue when loading specified SGCT config files; issue/1624 2021-08-03 15:44:03 -04:00
Gene Payne
d7d3ad93c8 Merge pull request #1698 from OpenSpace/issue/1461
Added warning to keybinding editor for duplicate assignments
2021-07-30 14:42:18 -06:00
GPayne
f035ba57f8 Added casts to prevent conversion warnings 2021-07-30 14:37:49 -06:00
GPayne
e2c13b399d Added warning to keybinding editor for duplicate assignments 2021-07-28 23:41:24 -06:00
Alexander Bock
5f139b8144 Tune the look of the asset dialog 2021-07-27 14:14:19 +02:00
Alexander Bock
05c577bd3d Filter out non-image files from the launcher collection (closes #1693) 2021-07-22 21:19:35 +02:00
Emma Broman
fb690e87ee Add a missing include needed for building 2021-06-23 17:24:35 +02:00
Emma Broman
8063b54fb8 Merge branch 'master' into thesis/2019/camera-paths
# Conflicts:
#	src/navigation/navigationhandler.cpp
2021-06-23 16:31:14 +02:00
Emma Broman
77bdfaefd6 Move camera path code into core and refactor navigation code a bit 2021-06-23 09:12:36 +02:00
Alexander Bock
ff920f73b7 Fix issue that would prevent opening of the first distributed profile in the editor 2021-06-17 09:47:27 +02:00