mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-09 04:59:56 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,995 Commits 85 Branches 46 Tags
673fdd857dc19069b1261390cc045fe3e959b34a
Commit Graph

2853 Commits

Author SHA1 Message Date
Jonathan Fransson
673fdd857d Merge branch 'thesis/2019/spaceDebris' of https://github.com/OpenSpace/OpenSpace into thesis/2019/spaceDebris 2019-04-09 15:46:06 -06:00
Jonathan Fransson
4fc0a7e8c2 General code cleanup 2019-04-09 15:45:34 -06:00
Elon
b89e834101 merge 2019-04-09 15:34:31 -06:00
Elon
083ddc1c24 use an alternative position function from keplerTranslation 2019-04-09 15:32:45 -06:00
Jonathan Fransson
be2c98de09 Fixed readTLE 2019-04-09 15:27:52 -06:00
Jonathan Fransson
b8d9bf5426 merge 2019-04-08 09:25:30 -06:00
Jonathan Fransson
6c1ce53613 merge 2019-04-08 09:21:59 -06:00
Elon
6dc2a3c7a3 started adding on calculatePosition. Does not complie yet 2019-04-05 18:53:04 -06:00
Elon
da4843cc8d TLETranslation errer, File and Type missing key 2019-04-04 15:37:35 -06:00
ElonOlsson
d7452b15ff Merge branch 'thesis/2019/spaceDebris' into thesis/2019/spaceDebris 2019-04-04 13:22:17 -06:00
Jonathan Fransson
5103677be7 Merge branch 'thesis/2019/spaceDebris' into thesis/2019/spaceDebris 2019-04-04 13:16:39 -06:00
Elon
772bd00081 todo: add render and updateBuffer functions 2019-04-03 17:18:03 -06:00
Jonathan Fransson
292d4a891d updateBuffer changes 2019-04-03 17:08:37 -06:00
Elon
088d2268f4 satellites_shared.asset added for debris 2019-04-03 15:42:25 -06:00
Jonathan Fransson
44e9628f37 change in RenderableSatellites 2019-04-02 17:07:20 -06:00
Elon
b1ecde2645 runtime error, lua, satellites_shared 2019-04-02 14:25:30 -06:00
Elon
a99abb2c51 Merge branch 'thesis/2019/spaceDebris' of https://github.com/OpenSpace/OpenSpace into thesis/2019/spaceDebris 2019-04-02 10:48:29 -06:00
Elon
ef6ac25b3e - 2019-04-02 10:48:21 -06:00
Jonathan Fransson
c5b52fd354 merge, renderableSatellites kind of broken atm 2019-04-01 16:14:52 -06:00
Jonathan Fransson
2e499bd8eb merge 2019-04-01 16:06:18 -06:00
Elon
22260a2086 Fail to initialize asset, debris, satellites_shared:184 2019-04-01 16:03:44 -06:00
Elon
06a853870a merge 2019-03-29 17:18:37 -06:00
Elon
569de86a3c loop debris elements 2019-03-29 17:17:41 -06:00
Jonathan Fransson
e9a078c787 merge 2019-03-29 10:02:05 -06:00
Jonathan Fransson
2d918315da push latest 2019-03-29 09:39:46 -06:00
Elon
c032310208 merge 2019-03-29 09:37:26 -06:00
Elon
968f8d2683 started building on a new renderable from scratch 2019-03-28 17:24:07 -06:00
Jonathan Fransson
565612e973 initializeGL stuff 2019-03-27 16:30:59 -06:00
Jonathan Fransson
7ee9982973 work on renderablesatellites 2019-03-27 11:55:00 -06:00
Jonathan Fransson
be713c8cc4 Merge branch 'thesis/2019/spaceDebris' of https://github.com/OpenSpace/OpenSpace into thesis/2019/spaceDebris 2019-03-27 11:49:15 -06:00
Jonathan Fransson
2c65b8388e work on renderablesatellites 2019-03-27 11:48:54 -06:00
Elon
1698b064c0 merge 2019-03-27 10:39:34 -06:00
Elon
4fdd54aa56 correcting errors 2019-03-27 10:34:37 -06:00
Jonathan Fransson
2c24dcaa32 working on renderableSatellites 2019-03-27 10:33:55 -06:00
Elon
5979a59d6a appearance 2019-03-27 10:33:52 -06:00
Jonathan Fransson
b4dd5e9b4b merge 2019-03-27 10:31:09 -06:00
Elon
8048aed37a some code to test 1 sgn, more renderables 2019-03-27 10:28:09 -06:00
Jonathan Fransson
f7651c5d10 Merge 2019-03-26 14:13:40 -06:00
Jonathan Fransson
ba5afe3b65 working on renderableSatellites 2019-03-26 14:11:35 -06:00
Elon
219b69c4ea correcting errors 2019-03-26 11:31:57 -06:00
Jonathan Fransson
a3ff4e7ab1 merge 2019-03-25 14:40:28 -06:00
Jonathan Fransson
7b33d9e9a6 merge 2019-03-25 14:37:10 -06:00
Elon
31b1f7ea9a appearance 2019-03-25 14:34:56 -06:00
Jonathas Costa
9325e7fac3 Fixed unforms problems when eclipses are activated. (#797) 
* Fixed unforms problems when eclipses are activated.
 2019-03-24 13:21:07 +01:00
Emil Axelsson
55979fa2c8 Feature/statistics (#810) 
* Add statistics options for dashboarditemframerate
 2019-03-24 13:09:31 +01:00
Alexander Bock
bb3db7ada7 Feature/jenkins fix (#816) 
* Cleanup
* CMake cleanups
* Update current year
* Update copyright header
* Use script to return list of all modules
* Update credits, license and ghoul
 2019-03-24 11:19:39 +01:00
Elon
95f1c5d2e7 some code to test 1 sgn, more renderables 2019-03-22 10:54:14 -06:00
Gene Payne
63c1ac89fb Changes to touch module to allow it to build with or without webbrowser module enabled (#808) 2019-03-07 11:15:45 +01:00
Emil Axelsson
b5eb41e27f Guard against potential nullpointer dereferencing 2019-02-22 17:58:08 +01:00
Gene Payne
c44290fe1f Feature/touch web gui support (#798) 
* Added touch support for web GUI

* Code cleanup after master merge, no functionality changes

* Fixed alignment of function arguments
 2019-02-21 07:35:47 -07:00