Patrick 'Quezler' Mounier 39266d23c8 Merge branch 'master' into crater ... # Conflicts: # core/assets/sprites/sprites.atlas # core/assets/sprites/sprites.png # core/assets/sprites/sprites2.png # core/assets/sprites/sprites3.png		2020-04-23 21:10:48 +02:00
..
bloomshaders
bundles	Merge branch 'master' into crater	2020-04-23 21:10:48 +02:00
cubemaps/stars
cursors
fonts
icons	Merge branch '6.0' into crater	2020-04-16 22:38:51 +02:00
maps
music	Added landing sound	2020-04-08 22:06:43 -04:00
planets
scripts
shaders	Simpler sun shader	2020-04-09 21:15:42 -04:00
sounds
sprites	Merge branch 'master' into crater	2020-04-23 21:10:48 +02:00
contributors