Commit Graph

1935 Commits

Author SHA1 Message Date
Malin E
2e2bbe671b Update Cow location 2021-12-15 13:17:16 +01:00
Emma Broman
c4f51e5604 Update sun glare color to be closer to white 2021-12-15 10:23:31 +01:00
Emma Broman
68839ce6ca Update visuals and bs of the Sun, so we can fly to it 2021-12-15 10:16:34 +01:00
Emma Broman
7169227844 Cache height and color layers and change height layer for Mars 2021-12-14 13:41:39 +01:00
Malin E
4c7167f32f Point ScreenSpaceRenderables to new paths 2021-12-14 13:33:38 +01:00
Malin E
27948b8a43 Set up Thrustmaster test assets 2021-12-13 13:50:15 +01:00
Emma Broman
25a2e0269c Increase approachFactor for events 2021-12-10 11:30:44 +01:00
Malin E
8842a2ac1b Add random images for some of the joystick buttons 2021-12-10 10:57:22 +01:00
Malin E
6130b84f55 Decrease dynamic range of speed 2021-12-08 11:00:24 +01:00
Malin E
8d0e7fb0de Fix OSC value sending and butons 2021-12-08 10:44:41 +01:00
Malin E
6485b485ca Update profile to use new joysticks 2021-12-07 11:40:56 +01:00
Malin E
e2f266fc7f Make sure only values between -1 and 1 is sent to SuperColider 2021-12-07 11:32: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
Malin E
08cdfd3125 Add new joystick asset 2021-12-07 10:30:15 +01:00
Emma Broman
83b6345c86 Add action to hide all globe trails when approaching a planet/moon 2021-12-06 09:06:01 +01:00
Emma Broman
1f71904322 Profile settings that makes expolarion on a planet easier 2021-12-02 17:33:49 +01:00
Malin E
9df5457414 Merge branch 'feature/mars-moons' into project/spaceship-installation 2021-12-01 14:47:54 +01:00
Malin E
7191d536ad Add Mars moon models 2021-12-01 14:28:15 +01:00
Malin E
f1dca1e134 Set up start up state 2021-12-01 11:20:35 +01:00
Malin E
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
Malin E
8766ba1242 Remove local variable in example 2021-11-30 17:22:46 +01:00
Malin E
cc0a7b05ce Add example asset for binding property to joystick 2021-11-30 12:11:08 +01:00
Malin E
2753de1ab9 Merge branch 'master' into feature/multiple-joysticks 2021-11-30 10:14:45 +01:00
Alexander Bock
01a04a6faa Fix missing keybind for taking screenshots (closes #1786) 2021-11-26 14:50:19 +01:00
Malin E
6d89897c25 Merge branch 'feature/multiple-joysticks' into project/spaceship-installation 2021-11-24 13:29:24 +01:00
Emma Broman
2c7bbc5dee Update GUI hash
Includes fix for broken touch gui
2021-11-23 11:42:33 +01:00
Malin E
47a8287cf5 Add joystick assets and spaceship profile 2021-11-19 10:40:25 +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
474e96d267 Merge branch 'master' into feature/camera-control-during-path 2021-11-17 09:42:44 +01:00
Emma Broman
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
Malin E
5ae9bfcd14 Fix shouldInvert default value for joysticks 2021-11-15 12:56:38 +01:00
Malin E
f591ba2195 Fix roll for controllers 2021-11-15 11:25:12 +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
2b4e1ae8fd Update name in PS4 and Xbox assets 2021-11-11 09:26:04 +01:00
Malin E
5ed69aea6b Update joysitck assets
* NOTE: Xbox and PS4 names have not yet been added
2021-11-05 13:03:10 +01:00
eriksunden
24ce66aad4 Feature/tileinterpolation (#1769)
* Interpolation of tiles added to tileprovider, with additional new shaders to make this work.
 * Asset file for testing interpolation

Co-authored-by: tobiasp93 <tobias.pettersson@liu.se>
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
2021-11-01 09:24:40 +01:00
Malin E
c94ce3c78a Move reparent script 2021-10-25 11:05:31 +02:00
Malin E
a8c74979c1 Merge branch 'master' into feature/animation-fixes 2021-10-25 10:51:13 +02:00
ElonOlsson
d7f9c1a124 merge with master 2021-10-14 11:07:01 -04:00
ElonOlsson
d0dfa67641 removed a space 2021-10-14 11:01:50 -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
ElonOlsson
7905c7acc2 quick bug fix 2021-10-13 14:18:53 -04:00
Malin E
659cc09e4b Address PR comments 2021-10-12 08:52:03 +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
630360cfad Fix broken backward scripts in scriptScheduler 2021-10-11 10:29:20 +02:00
Malin E
e2c592e049 WIP: Add groups to scriptScheduler
* NOTE: This breaks the backwards scripts
2021-10-08 19:17:06 +02:00
Malin E
48597ec222 Merge branch 'master' into feature/animation-fixes 2021-10-08 16:22:18 +02:00
Malin E
db4f4e18ac Add action to toggle jwst trails 2021-10-08 16:20:54 +02:00
Malin E
983f7c2838 Fix forward JWST play script timing 2021-10-08 14:32:20 +02:00