mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 12:10:52 -06:00
Code Issues Packages Projects Releases Wiki Activity
11,091 Commits 99 Branches 46 Tags
80ddf3e1878741ea367fd3cdbc1cf6bd1af210c8
Commit Graph

153 Commits

Author SHA1 Message Date
Alexander Bock
4edb796147 Also set the socket type for the server connection correctly; Fix the broken spacetime component again 2023-05-16 15:34:32 +02:00
Alexander Bock
bde840ad03 Remove a bunch of compiler warnings 
* Remove compile warnings
* Coding style fix
 2023-05-16 11:59:28 +02: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
6dfd0cd3a8 Remove warnings on MSVC 2023-04-26 23:51:16 +02: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
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
Alexander Bock
ca916877b2 Adapt the visibility settings for all properties 2023-04-15 09:33:31 +02:00
Ylva Selling
3a5015e182 Fix comments on PR 2023-04-13 11:25:23 -04:00
Ylva Selling
0ccd5d63bd Structured milestones and phases in missions file so they are structured the same 2023-04-12 17:22:01 -04:00
Ylva Selling
51a48d2112 Merge remote-tracking branch 'origin/master' into feature/missions 2023-04-12 16:09:42 -04:00
Ylva Selling
bb7079a845 Rename important date to milestone 2023-04-11 15:58:24 -04:00
Ylva Selling
5a1caf31dc Add link to mission 2023-04-11 15:24:48 -04:00
Ylva Selling
24e1fe2baf Add image & description to mission topic 2023-04-10 16:18:28 -04:00
Ylva Selling
15ec4aa41a Add important dates to misson 2023-04-10 09:43:01 -04:00
Alexander Bock
1057b369c9 Harmonize the handling of the IsLocal vs Synchronized state of actions (closes #2566) 2023-04-03 10:29:20 +02:00
Ylva Selling
cb20302358 Add capture times to the missions topic 2023-03-29 16:26:55 -04:00
Ylva Selling
99edcfc4e7 Merge remote-tracking branch 'origin/master' into feature/missions 
# Conflicts:
#	data/assets/scene/solarsystem/missions/newhorizons/newhorizons.asset
#	data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset
#	data/assets/scene/solarsystem/missions/osirisrex/osirisrex.mission
#	data/assets/scene/solarsystem/missions/perseverance/perseverance.asset
#	include/openspace/mission/missionmanager.h
#	modules/server/src/connection.cpp
#	src/mission/missionmanager.cpp
#	src/mission/missionmanager_lua.inl
 2023-03-21 12:03:10 -04:00
Alexander Bock
375e5c6561 Tracy Update (#2534) 
* Update the Tracy repository
* Update submodules
 2023-03-01 11:48:21 -07: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
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
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
Alexander Bock
3d95554222 Sort actions based on their name or their identifier if the names don't exist 2023-01-29 20:37:43 +01:00
Alexander Bock
a2a1554c9a Small cleanup of property documentation 2023-01-09 00:11:58 +01:00
Alexander Bock
4f4764209f Happy new year 2023-01-02 11:19:33 +01:00
Ylva Selling
ee22c99cec Cleanup 2022-11-30 12:12:18 -05:00
Alexander Bock
44e5b17ec9 Global pass over the code to remove trailing spaces 2022-11-22 21:06:52 +01:00
Ylva Selling
e37f3a2948 Initial draft 2022-11-22 10:49:58 -05:00
Alexander Bock
6249fa6d89 Collection of a number of changes (#2286) 
* Cleanup Property code
* Remove NOLINT statements
* Return Property class types as string_view
* Remove getStringValue function
* Simplify string value retrieval
* Ensure that image paths in the ImageSequenceTileProvider are sorted (closes #2205)
* Some cleanup of OpenSpaceEngine
* Cleanup documentation
* Some more cleanup of engine classes
* Some more cleanup
* Update SGCT repository
* Use new Jenkins node identifiers as the old method broke with update
 2022-10-30 12:54:14 +01:00
Alexander Bock
664eb60f4f Increase the compile times by including more precompiled headers (#2217) 
* Define WIN32_LEAN_AND_MEAN and VC_EXTRALEAN globally
* Use forked version of TUIO, some more work on precompiled headers
* Improvements for the Kameleon module
 2022-08-26 16:32:21 +02:00
Alexander Bock
979a5e3378 SkyBrowser Hash Handling (#2201) 
* Add the loading of a hash for wwt image files and automatically force a redownload of the files if the hash has changed
* Move the wwtdataimages location into the sync folder
* Some general code cleanup
 2022-08-22 15:16:07 +02:00
Alexander Bock
163ac4dcef Cleanup of mostly asset files 
- Fixes for all files
 - constexpr cleanup
 - Cosmetic changes
 - Remove punctuation from the end of messages
 2022-07-28 17:21:59 +02:00
Alexander Bock
9cc4c595a8 Code Cleanup (#2191) 
* constexpr const -> constexpr
* const char* -> std::string_view
 2022-07-25 15:57:45 +02:00
Ylva Selling
7ec6c247cc Fix comments on PR 2022-07-21 12:38:59 -04:00
Ylva Selling
a762f9ebc8 Fix flipped latitude and longitude 2022-06-29 07:20:00 -04:00
Ylva Selling
b6e4f6dcaf Merge branch 'master' into feature/getting-started-tour 
# Conflicts:
#	modules/skybrowser/skybrowsermodule.cpp
 2022-06-29 05:21:45 -04:00
Alexander Bock
9b1143f02f Ubuntu 22.04 and GCC11 fixes (#2163) 
* Update CEF version
* Update Ghoul
* Update SGCT
* Update codegen
* Remove warnings happening on Ubuntu 22.04 with GCC 11
* AppleClang warning fixes
* Compile fix for Ubuntu and MacOS
* Add Qt 6.2.3 to the CMAKE_PREFIX_PATH
 2022-06-28 00:46:01 +02:00
Ylva Selling
817fad60c3 Add topic for geo position of camera 2022-06-01 15:08:14 -04:00
Ylva Selling
c9a63274a8 Move presync callback functionality from SkyBrowserModule to ServerModule in order to expose the functionality to other topics as well 2022-06-01 15:06:40 -04:00
Alexander Bock
2816ad4d8d Make the connection a shared_ptr and let the LuaScriptTopic return lambda keep a copy of it (closes #1940) 2022-05-06 00:32:25 -07:00
Emma Broman
5362c58db6 Define that server module depends on skybrowser 2022-05-02 10:13:26 +02:00
Ylva Selling
4692c4d74b Fix comments on pull request 2022-04-28 11:33:54 -04:00
Emma Broman
5e07d9f134 Update a comment 2022-04-28 14:33:39 +02:00
Emma Broman
8896b92f82 Only send skybrowser topic message if data changed 
Maybe a little ugly to check the jsonString, but it does the job for now. Later we should probably make a nicer implementation
 2022-04-28 12:40:52 +02:00
Emma Broman
24e6cb118e Don't try to access module if it no longer exists 2022-04-28 09:47:54 +02:00
Ylva Selling
447ada6b0e Remove is image collection loaded from topic 2022-04-27 16:06:11 -04:00
Emma Broman
de68e406b0 Send topic on presync instead of from itmemanager (closes #2037) 2022-04-27 18:20:51 +02:00
Ylva Selling
8a292c1645 Expose time interval to user in config file for sky browser topic. This will give the user control over how often data is passed. Hopefully a future proof fix for GPU crash 2022-04-26 14:39:00 -04:00
Ylva Selling
19103a1540 Add browser ratio to the skybrowser topic 2022-04-26 14:37:35 -04:00
Ylva Selling
9d350cc8af Merge remote-tracking branch 'origin/master' into feature/skybrowser 2022-04-18 15:39:16 -04:00