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
|
276ea540cd
|
Merge branch 'master' into project/spaceship-installation
|
2021-12-14 16:09:29 +01:00 |
|
Emma Broman
|
c7b47fc2c0
|
Slight improvement to AvoidCollision camera path
Fixes "bouncing motion" that sometime happened when going to a position that is close to the original position
|
2021-12-14 16:09:17 +01:00 |
|
Emma Broman
|
bf830f185f
|
Oops, remove forgotten debug prints
|
2021-12-14 14:19:36 +01:00 |
|
Emma Broman
|
ff54ad27a8
|
Do a temporary workaround to avoid going to the exact same position
|
2021-12-14 14:08:59 +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 |
|
Emma Broman
|
1e4f7b30a0
|
Only apply rotation from input is actually enabled
And normalize resulting rotation quaternion, just to be safe
|
2021-12-13 13:51:04 +01:00 |
|
Malin E
|
27948b8a43
|
Set up Thrustmaster test assets
|
2021-12-13 13:50:15 +01:00 |
|
Malin E
|
09b9d8437f
|
Improve zoom offset factor
|
2021-12-13 13:26:15 +01:00 |
|
Emma Broman
|
689e67911f
|
Make path end a little earlier, to be safe from numeric errors at the very end
|
2021-12-13 11:07:30 +01:00 |
|
Malin E
|
6f6519fbf7
|
Add property to zomm slightly closer or further away
|
2021-12-10 11:39:47 +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 |
|
Emma Broman
|
8f635743e1
|
Merge branch 'feature/camera-path-fixes' into project/spaceship-installation
|
2021-12-09 13:40:47 +01:00 |
|
Emma Broman
|
0932b91482
|
Remove easing function for dampening
Looks better without it
|
2021-12-09 13:40:31 +01:00 |
|
Emma Broman
|
a358985f9a
|
Merge branch 'feature/camera-path-fixes' into project/spaceship-installation
|
2021-12-09 13:36:46 +01:00 |
|
Emma Broman
|
976d7fac31
|
Update the camera path speed to behave better close to surfaces
|
2021-12-09 13:34:52 +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
|
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
|
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
|
cfd8b145f3
|
Remove osc files that should not be here
|
2021-12-07 11:07:05 +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
|
08cdfd3125
|
Add new joystick asset
|
2021-12-07 10:30:15 +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 |
|
Malin E
|
332850999a
|
Add osc files
|
2021-12-06 15:59:39 +01:00 |
|
Emma Broman
|
57e662e8e2
|
Update a couple of broken tests
|
2021-12-06 13:47:29 +01:00 |
|
Emma Broman
|
59dc296cf1
|
Update ghoul to use new luaTableToString function
And update some tests based on the change
|
2021-12-06 13:21:39 +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 |
|
GPayne
|
36f06c494f
|
Updating version of ghoul using updated tracy and websocketpp refs
|
2021-12-03 12:42:34 -07:00 |
|
GPayne
|
0c0e6957f6
|
Updating version of sgct which uses OpenSpace fork of tracy
|
2021-12-03 12:17:03 -07:00 |
|
Emma Broman
|
3638a118cb
|
Revert "Merge branch 'feature/quickfix-zoomout-camerapath-collisions' into project/spaceship-installation"
This reverts commit 386b47bfb8, reversing
changes made to 1f71904322.
|
2021-12-03 12:48:30 +01:00 |
|
Emma Broman
|
f84dbae70d
|
Merge branch 'master' into project/spaceship-installation
|
2021-12-03 11:22:53 +01:00 |
|
Emma Broman
|
386b47bfb8
|
Merge branch 'feature/quickfix-zoomout-camerapath-collisions' into project/spaceship-installation
|
2021-12-03 10:41:54 +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 |
|
Emma Broman
|
a921f983ca
|
Fix broken navigation states: Now works with aim as well as anchor
|
2021-12-01 14:30:28 +01:00 |
|
Malin E
|
7191d536ad
|
Add Mars moon models
|
2021-12-01 14:28:15 +01:00 |
|
Emma Broman
|
76ea508dab
|
Tiny navigation code cleanup/fix
|
2021-12-01 11:31:53 +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 |
|