Emma Broman
ff54ad27a8
Do a temporary workaround to avoid going to the exact same position
2021-12-14 14:08:59 +01:00
Malin E
09b9d8437f
Improve zoom offset factor
2021-12-13 13:26:15 +01:00
Malin E
6f6519fbf7
Add property to zomm slightly closer or further away
2021-12-10 11:39:47 +01:00
Malin E
7abd3f0c09
Merge branch 'feature/multiple-joysticks' into project/spaceship-installation
2021-12-08 10:13:54 +01:00
Malin E
c4e763e6a1
Increase maximum number of buttons allowed on a joystick
2021-12-08 10:09:54 +01:00
Malin E
de54a5c09b
Merge branch 'feature/multiple-joysticks' into project/spaceship-installation
...
* Resolve conflicts in joystickcamerastates.cpp
2021-12-07 11:22:53 +01:00
Emma Broman
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
Emma Broman
386b47bfb8
Merge branch 'feature/quickfix-zoomout-camerapath-collisions' into project/spaceship-installation
2021-12-03 10:41:54 +01:00
Malin E
8299e4db22
Address PR comments
2021-11-30 10:46:44 +01:00
Malin E
6d89897c25
Merge branch 'feature/multiple-joysticks' into project/spaceship-installation
2021-11-24 13:29:24 +01:00
Malin E
c1f57a7a46
Add OSC library and send messages of new joystick axis value and button
...
presses
2021-11-24 13:27:47 +01:00
Emma Broman
dc8a0f7b0e
Structure som properties and add option ot invert input
2021-11-19 09:13:28 +01:00
Emma Broman
77095b4467
Change angle names to match euler angles better
2021-11-19 08:38:57 +01:00
Emma Broman
51bd416fd0
Interpolate back to look at target at the end of a path
2021-11-19 08:15:28 +01:00
Emma Broman
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
Malin E
78b1f2c6e1
Remove support for sticky axis and sensitivity to Property type
2021-11-17 16:57:05 +01:00
Emma Broman
3055f25c26
Initial navigation with mouse during path traversal
2021-11-17 14:14:15 +01:00
Malin E
f591ba2195
Fix roll for controllers
2021-11-15 11:25:12 +01:00
Emma Broman
3d3db47d76
Small include updates to adapt to inputstate changes
2021-11-12 14:07:07 +01:00
Malin E
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
Malin E
e075f8ae82
Merge branch 'master' into feature/multiple-joysticks
...
* Solve conflicts in navigationhandler.cpp
2021-11-12 09:51:05 +01:00
Malin E
a515f85234
Add ability to bind a joystick axis to a property value
2021-11-11 09:27:54 +01:00
Alexander Bock
55ee3d2785
Remove the user data from the Lua function definition
2021-11-04 16:27:54 +01:00
Malin E
3526e14e66
Add support for several joysticks at the smae time
2021-11-04 13:19:43 +01:00
Malin E
8bddf38f02
Split InputState into MouseInputState and KeyboardInputState
2021-11-03 15:28:37 +01:00
Malin E
23eed7f023
Move abstract function updateStateFromInput to the concrete classes
2021-11-03 14:41:29 +01:00
Alexander Bock
0c295ef15d
Fix compile error introduced with previous commit
2021-11-02 15:11:34 +01:00
Alexander Bock
fb6807b1e0
Add the ability for lua libraries to define sublibraries
2021-11-01 22:44:32 +01:00
Malin E
a8c74979c1
Merge branch 'master' into feature/animation-fixes
2021-10-25 10:51:13 +02:00
Emma Broman
5d0e811cc3
Quick and dirty fix to avoid ZoomOutOverview curve colliding into planet when going between two nodes on the surface of a planet
2021-10-15 15:18:03 +02:00
ElonOlsson
d7f9c1a124
merge with master
2021-10-14 11:07:01 -04:00
Malin E
fc4c3f1cfa
Merge branch 'master' into feature/animation-fixes
...
* Resolve conflicts in scene.cpp
2021-10-14 14:23:24 +02:00
Alexander Bock
4a860fb01d
Some code facelifting
2021-10-14 10:31:46 +02:00
Malin E
659cc09e4b
Address PR comments
2021-10-12 08:52:03 +02:00
Emma Broman
bc306c6f1b
Fix globe transformations not updating from height map if simulation time paused ( #1766 )
2021-10-12 08:37:25 +02:00
Alexander Bock
76dd45e5ce
Event System ( #1741 )
...
* Add implementation of the EventEngine to handle global event chains
* Add properties to SceneGraphNodes to determine two distance radii for camera-based events
2021-10-11 21:53:00 +02:00
Malin E
8992f983c6
Address PR comments
2021-10-11 14:00:19 +02:00
Malin E
5152258c9a
Add property to run or not run scripts at a time jump in
...
scriptsScheduler
2021-10-11 10:39:57 +02:00
Malin E
e2c592e049
WIP: Add groups to scriptScheduler
...
* NOTE: This breaks the backwards scripts
2021-10-08 19:17:06 +02:00
GPayne
a2a8f93ba5
Moved string bracket trim function to ghoul library
2021-10-07 16:10:00 -06:00
GPayne
c36ea36a43
Code review changes
2021-10-07 00:26:29 -06:00
Malin E
26101b66cc
Add action to play timelapse in reverse
2021-10-06 13:05:14 +02:00
ElonOlsson
03371c6cdb
Merge branch 'master' into thesis/2020/radiation
2021-10-05 14:52:38 -04:00
GPayne
80546313fd
Fixed handling of strings with quotes or brackets, and better table push
2021-10-03 21:03:32 -06:00
GPayne
9464530cdd
Changes to get lua table entries working using variant type
2021-10-01 16:44:20 -06:00
GPayne
450b101cd5
Adding support for lua table as a possible profile properties value
2021-09-28 20:35:53 -06:00
Malin E
6deac09604
Merge branch 'master' into feature/animation-fixes
2021-09-28 08:40:16 +02:00
Malin E
802f1e0d33
Merge branch 'master' into feature/animation-fixes
2021-09-23 11:40:32 +02:00
GPayne
2abf191f09
Improve scale value precision in ascii format recordings
2021-09-22 16:00:09 -06:00
GPayne
b00b900278
Get rid of some sessionrecording warnings
2021-09-22 15:58:59 -06:00
