Commit Graph

10913 Commits

Author SHA1 Message Date
Alexander Bock
006aefdff0 Remove explicit specification of read-only profiles and read-only configuration files and use a filesystem lookup instead 2023-05-11 16:03:13 +02:00
Joakim Kilby
2268802978 remove flickering during tileindex loading
by restoring framebuffer, shader & viewport state/bindings after
rendering text.
2023-05-11 12:36:46 +02:00
Ylva Selling
3c4c362683 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2023-05-10 17:15:44 -04:00
Ylva Selling
e7e50bd522 Update ghoul to be able to build 2023-05-10 17:15:38 -04:00
Alexander Bock
9447a351b4 Increase the TilePixelSize for heightmaps loaded from info files 2023-05-10 23:13:27 +02:00
Alexander Bock
f6f3621b5b Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2023-05-10 22:59:35 +02:00
Alexander Bock
260e7ecd2e Resetting the CME loop also sets the delta time to 1 (closes #2516). Also fix error occurring when loading the bastille day profile 2023-05-10 22:59:21 +02:00
Ylva Selling
7377ffbcc9 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace
# Conflicts:
#	data/assets/scene/solarsystem/missions/jwst/jwst.asset
2023-05-10 16:58:12 -04:00
Ylva Selling
f44be60f2d First version of jwst mission 2023-05-10 16:51:40 -04:00
Alexander Bock
26bdafe43c Don't try to print an error about different enabled-state loading when loading an asset first from the profile (closes #2680) 2023-05-10 22:21:34 +02:00
Alexander Bock
a2c3eb2884 Warn if profile contains empty property line, but do not crash. Cleanup JWST profile. Prevent crash when moving to early date in JWST (closes #2617) 2023-05-10 00:58:09 +02:00
Alexander Bock
25e29fccc4 Update the bastille day assets to follow the new fade structure (closes #2627) 2023-05-10 00:31:14 +02:00
Alexander Bock
b1090dde69 Apply transformation matrices to labels as well (closes #2650) 2023-05-09 22:59:08 +02:00
Alexander Bock
58d7f3a41f Update submodules 2023-05-09 22:23:29 +02:00
Ylva Selling
4cd02a6c78 Update voyager mission file 2023-05-09 15:43:52 -04:00
Alexander Bock
a5b8368b50 Fix bugs in videoplayer (#2678)
Remove from syncable list after destruction; only use one fbo; remove code no longer used

Co-authored-by: Ylva Selling <ylva.selling@gmail.com>
2023-05-09 20:04:15 +02:00
Ylva Selling
77ba366445 Update GUI 2023-05-09 12:44:06 -04:00
Ylva Selling
dc18dcfd3c First draft of artemis mission asset 2023-05-08 17:19:17 -04:00
Ylva Selling
487a0a8733 Add missing property dimensions to screenspace browser 2023-05-08 14:10:02 -04:00
Micah Acinapura
7abcf8d37d changing layer name/description to match image (#2657) 2023-05-08 11:35:02 -04:00
Gene Payne
74318ea472 Bump to sgct repo version that doesn't use static zlib 2023-04-28 14:14:45 -06:00
Ylva Selling
0ae1cbee5e Update to new GUI 2023-04-27 12:57:09 -04:00
Ylva Selling
e4c347ca3f Add skybrowser and exoplanet modules to base asset 2023-04-27 12:56:39 -04:00
Ylva Selling
6f0e0318a1 Remove exoplanets module and skybrowser module from base_blank.asset 2023-04-27 12:05:06 -04:00
Ylva Selling
8c3fd55fb5 Update to new GUI 2023-04-27 11:59:23 -04:00
Ylva Selling
142aba3684 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2023-04-27 11:30:38 -04:00
Ylva Selling
b5d6ddc25a Only show properties that are valid for real time playback when real time playback is selected 2023-04-27 11:30:34 -04:00
Ylva Selling
d827d0a3c2 Add property for toggling looping of video 2023-04-27 11:29:49 -04:00
Alexander Bock
6dfd0cd3a8 Remove warnings on MSVC 2023-04-26 23:51:16 +02:00
Ylva Selling
bba5fe6eaa Update gui hash for new documentation topic 2023-04-26 17:39:38 -04:00
Ylva Selling
2b3333c9ac Merge branch 'feature/documentation-cleanup' 2023-04-26 17:37:50 -04:00
Ylva Selling
ed34d5e4a6 Update documentation to new format (lower case keys and backwards compatible) 2023-04-26 17:36:01 -04:00
Ylva Selling
d6ddd86a35 Rewrite asset json function to nlohmann::json 2023-04-26 17:30:51 -04:00
Ylva Selling
9a1e6b8002 Remove old json functions 2023-04-26 16:58:55 -04:00
Ylva Selling
529ffc488c Use the gui name as the name for properties 2023-04-26 16:39:07 -04:00
Ylva Selling
a88fb96827 Sort properties 2023-04-26 16:31:17 -04:00
Ylva Selling
e0fc813525 Update scripting documentation to be backwards compatible 2023-04-26 15:10:32 -04:00
Ylva Selling
a668f08f03 Make documentation file use camelCase for the keys 2023-04-26 13:33:39 -04:00
Micah Acinapura
5ea6f1d21c handled underscore and period special in c++ for cef bug; also remove… (#2643)
* handled underscore and period special in c++ for cef bug; also removed F5 special code and changed to keybinding; closes #853; closes #896

* removed extra line

* fix formatting from review
2023-04-26 08:22:48 -04:00
Adam Rohdin
c0a726a55b Fixed Property URI in asset and added Juice as Read-Only profile 2023-04-26 11:16:22 +02:00
Adam Rohdin
30cfa7ba85 Fixed property URI via Profile Editor GUI 2023-04-26 11:02:43 +02:00
Alexander Bock
8ae3a9dc53 Use correct v31 Juice Kernels 2023-04-26 10:41:04 +02:00
Alexander Bock
44b7536a1e Add a dashboard to the Juice profile 2023-04-26 10:24:31 +02:00
Ylva Selling
a20b69fbb2 Merge branch 'master' into feature/documentation-cleanup 2023-04-25 17:45:57 -04:00
Ylva Selling
d13dcb714e Update documentation submodule to make data file not get modified in git when running OpenSpace 2023-04-25 17:41:20 -04:00
Ylva Selling
3ad2d35cb4 Make all json keys lower case 2023-04-25 17:40:19 -04:00
Ylva Selling
d267bc0dad Remove documentation generator 2023-04-25 16:44:10 -04:00
Ylva Selling
948fdd024b Remove generateJson function from the DocumentationGenerator and move sortJson function to json_helper 2023-04-25 16:32:04 -04:00
Emma Broman
1762bec1c2 Make the Enabled properties advanced, show in GUI, and change name
Update GUI hash to show enabled property
2023-04-25 11:29:41 +02:00
Micah Acinapura
297fa5b274 removed camera lighting from messenger_sc; changed sample intervale for NH trail;changed terra to viirs20 for jwst profile; (#2631) 2023-04-24 12:09:07 -04:00