mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-05 11:09:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,012 Commits 99 Branches 46 Tags
90dbb6a01f01711a27c2a32563fa7ceaaa2fc41b
Commit Graph

531 Commits

Author SHA1 Message Date
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
debcb43ade Feature/assets (#1784) 
General overhaul of the Asset loading system
 2021-12-19 18:04:01 +01: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
Alexander Bock
404fc3f9bf Fix issue with not being able to include sgct anymore with Visual Studio 16.10 2021-05-31 15:46:05 +02:00
Micah Acinapura
48f3f14e8a fix for user customized SGCTConfig in .cfg file 2021-05-30 20:27:01 -04:00
Malin Ejdbo
a36ac1ee2f Prevent Add and Remove button to be disabled when selecting an item in list 
in Launcher UI
 2021-05-28 15:15:27 +02:00
Alexander Bock
6cf6e450fb Address MacOS compile issues, make ISS model scene graph node visible 2021-05-25 17:50:31 +02:00
Alexander Bock
b9a8ec93de Update Ghoul version 2021-05-18 14:19:54 +02:00
Alexander Bock
92432caed2 Adapt to changes in Ghoul that made absPath return a std::filesystem::path instead of a std::string 2021-05-17 00:23:15 +02:00
Alexander Bock
ccdc5a5dc3 Feature/filesystem cleanup (#1587) 
* Adapting to the changes in Ghoul
* First step of moving filesystem functions to std
* Remove persistence flag from cachemanager
 2021-05-16 20:26:49 +02:00
Alexander Bock
f74bf97513 Update SGCT repository (closes #1437), VAO hygiene for RenderablePlane 2021-05-08 16:57:08 +02:00
Alexander Bock
b016317fc2 Add a scriptlog dialog field to the additional scripts box 2021-04-27 09:58:25 +02:00
Alexander Bock
fd17f51959 Fix Taskrunner compile error (closes #1554) 2021-04-16 13:11:33 +02:00
Alexander Bock
d9a1a0233b Remove apple clang warnings 2021-03-30 22:12:53 +02:00
Alexander Bock
4b25f5c074 Move default_dashboard asset from util folder to new dashboard folder that also includes the individual dashboard items 2021-03-24 09:57:27 +01:00
Alexander Bock
0d82e1848f Feature/configuration codegen (#1544) 
Convert configuration document over to codegen
 2021-03-23 15:22:29 +01:00
Micah Acinapura
48e2f35aa1 added dialog for choosing scripts from the script log (#1539) 
* added dialog for choosing scripts from the script log
 2021-03-23 08:56:23 -04:00
Alexander Bock
c7f77e3286 Add property to determine whether the date should be added to the screenshot folder (#1535) 
closes #1528
 2021-03-22 15:49:30 +01:00
Alexander Bock
615fc82b51 Update submodules 
- SGCT:  Fixed an issue that lead to a crash in debug mode
 - Ghoul: Fixed an issue that prevented CEF locales to be copied in a fresh install
 2021-03-15 14:50:39 +01:00