diff --git a/.gitignore b/.gitignore index 32e849e..f63a24e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -.idea/ -DJam\ 2.iml -out/ +.idea +*.iml +out diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e129676 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +Mit License + +Copyright (c) 2018 Gnarly Narwhal + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/DJam 2.jar b/Space Mash.jar similarity index 100% rename from DJam 2.jar rename to Space Mash.jar diff --git a/Space Mash.zip b/Space Mash.zip new file mode 100644 index 0000000..6dd9419 Binary files /dev/null and b/Space Mash.zip differ diff --git a/cover.png b/cover.png new file mode 100644 index 0000000..9e525eb Binary files /dev/null and b/cover.png differ diff --git a/screenshot.png b/screenshot.png new file mode 100644 index 0000000..730cf8e Binary files /dev/null and b/screenshot.png differ diff --git a/src/com/gnarly/game/Main.java b/src/com/gnarly/game/Main.java index eaa7cc5..bfce88d 100644 --- a/src/com/gnarly/game/Main.java +++ b/src/com/gnarly/game/Main.java @@ -70,8 +70,8 @@ public class Main { } al = new ALManagement(); - window = new Window("Gamer Time", true); - //window = new Window(768, 432, "Gamer Time", true, true, true); + window = new Window("Space Mash", true); + //window = new Window(768, 432, "Space Mash", true, true, true); camera = new Camera(768, 432); Shader.init();