Commit Graph

10418 Commits

Author SHA1 Message Date
Malin E
7484502db9 Fix model "shadow" bug 2023-02-21 11:29:51 +01:00
Malin E
17c7a3af19 Update ghoul 2023-02-17 08:30:57 +01:00
Malin E
11cc094e7d Update Dawn model 2023-02-16 16:24:02 +01:00
Malin E
05252b8258 Merge branch 'master' into feature/model-opacity
* Solve conflict in iss.asset
2023-02-16 12:07:12 +01:00
Malin E
108123704b Update ghoul 2023-02-16 11:40:39 +01:00
Adam Rohdin
9dc008ad12 Small deinitialization fix for apollo actions 2023-02-16 11:20:25 +01:00
Adam Rohdin
d8711cedd2 Voyager assets now respects asset.enabled argument when it's passed in asset.require(). Added tags to Voyager models in assets. 2023-02-15 14:18:57 +01:00
Gene Payne
a0a42ee13b Replace profile actions/keybind editor button with single close button (#2497) 2023-02-14 12:17:05 -07:00
Emma Broman
352c9dd5ec Touch module code cleanup (#2465)
* Remove unused feature that allowed us to "pick" nodes using touch (it didn't really work and had some nasty hardcoded and costly implementation). Fixes Touch interaction picking refactor #1041

* General refactoring of code and removing redundant code

* Make touch markers prettier (change default color and smoothen edges)

* Add module property to control which renderable types are "directly touchable"

* Add SGN property to control which individual nodes are "directly touchable" ("SupportsDirectInteraction")

* Fix stuttering when zooming in closer than the orbitalnavigator allows
2023-02-14 13:55:24 +01:00
Emma Broman
9d53b1f62d Add option to specify an offset distance for RenderableNodeLine (#2483) 2023-02-14 13:07:05 +01:00
Alexander Bock
c242104baf Improve the reporting of specification errors 2023-02-13 22:16:23 +01:00
Alexander Bock
b38db8a050 Fix to make the Gaia stars work with the new download method 2023-02-13 20:44:22 +01:00
Alexander Bock
e39a139f82 Update GUI hash to fix one that didn't build successfully 2023-02-13 19:50:05 +01:00
Ylva Selling
e924b41bf0 Merge pull request #2359 from OpenSpace/issue/2313
Issue/2313: Ensure all nodes in a cluster loads the image collection in the sky browser
2023-02-13 12:55:08 -05:00
Ylva Selling
488dfe2603 Address comment on PR 2023-02-13 12:52:51 -05:00
Ylva Selling
4a15cf889c Merge pull request #2456 from OpenSpace/issue/2409
Fix sky browser space craft pointing
2023-02-13 12:48:16 -05:00
Ylva Selling
d7324af322 Update gui hash 2023-02-13 12:47:52 -05:00
Ylva Selling
c03a9ae360 Address comments on PR: use Spacecraft instead of Spacecraft etc 2023-02-13 12:46:08 -05:00
Adam Rohdin
756ade4e7d DashboardItem now listens to paramter 'enabled' in constructor 2023-02-13 16:09:07 +01:00
Adam Rohdin
e69ec8ac4d Neater solution than cb45f96 2023-02-13 10:14:08 +01:00
Ylva Selling
f9692f8f22 Change delimiter to correct character 2023-02-10 13:06:52 -05:00
Ylva Selling
0ee565027e Merge remote-tracking branch 'origin/master' into issue/2313
# Conflicts:
#	modules/skybrowser/skybrowsermodule_lua.inl
2023-02-10 13:06:38 -05:00
Adam Rohdin
28c5718959 Issue/2408: Fixed #2491 and #2476
* Moved actions that were defined in profiles to assets and updated the keybindings in the profiles

* #2476 Added actions to turn on/off minor moons and their trails (for-all and per-planet)
2023-02-10 17:04:49 +01:00
Ylva Selling
fb3628b684 Merge remote-tracking branch 'origin/master' into issue/2409 2023-02-10 10:20:05 -05:00
Adam Rohdin
cb45f962e5 Fix bug where triggering of action via keybinds didn't get called 2023-02-10 15:52:41 +01:00
Alexander Bock
e37a9ed213 Linux compile fix 2023-02-10 08:59:40 +01:00
Ylva Selling
2f8da28c7d Merge pull request #2414 from OpenSpace/issue/2403
Change sky browser to use id's instead of indices to get the images
2023-02-09 16:30:55 -05:00
Ylva Selling
3de5c1b75c Update hash to updated GUI 2023-02-09 16:29:54 -05:00
Ylva Selling
2f96e54c8e Merge remote-tracking branch 'origin/master' into issue/2403
# Conflicts:
#	modules/skybrowser/include/wwtcommunicator.h
#	modules/skybrowser/src/wwtcommunicator.cpp
2023-02-09 16:20:42 -05:00
Adam Rohdin
90250d7099 Fixed bug where default value for 'element' was seen as invalid. 2023-02-08 17:35:38 +01:00
Adam Rohdin
a870d64eb5 Extended EndTime for Voyager 1 & 2 until 2300 so that trails are visible for longer. 2023-02-08 17:14:14 +01:00
Emma Broman
2027815157 Add some helper scripts to modify property values (appendToList, add, invertBoolean) 2023-02-08 16:00:34 +01:00
Malin E
7d2f781603 Only render with a two pass solution if the model is not opague 2023-02-08 14:14:59 +01:00
Alexander Bock
be122a5a73 No longer trigger an assert when binding a key to an action that does not exist (closes #2485) 2023-02-06 23:17:16 +01:00
Alexander Bock
f7ff2e33da Properly report an error when an .info file is missing the identifier, preventing the addition of a layer without one (closes #2490) 2023-02-06 23:07:21 +01:00
Alexander Bock
77102194ae Update README.md 2023-02-06 21:33:41 +01:00
Alexander Bock
79ad5776cc CMake cleanup (#2489)
* CMake Cleanup
* Warning suppression with CEF
* Use SGCT tinyxml in skybrowser for now
* Disable warnings about missing field initializers
2023-02-05 23:24:12 +01:00
Gene Payne
dfc62e44a6 Changes to visual tests mainly to switch from keys to actions (#2484)
* Changing 'keys' test case to 'action' in all .ostest files
* Change recording files to use the standard extension
* Add recording file extension to test file format
* Removed the unwanted second wildcard from set prop command
* Added 10 sec waits after profile.setup.apollo11 action in some tests
2023-02-03 16:30:10 -07:00
Ylva Selling
938ae6ffe1 Merge remote-tracking branch 'origin/master' into issue/2403
# Conflicts:
#	ext/ghoul
2023-02-02 16:39:29 -05:00
Ylva Selling
d7eec159fc Merge pull request #2426 from OpenSpace/issue/2425
Fix bug that channels in cluster don't set the field of view to the same value after animating
2023-02-02 16:17:06 -05:00
Alexander Bock
0615eab81d Ignore any key that is used to abort the shutdown sequence (closes #2478) 2023-02-01 23:46:40 +01:00
Alexander Bock
1a88d898d8 Update submodules 2023-02-01 23:41:55 +01:00
Emma Broman
7e94c4c284 Remove unintentional default value for skybrowser/exoplanet module enabled property (closes #2464) 2023-02-01 18:53:06 +01:00
Emma Broman
a5a65bef9d Update GUI hash (again :) ) to fix #2452 2023-02-01 18:42:18 +01:00
Emma Broman
06b168b0ed Update gui hash to fix broken Actions GUI (closes #2467)
f1f51cb11d
2023-02-01 18:26:12 +01:00
Emma Broman
997c022357 Update GUI hash to fix broken Focus menu search (closes #2466)
Also make it obvious that gui hidden property is false per edfault
2023-02-01 18:15:43 +01:00
Malin E
14edda9e61 Remove problematic manual depth test code 2023-02-01 16:25:19 +01:00
Malin E
00e80139a2 Solve one more conflict 2023-02-01 16:07:42 +01:00
Malin E
4d9983a867 Solve 1 more conflict 2023-02-01 14:57:31 +01:00
Malin E
f490fccee6 Merge branch 'master' into feature/model-opacity
* Solve conflicts in ghoul, renderablemodel.cpp and iss.asset
2023-02-01 14:52:33 +01:00