Commit Graph

2043 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
sylvass
1fe86fe843 Cleanup, make hover circle add itself via lua function to the module. Make functions consistent how they interact with WWT 2021-12-01 13:48:12 -05:00
Malin E
8766ba1242 Remove local variable in example 2021-11-30 17:22:46 +01:00
sylvass
0e548b4a1b Merge branch 'master' into thesis/2021/skybrowser
# Conflicts:
#	data/assets/util/webgui.asset
#	modules/webbrowser/src/screenspacebrowser.cpp
#	src/rendering/renderengine.cpp
2021-11-30 10:47:46 -05: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
sylvass
979ba8544f Update asset file to new structure 2021-11-23 15:51:29 -05:00
sylvass
54ed28ce66 Update assethelper to new version 2021-11-23 15:49:02 -05:00
sylvass
27d68556ec Update the structure of the renderable sky browser to inherit fronm renderable plane and wwtcommuicator 2021-11-23 09:48:07 -05:00
Emma Broman
2c7bbc5dee Update GUI hash
Includes fix for broken touch gui
2021-11-23 11:42:33 +01:00
sylvass
80e4e26b43 Remove old screen space sky browser 2021-11-17 10:59:52 -05:00
Malin E
78b1f2c6e1 Remove support for sticky axis and sensitivity to Property type 2021-11-17 16:57:05 +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
sylvass
2b1de9eebb Use Pair class to communicate with the target and browser 2021-11-05 10:07:30 -04: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
sylvass
d5422f429d Restructure and clean up 2021-11-03 10:37:20 -04: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
sylvass
c895f24989 Cleanup 2021-10-25 09:38:09 -04: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
Malin E
1a4ded3b3b Add action to switch forward/backward direction of timelapse 2021-10-07 13:44:41 +02:00
Malin E
826697360d Add dashboard text with time speed information 2021-10-07 11:55:02 +02:00
Malin E
992778bd50 Make JWSTPosition to a TimelineTranslation
* Switches from being parented to Earth to being parented to L2 at 2018
  NOV 01 00:00:00

* JWSTPosition depends on two horizons files that have different
  observers (Earth and L2)
2021-10-06 18:00:10 +02: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
ElonOlsson
60e2abdbb8 bastille day 2000 renaming 2021-10-05 10:22:55 -04:00
Malin E
19e936ea18 Fix JWST keybindings 2021-10-04 11:17:12 +02:00
Malin E
be263ca436 Decrease size of JWST label 2021-10-04 11:08:36 +02:00
Malin E
102139176b Split trail into two, one with Earth as parent and one with L2 2021-10-04 11:02:41 +02:00
Malin E
9c36ce82d5 Add action to turn off all trails except the Moon 2021-10-01 18:28:25 +02:00
Malin E
70e3e2f974 Rename some actions 2021-10-01 17:52:38 +02:00
Malin E
9169b11547 Add action to start the timelapse 2021-10-01 17:46:30 +02:00