Commit Graph

6208 Commits

Author SHA1 Message Date
Lovisa Hassler 1f4fe5bdc2 created an InSight cluster label 2019-01-11 16:07:23 -05:00
Agnes Heppich 798631f375 Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn 2019-01-11 13:52:24 -05:00
Agnes Heppich bacb7f4478 added more spacecrafts 2019-01-11 12:21:24 -05:00
Lovisa Hassler 4391843116 abbreviations in capital letters 2019-01-11 12:20:05 -05:00
Lovisa Hassler 670c71a05d renamed the mars cube one sats 2019-01-11 12:06:39 -05:00
Lovisa Hassler 9a8fe35e38 renamed chandraxray to chandra 2019-01-11 11:23:36 -05:00
Agnes Heppich 1dcd069fb1 added MOM and made some tweeks to cluster labels 2019-01-10 19:24:13 -05:00
Agnes Heppich 5646bdd63d Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn 2019-01-10 19:03:32 -05:00
Agnes Heppich e8abb0bb56 added more spacecrafts 2019-01-10 19:03:05 -05:00
Lovisa Hassler 335528f73e got rid of outdated/unnecessary comments 2019-01-10 18:02:01 -05:00
Lovisa Hassler 3ae60924bd Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn 2019-01-10 17:57:16 -05:00
Lovisa Hassler 96d960ec96 got rid of unnecessary logic in shader, added some functions in renderablesignals 2019-01-10 17:57:07 -05:00
Agnes Heppich 58f68dcee4 Merge branch 'master' into thesis/2018/dsn 2019-01-10 17:23:10 -05:00
Agnes Heppich 52ec7079c9 Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn 2019-01-10 17:17:42 -05:00
Agnes Heppich 0b7897fb8b check if parsing is ready before using values 2019-01-10 17:16:28 -05:00
Alexander Bock be6915ecc1 Add Lua function to query property identifiers 2019-01-10 23:06:35 +01:00
Lovisa Hassler 5ed1a1a3fd updated stations GUI so you can search on their site location, as well as updated DSS15 to correct position 2019-01-10 16:55:28 -05:00
Lovisa Hassler 8a4c815d97 improved gui folder structure 2019-01-10 14:33:52 -05:00
Lovisa Hassler 8e224e6111 got rid of stringstream and moved the position of the color marker 2019-01-10 12:37:26 -05:00
Lovisa Hassler 541ab3123d got rid of unnecessary includes 2019-01-09 23:36:54 -05:00
Lovisa Hassler b0073212d8 get rid of magic values 2019-01-09 23:36:21 -05:00
Lovisa Hassler 8d78be8740 added date to dashboard, needed for webgui 2019-01-09 23:35:37 -05:00
Lovisa Hassler c39dd04c46 Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn 2019-01-09 23:24:12 -05:00
Lovisa Hassler bdf2ac1b13 added functionality to dashboard, functionality to show a color dot 2019-01-09 23:23:50 -05:00
Agnes Heppich 642639bf2b Auto merge failed 2019-01-09 20:21:25 -05:00
Agnes Heppich b3d68d83ff only render labels in the timeframe set in asset 2019-01-09 20:12:17 -05:00
Lovisa Hassler da99fa779d restructured asset files 2019-01-09 13:41:39 -05:00
Agnes Heppich 39a40cdd3f updated submodule 2019-01-09 11:58:11 -05:00
Agnes Heppich 05412ad9bf Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn 2019-01-09 11:31:56 -05:00
Agnes Heppich 2ddb2a51eb Added point to label to show where spacecrafts are 2019-01-09 11:30:53 -05:00
Lovisa Hassler 071367afd8 changed folder structure for spacecrafts 2019-01-08 18:27:54 -05:00
Lovisa Hassler d2e39a64c2 moved signals asset 2019-01-08 17:57:27 -05:00
Lovisa Hassler 65d10acae7 DSS34 position fixed 2019-01-08 17:39:53 -05:00
Lovisa Hassler 51016536d5 extended the range of flow speed property 2019-01-08 16:13:15 -05:00
Lovisa Hassler b8cec70013 Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn 2019-01-08 15:37:25 -05:00
Lovisa Hassler 0177f3915a renamed renderablelabel 2019-01-08 15:37:14 -05:00
Lovisa Hassler c5dbb5de49 fixed so that textcolor property works, only overrided by individual label color 2019-01-08 15:18:10 -05:00
Agnes Heppich c72bcff60b tweek color and fadde range for labels 2019-01-08 14:55:21 -05:00
Lovisa Hassler 8920f03053 Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn 2019-01-08 13:12:28 -05:00
Lovisa Hassler a9bd05b5ef fixed precision issues for stations, handled similar to spacecrafts 2019-01-08 13:12:18 -05:00
Agnes Heppich 0b63b2f95c hot keys for speed depending on views 2019-01-08 12:41:09 -05:00
Lovisa Hassler fc56cf332b updating Canberra Rotation matrix, and some cleanup/renaming for stations asset file 2019-01-08 12:17:15 -05:00
Agnes Heppich 0534491855 Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn 2019-01-08 12:02:15 -05:00
Agnes Heppich 9eebb7897d all planet trails same color and tweeked signal colors 2019-01-08 12:02:01 -05:00
Lovisa Hassler e7aa3dd258 Merge branch 'thesis/2018/dsn' of github.com:OpenSpace/OpenSpace into thesis/2018/dsn 2019-01-08 11:16:23 -05:00
Lovisa Hassler 9b6e7ffae3 updated signaldata path 2019-01-08 11:16:15 -05:00
Agnes Heppich 775e176e59 :Merge remote-tracking branch 'origin' into thesis/2018/dsn 2019-01-08 10:59:51 -05:00
Agnes Heppich 5fbe5cf269 clean up and remove testRADEC 2019-01-08 10:56:15 -05:00
Alexander Bock ebf55f3029 Fix issue preventing from setting multiple vector properties through a lua script 2019-01-08 13:57:09 +01:00
Agnes Heppich 75217ad789 change label size 2019-01-07 14:50:49 -05:00