Commit Graph

6910 Commits

Author SHA1 Message Date
Alexander Bock
3b427bfd15 Cleaning up window delegate 2020-05-10 15:17:51 +02:00
GPayne
1b60ab1038 Fix for issue #1144 requires satellites vs request 2020-05-04 15:02:08 -06:00
Alexander Bock
498d125547 Merge pull request #1146 from OpenSpace/feature/sgct
Merging the changes to make the new SGCT version the default one
2020-05-04 10:48:48 +02:00
Gene Payne
3294c53013 Increased starting distance from earth for better content view 2020-04-28 08:11:27 -06:00
Alexander Bock
0fcd71be71 Add the ability to invert mouse buttons for OrbitalNavigator (closes #697) 2020-04-27 15:08:01 +02:00
Alexander Bock
822de97f02 Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2020-04-24 11:16:42 +02:00
Alexander Bock
d50dd47c72 Add per-scene cache directories to the gitignore (closes # 1140) 2020-04-24 11:16:20 +02:00
Alexander Bock
d305265c1f Merge pull request #1139 from OpenSpace/issue/1122
Leap year fix for epoch used in both satellites and small solar system bodies. Closes #1122.
2020-04-24 11:09:36 +02:00
Alexander Bock
9ea5c0d66f Update SGCT repository 2020-04-24 11:07:18 +02:00
GPayne
fe0cce1e24 Fix for leap year that can affect asteroids only 2020-04-20 11:23:50 -06:00
GPayne
fbd5d3490a Leap year time fix for satellite tracking 2020-04-19 23:47:30 -06:00
Alexander Bock
0125fb7a3b Add some of the additional GitHub files 2020-04-17 14:01:00 +02:00
Alexander Bock
5a94c486f0 Removing warnings 2020-04-14 22:32:26 +02:00
Alexander Bock
f1fe2f197b General code cleanup 2020-04-14 15:48:58 +02:00
Alexander Bock
660533e840 Merge pull request #1123 from OpenSpace/feature/asteroids
Feature/asteroids
2020-04-14 15:01:35 +02:00
Alexander Bock
4f14e8476b Some code cleanup 2020-04-14 15:00:37 +02:00
Alexander Bock
84d3878be3 Ignore uniform warnings for cases when disabling the night layers on Earth (closes #1136) 2020-04-14 13:19:19 +02:00
Alexander Bock
d4218ad2fd Provide a default value of 60 for the export of the screenshot playback (closes #1134) 2020-04-14 11:20:02 +02:00
Alexander Bock
606fa74817 Adapt configuration files and fix old SGCT style in them 2020-04-14 10:47:59 +02:00
GPayne
29d68897d6 Added to satellites: group selection feature, segments fix 2020-04-13 16:43:27 -06:00
Alexander Bock
eedd0f75e0 Compile fix 2020-04-13 10:40:31 +02:00
GPayne
b5114bd4fd Finalized segments algorithm and added object selection 2020-04-13 00:56:12 -06:00
GPayne
ed9a397549 Improved segments algorithm and fix for rendering errors 2020-04-12 22:43:54 -06:00
Alexander Bock
ba9012f5a9 Some cleanup of the code 2020-04-10 18:18:54 +02:00
Alexander Bock
3db00ff7e5 Merge branch 'master' into feature/sgct 2020-04-10 17:47:12 +02:00
Alexander Bock
1df557d2eb Small code cleanup 2020-04-10 17:46:59 +02:00
Alexander Bock
0dc2fc9430 Make OpenSpace work with the new SGCT version 2020-04-10 17:38:18 +02:00
GPayne
a95d01d781 Implemented num orbital trail segments proportional to eccentricity 2020-04-09 13:33:30 -06:00
Alexander Bock
5646786331 Add the C 2019 Y4 asset from Dan Tell 2020-04-06 20:11:19 +02:00
Gene Payne
9884d7e25d Fix tabs vs spaces 2020-03-29 17:25:54 -06:00
GPayne
545a1314a5 Fix for issue #1122 forcing satellite files to download at each startup 2020-03-29 17:23:25 -06:00
Alexander Bock
a598d280c7 Merge pull request #1119 from OpenSpace/feature/imgui-touchhandling
Made imgui handle touch input as the webgui does
2020-03-28 20:45:25 +01:00
Alexander Bock
5e37cb5ac3 Some coding style cleanup 2020-03-28 20:45:14 +01:00
Alexander Bock
b2c7529ddf Amend previous commit 2020-03-28 20:42:19 +01:00
Alexander Bock
66716a36a7 Merge branch 'master' into feature/imgui-touchhandling
# Conflicts:
#	modules/touch/src/touchinteraction.cpp
2020-03-28 20:41:47 +01:00
Alexander Bock
c6d3a181b7 Merge pull request #1115 from OpenSpace/feature/continuous-pinch
Feature/continuous pinch
2020-03-28 20:34:33 +01:00
Alexander Bock
5209de5484 Some coding style fixes 2020-03-28 20:32:53 +01:00
Mikael
1c57f8ad21 Added more explanatory comments of the Touch-implementation 2020-03-25 10:01:56 +01:00
Mikael Pettersson
fa5bbc5a44 Added keymodifiers to touch event handling 2020-03-25 09:52:16 +01:00
Mikael Pettersson
3210dfd315 Made these changes only apply on Win32 builds 2020-03-25 09:52:16 +01:00
Mikael Pettersson
c9b5ffd021 Changed webbrowser to use cef touch events
rather than injected mouse events.
2020-03-25 09:52:16 +01:00
GPayne
cf7fcd9f03 Deleted UpperLimitInfo from satellites because only smallbody uses it 2020-03-24 17:20:49 -06:00
GPayne
050029f16b Switched back to default scene in preparation for merge with master 2020-03-24 14:21:15 -06:00
GPayne
4f6d9836d8 Corrected plurality of GUI names 2020-03-24 14:17:23 -06:00
Gene Payne
0a2263cbb4 Update data/assets/scene/solarsystem/sssb/sssb_shared.asset
Improved GUI name

Co-Authored-By: Micah Acinapura <micahnyc@gmail.com>
2020-03-24 14:01:15 -06:00
Gene Payne
07c8efc8f6 Update data/assets/scene/solarsystem/sssb/sssb_shared.asset
Eliminated tab

Co-Authored-By: Micah Acinapura <micahnyc@gmail.com>
2020-03-24 14:00:47 -06:00
GPayne
4cfd51a268 Merged with master to prepare for pull request 2020-03-20 17:56:10 -06:00
GPayne
b08759ff9d Merge branch 'master' of https://github.com/OpenSpace/OpenSpace 2020-03-20 17:45:22 -06:00
GPayne
bdf859cd3c Modified sbdb file read to handle line errors while keeping other data lines 2020-03-20 17:27:39 -06:00
GPayne
f2aea512c1 Updated assets with renderable trail params specific to content of each 2020-03-20 13:59:35 -06:00