mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 10:40:09 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,162 Commits 99 Branches 46 Tags
cd92ea31dddaa90501c3448e1a501cc50d36d016
Commit Graph

10162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ylva Selling
cd92ea31dd First draft of using equatorial coordinates for dragging 2022-10-27 17:09:22 -04:00
Ylva Selling
fae2fdb053 Merge branch 'issue/2093' of https://github.com/OpenSpace/OpenSpace into issue/2093 
# Conflicts:
#	modules/skybrowser/src/targetbrowserpair.cpp
 2022-10-12 09:16:14 -04:00
Ylva Selling
0f55616a3e Merge branch 'master' into issue/2093 
# Conflicts:
#	modules/skybrowser/src/targetbrowserpair.cpp
 2022-10-12 09:14:41 -04:00
Ylva Selling
2dd981aed3 Update hash for GUI 2022-10-07 16:21:41 -04:00
Ylva Selling
c710aa3a34 Ensure browser is initialized properly before executing javascript 2022-10-07 16:20:43 -04:00
Ylva Selling
59209928e6 Clamp user input 2022-10-07 16:08:51 -04:00
Ylva Selling
49da498ee3 Fix bug of sending set radius message too early 2022-10-07 16:08:34 -04:00
Ylva Selling
d998d434ea Merge remote-tracking branch 'origin/master' into issue/2029 2022-10-07 15:04:49 -04:00
Emma Broman
06a22c2592 Fix problem with camera path not finishing properly on skipToEnd 2022-10-07 09:17:58 +02:00
Emma Broman
bcdeeef351 Remove an extra line 2022-10-06 22:28:08 +02:00
Emma Broman
8192292229 Move findNodeNearTarget function from path to pathnavigator 
To reduce conflicts between wisdome installation branch and master
 2022-10-06 22:25:27 +02:00
Emma Broman
5a970ee6e0 Add a function to skip immediately to the end of a playing camera path 2022-10-06 22:13:06 +02:00
Ylva Selling
cfb3859bb5 Merge remote-tracking branch 'origin/feature/skybrowser-reload' into issue/2029 
# Conflicts:
#	modules/skybrowser/include/renderableskytarget.h
#	modules/skybrowser/include/wwtcommunicator.h
#	modules/skybrowser/skybrowsermodule.cpp
 2022-10-06 15:33:40 -04:00
Ylva Selling
41b45de1fb Merge remote-tracking branch 'origin/master' into issue/2029 2022-10-06 15:13:01 -04:00
Emma Broman
ec3a765d1a Add an empty profile 2022-10-06 17:16:53 +02:00
Micah Acinapura
90f2ad0cbe telling browser to reload collection on reload 2022-10-04 14:12:00 -04:00
Malin E
866b37fac3 Expose ambient intensity value for globes as a property 2022-09-28 12:03:41 +02:00
Malin E
0bf06427e2 Merge pull request #2242 from OpenSpace/feature/grid-labels 
Labels update
 2022-09-28 11:19:28 +02:00
Malin E
8129762524 Add loggercat for labelscomponent 2022-09-28 11:14:07 +02:00
Malin E
7883311740 Merge branch 'master' into feature/grid-labels 2022-09-28 10:51:11 +02:00
Ylva Selling
2cbc2d009a Merge branch 'master' into issue/2093 
# Conflicts:
#	modules/skybrowser/src/targetbrowserpair.cpp
 2022-09-26 08:14:26 -04:00
Ylva Selling
0fd20db5e8 Add property for synchronizing aim so synchronization can be turned off for performance reasons 2022-09-23 12:53:41 -04:00
Ylva Selling
7ed3c78578 Set initialize to false when reloading so the browser can redo the initialization process 2022-09-23 12:53:16 -04:00
Malin E
71a2cf685a Remove not needed initialization 2022-09-23 15:35:29 +02:00
Gene Payne
eded668b95 Merge pull request #2226 from OpenSpace/issue/2209 
Issue/2209 Fixes for Session Recording Conversion
 2022-09-22 10:10:11 -06:00
Malin E
ac79e4dc07 Start addressing PR comments 2022-09-22 12:01:01 +02:00
Ylva Selling
f6c3ab2ee8 Set the size of the target on the master node only to ensure that the target plane is the same size on all nodes in a cluster 2022-09-22 05:10:33 -04:00
Ylva Selling
a49e37fedc Turn vertical fov into properties to ensure that the fov is synchronized on all nodes 2022-09-22 05:10:05 -04:00
Ylva Selling
a88ea892db Fix typo 2022-09-22 04:25:57 -04:00
Ylva Selling
2c31e485d8 Add potential fix for flickering of target 2022-09-22 04:23:16 -04:00
Ylva Selling
4214811c6a Add lua function to reload a display copy on a specific node 2022-09-22 03:07:04 -04:00
Alexander Bock
8f98320bf6 Add new functions into the window delegate to query node id 2022-09-21 14:34:36 +02:00
Alexander Bock
f502922338 CMake cleanup (#2246) 
* Simplification of the DLL copying mechanism on Windows
* Only deploy Qt on Windows
* Use set_target_properties function
 2022-09-21 10:52:05 +02:00
Gene Payne
ae84f1b120 Renderable prop change updates buffers without reinitializing GL (#2241) 2022-09-20 15:40:12 -06:00
Malin E
34aa515f16 Fix issue with grid for different x and y values 
* Also adjust grid example asset to showcase the highlight feature
 2022-09-19 14:37:42 +02:00
Malin E
e215e9f2a7 Add labels to the other grid classes too 2022-09-19 12:07:59 +02:00
Malin E
69790882b9 Merge branch 'master' into feature/grid-labels 2022-09-19 09:38:40 +02:00
Emma Broman
57dc7dd6b8 Add some missing includes 2022-09-16 08:18:54 +02:00
Malin E
dcdfbf028f Add font size and face camera property 2022-09-14 13:25:45 +02:00
Malin E
533b1965c7 Enable depth test for the grids 2022-09-14 11:18:39 +02:00
Malin E
1c3dd8080c Merge branch 'master' into feature/grid-labels 2022-09-14 10:42:56 +02:00
Gene Payne
7946a93ee5 Fix for linux crashing when reading OMM files 
Linux doesn't use the '\r' line ending, so it doesn't recognize a line with only '\r' as being empty.
 2022-09-13 16:10:03 -06:00
Emma Broman
dbb973b0ec Update GUI hash 
* Geo Location panel
* Dependency updates
* Getting started tour
+ some other changes/improvements
 2022-09-13 10:53:30 +02:00
GPayne
0ba064e141 Fix to account for possible empty string in session recording script 2022-09-11 21:42:46 -06:00
Gene Payne
31f859b589 Fixed string_view conversion bug in TaskRunner 2022-09-11 21:33:15 -06:00
GPayne
acf45e858b Fixed file path bug with converting session recording version 2022-09-11 19:42:56 -06:00
Emma Broman
ff89d7860c Use Sun position instead of SSB in Sun light source (see #2223) 2022-09-09 11:34:56 +02:00
Emma Broman
877e0fb61f Replace tabs with spaces in Eiffeltower asset 2022-09-09 11:16:36 +02:00
Malin E
9667db22c9 Small fixes 2022-09-09 10:27:17 +02:00
Malin E
4415e840a8 Use new label class for the new grids 2022-09-08 14:54:15 +02:00