Commit Graph

33 Commits

Author SHA1 Message Date
Jonathan Fransson
ba2422b0fa merge 2019-05-30 10:37:54 -06:00
Elon
b96bea4327 some code to test 1 sgn, more renderables 2019-05-30 10:37:54 -06:00
Elon
44e5870460 correcting errors 2019-05-30 10:37:53 -06:00
Jonathan Fransson
0c9f5f8ecc working on renderableSatellites 2019-05-30 10:37:52 -06:00
Elon
662da5bdb8 appearance 2019-05-30 10:37:52 -06:00
Jonathan Fransson
8f35261b52 merge 2019-05-30 10:37:12 -06:00
Elon
dfef5ecb35 some code to test 1 sgn, more renderables 2019-05-30 10:36:51 -06:00
Elon
e829c66de9 pre rebase 2019-05-30 10:33:58 -06:00
Elon
9efb32e5cc mergeing elonsTest with renderableSatellites 2019-05-30 10:33:58 -06:00
Jonathan Fransson
6d1455e8c6 General code cleanup 2019-05-30 10:33:16 -06:00
Jonathan Fransson
fc4f3fc6e9 Fixed readTLE 2019-05-30 10:32:13 -06:00
Jonathan Fransson
0d838c2160 merge 2019-05-30 10:32:13 -06:00
Elon
9eb5dca42d TLETranslation errer, File and Type missing key 2019-05-30 10:31:52 -06:00
Jonathan Fransson
85a6b25dce updateBuffer changes 2019-05-30 10:31:29 -06:00
Elon
d32f79106b satellites_shared.asset added for debris 2019-05-30 10:30:54 -06:00
Jonathan Fransson
23fb3b1f4c change in RenderableSatellites 2019-05-30 10:23:28 -06:00
Elon
c5d4204b72 runtime error, lua, satellites_shared 2019-05-30 10:20:52 -06:00
Jonathan Fransson
89530d6428 merge 2019-05-30 10:19:49 -06:00
Elon
79cd779057 Fail to initialize asset, debris, satellites_shared:184 2019-05-30 10:18:50 -06:00
Elon
47f8e3e82a loop debris elements 2019-05-30 10:18:08 -06:00
Jonathan Fransson
cdab5707d4 push latest 2019-05-30 10:17:33 -06:00
Elon
2d6ca18ec3 started building on a new renderable from scratch 2019-05-30 10:16:31 -06:00
Jonathan Fransson
1aeee50c2a initializeGL stuff 2019-05-30 10:14:30 -06:00
Jonathan Fransson
01fefeca23 work on renderablesatellites 2019-05-30 10:14:30 -06:00
Elon
371eb4eec5 correcting errors 2019-05-30 10:13:25 -06:00
Jonathan Fransson
842dda11d7 working on renderableSatellites 2019-05-30 10:12:58 -06:00
Jonathan Fransson
b27b035cf8 merge 2019-05-30 10:09:49 -06:00
Elon
1a2867772a some code to test 1 sgn, more renderables 2019-05-30 10:08:24 -06:00
Jonathan Fransson
b497797cf1 working on renderableSatellites 2019-05-30 10:02:14 -06:00
Elon
7586d15027 correcting errors 2019-05-30 10:01:28 -06:00
Jonathan Fransson
02cf344a22 merge 2019-05-30 10:01:28 -06:00
Elon
a38635b2f0 appearance 2019-05-30 10:00:16 -06:00
Elon
5abb86c392 some code to test 1 sgn, more renderables 2019-05-30 09:57:34 -06:00