Commit Graph

583 Commits

Author SHA1 Message Date
Malin E
cf1bcf838b Validate step size field better 2022-02-07 11:38:45 +01:00
Malin E
7d87e3d29f Improve HTTP error handling 2022-02-04 15:22:50 +01:00
Malin Ejdbo
ee8dca2691 Never mind
* The module engine is not yet initialized when the launcher opens so it
cannot check if the space module exist or not
2022-02-04 10:12:34 +01:00
Malin Ejdbo
0ae87da475 Check if the SpaceModule exists before creating Horizons dialog 2022-02-04 09:32:10 +01:00
Malin Ejdbo
7844ae6e6e Move some functions to a new HorizonsFile class 2022-02-03 15:06:41 +01:00
Malin Ejdbo
8802970901 Add link to horizons website 2022-02-01 14:52:33 +01:00
Malin Ejdbo
135b6a3c5a Make sure horisonz log messages only display once 2022-02-01 13:38:38 +01:00
Malin Ejdbo
93a3114dce Make horizons log monospaced font 2022-02-01 09:44:43 +01:00
Malin Ejdbo
86dcb6a441 Merge branch 'master' into feature/horizons-framework 2022-01-31 13:47:58 +01:00
Malin Ejdbo
7c06a89aa0 Add HTTP status code handling 2022-01-26 11:58:20 +01:00
Malin Ejdbo
4d323c85de Style Horizons log 2022-01-26 11:03:17 +01:00
Malin Ejdbo
63564d491f Add log to the side of horizons dialog 2022-01-25 16:00:08 +01:00
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
Malin Ejdbo
7f9ce5df76 Add more error handling 2022-01-24 13:38:37 +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
Malin Ejdbo
7f7f12d2e0 Improve GUI design 2022-01-21 14:16:24 +01:00
Malin Ejdbo
10ebd3c3f0 Update to use the json output instead of the batch version 2022-01-19 15:19:52 +01:00
Malin Ejdbo
f3cb3bc0ba Generalize parsing of matches 2022-01-17 18:29:04 +01:00
Malin Ejdbo
f65d1655b8 Make sure not to overwrite existing file 2022-01-17 15:57:18 +01:00
Malin Ejdbo
9c43bc35e5 Trim the parsed matches 2022-01-17 14:37:47 +01:00
Alexander Bock
a85de067c8 Update SGCT submodule 2022-01-17 14:01:01 +01:00
Malin Ejdbo
bfe77a7385 Validate fields before sending a request 2022-01-17 13:39:12 +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
Malin Ejdbo
448b0da6c6 Do not support observer stations 2022-01-17 10:59:34 +01:00
Malin Ejdbo
988a8728f2 Clean up 2022-01-17 09:22:31 +01:00
Malin E
fd7ea608c8 Merge branch 'master' into feature/horizons-framework 2022-01-13 09:35:52 +01:00
Malin E
4d546051d9 Add stringstream library 2022-01-13 09:33:01 +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
Malin Ejdbo
b57f25f75b Merge branch 'master' into feature/horizons-framework
* Solve conflict in launcher/CmakeLists.txt
2021-12-22 11:58:21 +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