Commit Graph

126 Commits

Author SHA1 Message Date
Jonathan Fransson 6c1ce53613 merge 2019-04-08 09:21:59 -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
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
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
Jonathan Fransson 2d918315da push latest 2019-03-29 09:39:46 -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
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
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
Elon 95f1c5d2e7 some code to test 1 sgn, more renderables 2019-03-22 10:54:14 -06:00