7abd3f0c09
Merge branch 'feature/multiple-joysticks' into project/spaceship-installation
2021-12-08 10:13:54 +01:00
c4e763e6a1
Increase maximum number of buttons allowed on a joystick
2021-12-08 10:09:54 +01:00
6485b485ca
Update profile to use new joysticks
2021-12-07 11:40:56 +01:00
e2f266fc7f
Make sure only values between -1 and 1 is sent to SuperColider
2021-12-07 11:32:54 +01:00
de54a5c09b
Merge branch 'feature/multiple-joysticks' into project/spaceship-installation
...
* Resolve conflicts in joystickcamerastates.cpp
2021-12-07 11:22:53 +01:00
cfd8b145f3
Remove osc files that should not be here
2021-12-07 11:07:05 +01:00
a3ba8ee808
Remove excess axes or buttons if too many present on joystick
2021-12-07 10:52:04 +01:00
08cdfd3125
Add new joystick asset
2021-12-07 10:30:15 +01:00
e14121741a
Dont spam warning for too many axes or buttons on joystick
2021-12-07 09:05:16 +01:00
332850999a
Add osc files
2021-12-06 15:59:39 +01:00
83b6345c86
Add action to hide all globe trails when approaching a planet/moon
2021-12-06 09:06:01 +01:00
3638a118cb
Revert "Merge branch 'feature/quickfix-zoomout-camerapath-collisions' into project/spaceship-installation"
...
This reverts commit 386b47bfb81f71904322
2021-12-03 12:48:30 +01:00
f84dbae70d
Merge branch 'master' into project/spaceship-installation
2021-12-03 11:22:53 +01:00
386b47bfb8
Merge branch 'feature/quickfix-zoomout-camerapath-collisions' into project/spaceship-installation
2021-12-03 10:41:54 +01:00
1f71904322
Profile settings that makes expolarion on a planet easier
2021-12-02 17:33:49 +01:00
9df5457414
Merge branch 'feature/mars-moons' into project/spaceship-installation
2021-12-01 14:47:54 +01:00
a921f983ca
Fix broken navigation states: Now works with aim as well as anchor
2021-12-01 14:30:28 +01:00
7191d536ad
Add Mars moon models
2021-12-01 14:28:15 +01:00
76ea508dab
Tiny navigation code cleanup/fix
2021-12-01 11:31:53 +01:00
f1dca1e134
Set up start up state
2021-12-01 11:20:35 +01:00
ad89f5e98f
Merge branch 'master' into project/spaceship-installation
...
* Solve conflicts in scene.cpp and scene_lua.inl
2021-12-01 10:42:14 +01:00
8766ba1242
Remove local variable in example
2021-11-30 17:22:46 +01:00
cc0a7b05ce
Add example asset for binding property to joystick
2021-11-30 12:11:08 +01:00
8299e4db22
Address PR comments
2021-11-30 10:46:44 +01:00
2753de1ab9
Merge branch 'master' into feature/multiple-joysticks
2021-11-30 10:14:45 +01:00
01a04a6faa
Fix missing keybind for taking screenshots ( closes #1786 )
2021-11-26 14:50:19 +01:00
c1696453a5
Shader compilation fix for newer NVidia drivers
2021-11-26 09:48:29 +01:00
b966b29c05
Update SGCT repository to get rid of line ending issues
2021-11-24 15:31:20 +01:00
6d89897c25
Merge branch 'feature/multiple-joysticks' into project/spaceship-installation
2021-11-24 13:29:24 +01:00
c1f57a7a46
Add OSC library and send messages of new joystick axis value and button
...
presses
2021-11-24 13:27:47 +01:00
2c7bbc5dee
Update GUI hash
...
Includes fix for broken touch gui
2021-11-23 11:42:33 +01:00
b41d5efd25
Extra check to prevent zero length segments in ZoomOutOverview camera path
2021-11-23 11:15:59 +01:00
d1821ae0e4
Add lua functions to get the bounding and interaction sphere values for a SGN
2021-11-23 10:00:51 +01:00
51fe17c320
Fix an issue where the removal of a screenspacerenderable is published after the screenspace renderable has already been destroyed
2021-11-21 00:46:50 +01:00
47a8287cf5
Add joystick assets and spaceship profile
2021-11-19 10:40:25 +01:00
dc8a0f7b0e
Structure som properties and add option ot invert input
2021-11-19 09:13:28 +01:00
77095b4467
Change angle names to match euler angles better
2021-11-19 08:38:57 +01:00
51bd416fd0
Interpolate back to look at target at the end of a path
2021-11-19 08:15:28 +01:00
85416e0cf9
Makes interaction during path work with joystick
...
Until we have a better implementation for binding joystick axes, just use the orbital navigator's joystickstates
2021-11-18 08:23:56 +01:00
78b1f2c6e1
Remove support for sticky axis and sensitivity to Property type
2021-11-17 16:57:05 +01:00
3055f25c26
Initial navigation with mouse during path traversal
2021-11-17 14:14:15 +01:00
474e96d267
Merge branch 'master' into feature/camera-control-during-path
2021-11-17 09:42:44 +01:00
73895e4c62
Fix problems in avoid collision path when start and end position are the same
2021-11-17 09:39:03 +01:00
d7565f65ee
Add script to download the expolanets dataset for the dataprep task
...
* Python script to download all the columns needed
* Update task file. Use strings instead of std::filesystem::path, so that relative paths and tokens can be used
2021-11-15 13:44:57 +01:00
5ae9bfcd14
Fix shouldInvert default value for joysticks
2021-11-15 12:56:38 +01:00
f591ba2195
Fix roll for controllers
2021-11-15 11:25:12 +01:00
3d3db47d76
Small include updates to adapt to inputstate changes
2021-11-12 14:07:07 +01:00
3fdae48092
Exchange normalisation property for joysticks to JoystickType
...
* Joysticks can either be "JoystickLike" or "TriggerLike", where the
triggers are normalized and have the deadzone close to -1 instead to 0
* Solves issue with zoom friction not to turn off for controllers
2021-11-12 11:46:17 +01:00
e075f8ae82
Merge branch 'master' into feature/multiple-joysticks
...
* Solve conflicts in navigationhandler.cpp
2021-11-12 09:51:05 +01:00
a515f85234
Add ability to bind a joystick axis to a property value
2021-11-11 09:27:54 +01:00
Malin E