From 7728945e12d769b7fec821974617b4d7a47aa72e Mon Sep 17 00:00:00 2001 From: John Murphy Date: Wed, 4 Oct 2017 18:04:36 -0700 Subject: [PATCH] Redo folder structure --- 1311069131-800px.png => art/1311069131-800px.png | Bin Earth-800px.png => art/Earth-800px.png | Bin rocket.png => art/rocket.png | Bin skull.png => art/skull.png | Bin starfield.jpg => art/starfield.jpg | Bin .../starfield_with_sun.jpg | Bin sun.jpg => art/sun.jpg | Bin engine.cfg | 6 +++--- .../Computer Speak v0.3.ttf | Bin .../computerspeakfont.fnt | Bin .../computerspeakfont.inc | 0 .../computerspeakfont.sv.png | Bin .../computerspeakfont.sv.png.flags | 0 Earth.tscn => game/earth/Earth.tscn | 2 +- EarthArea.tscn => game/earth/EarthArea.tscn | 0 earth.gd => game/earth/earth.gd | 0 eartharea.gd => game/earth/eartharea.gd | 0 timelabel.gd => game/gui/hud/timelabel.gd | 0 Level.gd => game/levels/1/Level1.gd | 0 Level.tscn => game/levels/1/Level1.tscn | 14 +++++++------- Moon.tscn => game/moon/Moon.tscn | 4 ++-- moon.gd => game/moon/moon.gd | 0 DebugDraw.tscn => game/rocket/DebugDraw.tscn | 2 +- Rocket.tscn => game/rocket/Rocket.tscn | 8 ++++---- camera.gd => game/rocket/camera.gd | 0 debug_draw.gd => game/rocket/debug_draw.gd | 0 rocket.gd => game/rocket/rocket.gd | 0 icon.png | Bin 2736 -> 0 bytes icon.png.flags | 1 - 29 files changed, 18 insertions(+), 19 deletions(-) rename 1311069131-800px.png => art/1311069131-800px.png (100%) rename Earth-800px.png => art/Earth-800px.png (100%) rename rocket.png => art/rocket.png (100%) rename skull.png => art/skull.png (100%) rename starfield.jpg => art/starfield.jpg (100%) rename starfield_with_sun.jpg => art/starfield_with_sun.jpg (100%) rename sun.jpg => art/sun.jpg (100%) rename Computer Speak v0.3.ttf => fonts/Computer Speak v0.3.ttf (100%) rename computerspeakfont.fnt => fonts/computerspeakfont.fnt (100%) rename computerspeakfont.inc => fonts/computerspeakfont.inc (100%) rename computerspeakfont.sv.png => fonts/computerspeakfont.sv.png (100%) rename computerspeakfont.sv.png.flags => fonts/computerspeakfont.sv.png.flags (100%) rename Earth.tscn => game/earth/Earth.tscn (94%) rename EarthArea.tscn => game/earth/EarthArea.tscn (100%) rename earth.gd => game/earth/earth.gd (100%) rename eartharea.gd => game/earth/eartharea.gd (100%) rename timelabel.gd => game/gui/hud/timelabel.gd (100%) rename Level.gd => game/levels/1/Level1.gd (100%) rename Level.tscn => game/levels/1/Level1.tscn (99%) rename Moon.tscn => game/moon/Moon.tscn (89%) rename moon.gd => game/moon/moon.gd (100%) rename DebugDraw.tscn => game/rocket/DebugDraw.tscn (60%) rename Rocket.tscn => game/rocket/Rocket.tscn (94%) rename camera.gd => game/rocket/camera.gd (100%) rename debug_draw.gd => game/rocket/debug_draw.gd (100%) rename rocket.gd => game/rocket/rocket.gd (100%) delete mode 100644 icon.png delete mode 100644 icon.png.flags diff --git a/1311069131-800px.png b/art/1311069131-800px.png similarity index 100% rename from 1311069131-800px.png rename to art/1311069131-800px.png diff --git a/Earth-800px.png b/art/Earth-800px.png similarity index 100% rename from Earth-800px.png rename to art/Earth-800px.png diff --git a/rocket.png b/art/rocket.png similarity index 100% rename from rocket.png rename to art/rocket.png diff --git a/skull.png b/art/skull.png similarity index 100% rename from skull.png rename to art/skull.png diff --git a/starfield.jpg b/art/starfield.jpg similarity index 100% rename from starfield.jpg rename to art/starfield.jpg diff --git a/starfield_with_sun.jpg b/art/starfield_with_sun.jpg similarity index 100% rename from starfield_with_sun.jpg rename to art/starfield_with_sun.jpg diff --git a/sun.jpg b/art/sun.jpg similarity index 100% rename from sun.jpg rename to art/sun.jpg diff --git a/engine.cfg b/engine.cfg index bb4a988..804785b 100644 --- a/engine.cfg +++ b/engine.cfg @@ -1,9 +1,9 @@ [application] name="MoonLaunch" -main_scene="res://Level.tscn" -boot_splash="res://rocket.png" -icon="res://rocket.png" +main_scene="res://game/levels/1/Level1.tscn" +boot_splash="res://art/rocket.png" +icon="res://art/rocket.png" [display] diff --git a/Computer Speak v0.3.ttf b/fonts/Computer Speak v0.3.ttf similarity index 100% rename from Computer Speak v0.3.ttf rename to fonts/Computer Speak v0.3.ttf diff --git a/computerspeakfont.fnt b/fonts/computerspeakfont.fnt similarity index 100% rename from computerspeakfont.fnt rename to fonts/computerspeakfont.fnt diff --git a/computerspeakfont.inc b/fonts/computerspeakfont.inc similarity index 100% rename from computerspeakfont.inc rename to fonts/computerspeakfont.inc diff --git a/computerspeakfont.sv.png b/fonts/computerspeakfont.sv.png similarity index 100% rename from computerspeakfont.sv.png rename to fonts/computerspeakfont.sv.png diff --git a/computerspeakfont.sv.png.flags b/fonts/computerspeakfont.sv.png.flags similarity index 100% rename from computerspeakfont.sv.png.flags rename to fonts/computerspeakfont.sv.png.flags diff --git a/Earth.tscn b/game/earth/Earth.tscn similarity index 94% rename from Earth.tscn rename to game/earth/Earth.tscn index 3c89124..34ac78d 100644 --- a/Earth.tscn +++ b/game/earth/Earth.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=4 format=1] -[ext_resource path="res://Earth-800px.png" type="Texture" id=1] +[ext_resource path="res://art/Earth-800px.png" type="Texture" id=1] [sub_resource type="CircleShape2D" id=1] diff --git a/EarthArea.tscn b/game/earth/EarthArea.tscn similarity index 100% rename from EarthArea.tscn rename to game/earth/EarthArea.tscn diff --git a/earth.gd b/game/earth/earth.gd similarity index 100% rename from earth.gd rename to game/earth/earth.gd diff --git a/eartharea.gd b/game/earth/eartharea.gd similarity index 100% rename from eartharea.gd rename to game/earth/eartharea.gd diff --git a/timelabel.gd b/game/gui/hud/timelabel.gd similarity index 100% rename from timelabel.gd rename to game/gui/hud/timelabel.gd diff --git a/Level.gd b/game/levels/1/Level1.gd similarity index 100% rename from Level.gd rename to game/levels/1/Level1.gd diff --git a/Level.tscn b/game/levels/1/Level1.tscn similarity index 99% rename from Level.tscn rename to game/levels/1/Level1.tscn index 3d2e01f..eeeaefb 100644 --- a/Level.tscn +++ b/game/levels/1/Level1.tscn @@ -1,12 +1,12 @@ [gd_scene load_steps=9 format=1] -[ext_resource path="res://Level.gd" type="Script" id=1] -[ext_resource path="res://computerspeakfont.fnt" type="BitmapFont" id=2] -[ext_resource path="res://timelabel.gd" type="Script" id=3] -[ext_resource path="res://sun.jpg" type="Texture" id=4] -[ext_resource path="res://Earth.tscn" type="PackedScene" id=5] -[ext_resource path="res://Rocket.tscn" type="PackedScene" id=6] -[ext_resource path="res://Moon.tscn" type="PackedScene" id=7] +[ext_resource path="res://game/levels/1/Level1.gd" type="Script" id=1] +[ext_resource path="res://fonts/computerspeakfont.fnt" type="BitmapFont" id=2] +[ext_resource path="res://game/gui/hud/timelabel.gd" type="Script" id=3] +[ext_resource path="res://art/sun.jpg" type="Texture" id=4] +[ext_resource path="res://game/earth/Earth.tscn" type="PackedScene" id=5] +[ext_resource path="res://game/rocket/Rocket.tscn" type="PackedScene" id=6] +[ext_resource path="res://game/moon/Moon.tscn" type="PackedScene" id=7] [sub_resource type="ImageTexture" id=1] diff --git a/Moon.tscn b/game/moon/Moon.tscn similarity index 89% rename from Moon.tscn rename to game/moon/Moon.tscn index 873072f..0ac7936 100644 --- a/Moon.tscn +++ b/game/moon/Moon.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=1] -[ext_resource path="res://moon.gd" type="Script" id=1] -[ext_resource path="res://1311069131-800px.png" type="Texture" id=2] +[ext_resource path="res://game/moon/moon.gd" type="Script" id=1] +[ext_resource path="res://art/1311069131-800px.png" type="Texture" id=2] [sub_resource type="CircleShape2D" id=1] diff --git a/moon.gd b/game/moon/moon.gd similarity index 100% rename from moon.gd rename to game/moon/moon.gd diff --git a/DebugDraw.tscn b/game/rocket/DebugDraw.tscn similarity index 60% rename from DebugDraw.tscn rename to game/rocket/DebugDraw.tscn index ce1b02b..952fd99 100644 --- a/DebugDraw.tscn +++ b/game/rocket/DebugDraw.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=2 format=1] -[ext_resource path="res://debug_draw.gd" type="Script" id=1] +[ext_resource path="res://game/rocket/debug_draw.gd" type="Script" id=1] [node name="debug_draw" type="Node2D"] diff --git a/Rocket.tscn b/game/rocket/Rocket.tscn similarity index 94% rename from Rocket.tscn rename to game/rocket/Rocket.tscn index f93a954..186db48 100644 --- a/Rocket.tscn +++ b/game/rocket/Rocket.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=9 format=1] -[ext_resource path="res://rocket.gd" type="Script" id=1] -[ext_resource path="res://rocket.png" type="Texture" id=2] -[ext_resource path="res://DebugDraw.tscn" type="PackedScene" id=3] -[ext_resource path="res://skull.png" type="Texture" id=4] +[ext_resource path="res://game/rocket/rocket.gd" type="Script" id=1] +[ext_resource path="res://art/rocket.png" type="Texture" id=2] +[ext_resource path="res://game/rocket/DebugDraw.tscn" type="PackedScene" id=3] +[ext_resource path="res://art/skull.png" type="Texture" id=4] [sub_resource type="ConvexPolygonShape2D" id=1] diff --git a/camera.gd b/game/rocket/camera.gd similarity index 100% rename from camera.gd rename to game/rocket/camera.gd diff --git a/debug_draw.gd b/game/rocket/debug_draw.gd similarity index 100% rename from debug_draw.gd rename to game/rocket/debug_draw.gd diff --git a/rocket.gd b/game/rocket/rocket.gd similarity index 100% rename from rocket.gd rename to game/rocket/rocket.gd diff --git a/icon.png b/icon.png deleted file mode 100644 index c019ef64a1516db91617204000feb3987f764c9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2736 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