mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 04:58:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
10,928 Commits 84 Branches 47 Tags
f8d7d5386a2cbe29735811a73f5ace36564a1a13
Commit Graph

10928 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Kilby f8d7d5386a terminate ZoneScoped calls (required after Tracy update) 2023-05-16 11:07:01 +02:00
Alexander Bock 8b5b9432b6 Add new property to IndexSequenceTileProvider that shows the number of available images (closes #2688) 2023-05-15 22:16:15 +02:00
Ylva Selling b5a2403782 Add a local video example asset 2023-05-15 15:34:40 -04:00
Ylva Selling cc7047f56c Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2023-05-15 15:34:14 -04:00
Ylva Selling dfac59e353 Update GUI 2023-05-15 15:34:05 -04:00
Alexander Bock b11b8c1cb6 Correctly detect whether a profile in the editor is a user or built-in profile (closes #2687) 2023-05-15 21:17:04 +02:00
Alexander Bock f31dce7f01 Jenkins fixes (#2685) 
* Update SGCT repository
* Update Ghoul
* Update codegen
 2023-05-13 10:25:25 +02:00
Gene Payne eacc5b213d Adds scheduled scripts to enable shading outside of image acquisitions (#2663) 2023-05-12 17:05:41 -06:00
Ylva Selling db193bcc8f Add Dawn mission 2023-05-12 15:31:30 -04:00
Ylva Selling b529a5c67e Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2023-05-12 11:08:39 -04:00
Micah Acinapura 4731e8e0a8 MacOS build fixes (#2622) 
Co-authored-by: Alexander Bock <alexander.bock@liu.se>
Co-authored-by: Joakim Kilby <jockekilby@gmail.com>
 2023-05-12 09:35:59 +02:00
Ylva Selling 7d195cbe60 Add Juno mission file 2023-05-11 16:53:06 -04:00
Ylva Selling d06de8b9c0 Add apollo mission to profile 2023-05-11 15:57:50 -04:00
Ylva Selling c1e9993c27 Add option to have actions in a milestone in mission UI 2023-05-11 14:58:54 -04:00
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
Ylva Selling fbf40a4d79 Show animation in example asset modelshader.asset 2023-05-11 10:00:18 -04: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