diff --git a/.DS_Store b/.DS_Store index 66f9323ed24b4e6bad5b7fb76a50351a33cf92ba..74fe1b8e85eb33d57af98a3f6a73f8490efde7b6 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/LICENSE b/LICENSE deleted file mode 100644 index c7d7c72f3e82afab45ac9cc8e8fc7ae84f9b4d70..0000000000000000000000000000000000000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2021 zlatax - -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. diff --git a/project-1/README.md b/README.md similarity index 100% rename from project-1/README.md rename to README.md diff --git a/project-1/bagel.iml b/bagel.iml similarity index 100% rename from project-1/bagel.iml rename to bagel.iml diff --git a/git-history.txt b/git-history.txt new file mode 100644 index 0000000000000000000000000000000000000000..e7f0f40fd9b227eb867b4a8b48e8e8b27f49a149 --- /dev/null +++ b/git-history.txt @@ -0,0 +1,12 @@ +* fbc8e2e final check through code copmpleted +* 5bb49a0 final check through code copmpleted +* 2dd7551 everything runs without error +* 1b55c47 everything runs without error +* ee4da0a loadEnvironment fixed, update conditions working perfectly +* de2a555 working on loadEnvironment, switch case "player" has a problem +* c66715c added algorithm 1 mechanic of game +* 2307277 instantiated objects for game +* c6588c4 unzipped and added to readme +* 6919d2a add project files and specs +* 77da932 Add bagel files +* 57b0743 Initial commit diff --git a/project-1/pom.xml b/pom.xml similarity index 100% rename from project-1/pom.xml rename to pom.xml diff --git a/project-1/.DS_Store b/project-1/.DS_Store deleted file mode 100644 index 38d628d67dc3fc9462ede5c54ec619774dff7a66..0000000000000000000000000000000000000000 Binary files a/project-1/.DS_Store and /dev/null differ diff --git a/project-1/.idea/.gitignore b/project-1/.idea/.gitignore deleted file mode 100644 index 26d33521af10bcc7fd8cea344038eaaeb78d0ef5..0000000000000000000000000000000000000000 --- a/project-1/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/project-1/.idea/.name b/project-1/.idea/.name deleted file mode 100644 index e5199ee79ccef033b3d3412968c960ebf7ffe811..0000000000000000000000000000000000000000 --- a/project-1/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -bagel \ No newline at end of file diff --git a/project-1/.idea/compiler.xml b/project-1/.idea/compiler.xml deleted file mode 100644 index 5ed7d1ee1d47a9d2bb314a87f99538d402e982e0..0000000000000000000000000000000000000000 --- a/project-1/.idea/compiler.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="CompilerConfiguration"> - <annotationProcessing> - <profile name="Maven default annotation processors profile" enabled="true"> - <sourceOutputDir name="target/generated-sources/annotations" /> - <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> - <outputRelativeToContentRoot value="true" /> - <module name="bagel" /> - </profile> - </annotationProcessing> - <bytecodeTargetLevel> - <module name="bagel" target="14" /> - </bytecodeTargetLevel> - </component> -</project> \ No newline at end of file diff --git a/project-1/.idea/jarRepositories.xml b/project-1/.idea/jarRepositories.xml deleted file mode 100644 index 712ab9d985c20018a0c97b93d2148ac1ffe588a5..0000000000000000000000000000000000000000 --- a/project-1/.idea/jarRepositories.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="RemoteRepositoriesConfiguration"> - <remote-repository> - <option name="id" value="central" /> - <option name="name" value="Central Repository" /> - <option name="url" value="https://repo.maven.apache.org/maven2" /> - </remote-repository> - <remote-repository> - <option name="id" value="central" /> - <option name="name" value="Maven Central repository" /> - <option name="url" value="https://repo1.maven.org/maven2" /> - </remote-repository> - <remote-repository> - <option name="id" value="jboss.community" /> - <option name="name" value="JBoss Community repository" /> - <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" /> - </remote-repository> - </component> -</project> \ No newline at end of file diff --git a/project-1/.idea/libraries/Maven__io_github_eleanor_em_bagel_1_9_3.xml b/project-1/.idea/libraries/Maven__io_github_eleanor_em_bagel_1_9_3.xml deleted file mode 100644 index 8a3817e8e03ccad221cb388d67521c24d3f93203..0000000000000000000000000000000000000000 --- a/project-1/.idea/libraries/Maven__io_github_eleanor_em_bagel_1_9_3.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: io.github.eleanor-em:bagel:1.9.3"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/io/github/eleanor-em/bagel/1.9.3/bagel-1.9.3.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/io/github/eleanor-em/bagel/1.9.3/bagel-1.9.3-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/io/github/eleanor-em/bagel/1.9.3/bagel-1.9.3-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_3_2_2.xml b/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_3_2_2.xml deleted file mode 100644 index b41e0a0e6d45226876b26c951f89f0a888668616..0000000000000000000000000000000000000000 --- a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_3_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.lwjgl:lwjgl:3.2.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl/3.2.2/lwjgl-3.2.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl/3.2.2/lwjgl-3.2.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl/3.2.2/lwjgl-3.2.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_assimp_3_2_2.xml b/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_assimp_3_2_2.xml deleted file mode 100644 index 04a33d893ffa7c2f813e11d6127a98947eb61143..0000000000000000000000000000000000000000 --- a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_assimp_3_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.lwjgl:lwjgl-assimp:3.2.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-assimp/3.2.2/lwjgl-assimp-3.2.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-assimp/3.2.2/lwjgl-assimp-3.2.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-assimp/3.2.2/lwjgl-assimp-3.2.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_assimp_natives_macos_3_2_2.xml b/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_assimp_natives_macos_3_2_2.xml deleted file mode 100644 index ca1d198cac83d9120515f48d57197c2a5c16a968..0000000000000000000000000000000000000000 --- a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_assimp_natives_macos_3_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.lwjgl:lwjgl-assimp:natives-macos:3.2.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-assimp/3.2.2/lwjgl-assimp-3.2.2-natives-macos.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-assimp/3.2.2/lwjgl-assimp-3.2.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-assimp/3.2.2/lwjgl-assimp-3.2.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_glfw_3_2_2.xml b/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_glfw_3_2_2.xml deleted file mode 100644 index 48aa8aa34959abd0874a96c96d6e6f9d65c33c91..0000000000000000000000000000000000000000 --- a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_glfw_3_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.lwjgl:lwjgl-glfw:3.2.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-glfw/3.2.2/lwjgl-glfw-3.2.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-glfw/3.2.2/lwjgl-glfw-3.2.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-glfw/3.2.2/lwjgl-glfw-3.2.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_glfw_natives_macos_3_2_2.xml b/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_glfw_natives_macos_3_2_2.xml deleted file mode 100644 index f42095931774828fb8049a7c17d995404c248945..0000000000000000000000000000000000000000 --- a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_glfw_natives_macos_3_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.lwjgl:lwjgl-glfw:natives-macos:3.2.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-glfw/3.2.2/lwjgl-glfw-3.2.2-natives-macos.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-glfw/3.2.2/lwjgl-glfw-3.2.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-glfw/3.2.2/lwjgl-glfw-3.2.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_natives_macos_3_2_2.xml b/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_natives_macos_3_2_2.xml deleted file mode 100644 index d806e09f7a1984918343ca6934604b8cd39b641e..0000000000000000000000000000000000000000 --- a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_natives_macos_3_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.lwjgl:lwjgl:natives-macos:3.2.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl/3.2.2/lwjgl-3.2.2-natives-macos.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl/3.2.2/lwjgl-3.2.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl/3.2.2/lwjgl-3.2.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_openal_3_2_2.xml b/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_openal_3_2_2.xml deleted file mode 100644 index 094321fdec8e071749a25633e9045b2367b2860f..0000000000000000000000000000000000000000 --- a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_openal_3_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.lwjgl:lwjgl-openal:3.2.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-openal/3.2.2/lwjgl-openal-3.2.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-openal/3.2.2/lwjgl-openal-3.2.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-openal/3.2.2/lwjgl-openal-3.2.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_openal_natives_macos_3_2_2.xml b/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_openal_natives_macos_3_2_2.xml deleted file mode 100644 index c5f06cb55090320ab58648ec87fc4fb6487cf5bc..0000000000000000000000000000000000000000 --- a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_openal_natives_macos_3_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.lwjgl:lwjgl-openal:natives-macos:3.2.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-openal/3.2.2/lwjgl-openal-3.2.2-natives-macos.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-openal/3.2.2/lwjgl-openal-3.2.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-openal/3.2.2/lwjgl-openal-3.2.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_opengl_3_2_2.xml b/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_opengl_3_2_2.xml deleted file mode 100644 index 24121c2ac5c3e85eac2364a7a2245a6fa9ca70cd..0000000000000000000000000000000000000000 --- a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_opengl_3_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.lwjgl:lwjgl-opengl:3.2.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-opengl/3.2.2/lwjgl-opengl-3.2.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-opengl/3.2.2/lwjgl-opengl-3.2.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-opengl/3.2.2/lwjgl-opengl-3.2.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_opengl_natives_macos_3_2_2.xml b/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_opengl_natives_macos_3_2_2.xml deleted file mode 100644 index cc8c1f3e1574c7c549451fd2dffedf0ac6a56d4b..0000000000000000000000000000000000000000 --- a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_opengl_natives_macos_3_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.lwjgl:lwjgl-opengl:natives-macos:3.2.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-opengl/3.2.2/lwjgl-opengl-3.2.2-natives-macos.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-opengl/3.2.2/lwjgl-opengl-3.2.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-opengl/3.2.2/lwjgl-opengl-3.2.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_stb_3_2_2.xml b/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_stb_3_2_2.xml deleted file mode 100644 index 8155b1d9f1cafbdb9f1f61bfe47964a335361c48..0000000000000000000000000000000000000000 --- a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_stb_3_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.lwjgl:lwjgl-stb:3.2.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-stb/3.2.2/lwjgl-stb-3.2.2.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-stb/3.2.2/lwjgl-stb-3.2.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-stb/3.2.2/lwjgl-stb-3.2.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_stb_natives_macos_3_2_2.xml b/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_stb_natives_macos_3_2_2.xml deleted file mode 100644 index af9fd1a4d2c75bf9807766eab03e4aaf90ceee78..0000000000000000000000000000000000000000 --- a/project-1/.idea/libraries/Maven__org_lwjgl_lwjgl_stb_natives_macos_3_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="Maven: org.lwjgl:lwjgl-stb:natives-macos:3.2.2"> - <CLASSES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-stb/3.2.2/lwjgl-stb-3.2.2-natives-macos.jar!/" /> - </CLASSES> - <JAVADOC> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-stb/3.2.2/lwjgl-stb-3.2.2-javadoc.jar!/" /> - </JAVADOC> - <SOURCES> - <root url="jar://$MAVEN_REPOSITORY$/org/lwjgl/lwjgl-stb/3.2.2/lwjgl-stb-3.2.2-sources.jar!/" /> - </SOURCES> - </library> -</component> \ No newline at end of file diff --git a/project-1/.idea/misc.xml b/project-1/.idea/misc.xml deleted file mode 100644 index c0572aa051d2673266994b9b207ed32cfbc44f9d..0000000000000000000000000000000000000000 --- a/project-1/.idea/misc.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="MavenProjectsManager"> - <option name="originalFiles"> - <list> - <option value="$PROJECT_DIR$/pom.xml" /> - </list> - </option> - </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_14" project-jdk-name="14" project-jdk-type="JavaSDK" /> -</project> \ No newline at end of file diff --git a/project-1/.idea/modules.xml b/project-1/.idea/modules.xml deleted file mode 100644 index d4754eaf30e6aef9fd18e15d5f94dcd7b30f5d25..0000000000000000000000000000000000000000 --- a/project-1/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="ProjectModuleManager"> - <modules> - <module fileurl="file://$PROJECT_DIR$/bagel.iml" filepath="$PROJECT_DIR$/bagel.iml" /> - </modules> - </component> -</project> \ No newline at end of file diff --git a/project-1/.idea/uiDesigner.xml b/project-1/.idea/uiDesigner.xml deleted file mode 100644 index b93ac08bcd0212375c3de0db5157d536abc599e9..0000000000000000000000000000000000000000 --- a/project-1/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="Palette2"> - <group name="Swing"> - <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" /> - </item> - <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" /> - </item> - <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" /> - </item> - <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true"> - <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" /> - </item> - <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" /> - <initial-values> - <property name="text" value="Button" /> - </initial-values> - </item> - <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> - <initial-values> - <property name="text" value="RadioButton" /> - </initial-values> - </item> - <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> - <initial-values> - <property name="text" value="CheckBox" /> - </initial-values> - </item> - <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" /> - <initial-values> - <property name="text" value="Label" /> - </initial-values> - </item> - <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> - <preferred-size width="150" height="-1" /> - </default-constraints> - </item> - <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> - <preferred-size width="150" height="-1" /> - </default-constraints> - </item> - <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> - <preferred-size width="150" height="-1" /> - </default-constraints> - </item> - <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" /> - </item> - <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> - <preferred-size width="150" height="50" /> - </default-constraints> - </item> - <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> - <preferred-size width="200" height="200" /> - </default-constraints> - </item> - <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> - <preferred-size width="200" height="200" /> - </default-constraints> - </item> - <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> - </item> - <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> - </item> - <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" /> - </item> - <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" /> - </item> - <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1"> - <preferred-size width="-1" height="20" /> - </default-constraints> - </item> - <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false"> - <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" /> - </item> - <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> - <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" /> - </item> - </group> - </component> -</project> \ No newline at end of file diff --git a/project-1/.idea/vcs.xml b/project-1/.idea/vcs.xml deleted file mode 100644 index dc3dbff3ed8fcbb58214153f6b1451e329debfb2..0000000000000000000000000000000000000000 --- a/project-1/.idea/vcs.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4"> - <component name="VcsDirectoryMappings"> - <mapping directory="$PROJECT_DIR$/../../../../.." vcs="Git" /> - <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" /> - <mapping directory="$PROJECT_DIR$/.." vcs="Git" /> - </component> -</project> \ No newline at end of file diff --git a/project1-4.pdf b/project1-4.pdf deleted file mode 100644 index a2ebdc543a1909b57b947d209a744a495464cef4..0000000000000000000000000000000000000000 Binary files a/project1-4.pdf and /dev/null differ diff --git a/project-1/res/.DS_Store b/res/.DS_Store similarity index 100% rename from project-1/res/.DS_Store rename to res/.DS_Store diff --git a/project-1/target/classes/IO/environment.csv b/res/IO/environment.csv similarity index 100% rename from project-1/target/classes/IO/environment.csv rename to res/IO/environment.csv diff --git a/project-1/res/font/DejaVuSans-Bold.ttf b/res/font/DejaVuSans-Bold.ttf similarity index 100% rename from project-1/res/font/DejaVuSans-Bold.ttf rename to res/font/DejaVuSans-Bold.ttf diff --git a/project-1/res/images/background.png b/res/images/background.png similarity index 100% rename from project-1/res/images/background.png rename to res/images/background.png diff --git a/project-1/res/images/player.png b/res/images/player.png similarity index 100% rename from project-1/res/images/player.png rename to res/images/player.png diff --git a/project-1/res/images/sandwich.png b/res/images/sandwich.png similarity index 100% rename from project-1/res/images/sandwich.png rename to res/images/sandwich.png diff --git a/project-1/res/images/zombie.png b/res/images/zombie.png similarity index 100% rename from project-1/res/images/zombie.png rename to res/images/zombie.png diff --git a/project-1/src/.DS_Store b/src/.DS_Store similarity index 100% rename from project-1/src/.DS_Store rename to src/.DS_Store diff --git a/project-1/src/APoint.java b/src/APoint.java similarity index 100% rename from project-1/src/APoint.java rename to src/APoint.java diff --git a/project-1/src/Entity.java b/src/Entity.java similarity index 100% rename from project-1/src/Entity.java rename to src/Entity.java diff --git a/project-1/src/Player.java b/src/Player.java similarity index 100% rename from project-1/src/Player.java rename to src/Player.java diff --git a/project-1/src/Sandwich.java b/src/Sandwich.java similarity index 100% rename from project-1/src/Sandwich.java rename to src/Sandwich.java diff --git a/project-1/src/ShadowTreasure.java b/src/ShadowTreasure.java similarity index 100% rename from project-1/src/ShadowTreasure.java rename to src/ShadowTreasure.java diff --git a/project-1/src/Zombie.java b/src/Zombie.java similarity index 100% rename from project-1/src/Zombie.java rename to src/Zombie.java diff --git a/project-1/src/test.java b/src/test.java similarity index 100% rename from project-1/src/test.java rename to src/test.java diff --git a/project-1/res/IO/environment.csv b/target/classes/IO/environment.csv similarity index 96% rename from project-1/res/IO/environment.csv rename to target/classes/IO/environment.csv index 34433464a67b782b64b56ef3d04904a00c63c7ab..79fea88a9ab126ee1e10f0828bcff2047ec182f7 100644 --- a/project-1/res/IO/environment.csv +++ b/target/classes/IO/environment.csv @@ -1,3 +1,3 @@ -Player,650,100,2 -Zombie,300,200 +Player,650,100,2 +Zombie,300,200 Sandwich,500,400 \ No newline at end of file diff --git a/project-1/target/classes/font/DejaVuSans-Bold.ttf b/target/classes/font/DejaVuSans-Bold.ttf similarity index 100% rename from project-1/target/classes/font/DejaVuSans-Bold.ttf rename to target/classes/font/DejaVuSans-Bold.ttf diff --git a/project-1/target/classes/images/background.png b/target/classes/images/background.png similarity index 100% rename from project-1/target/classes/images/background.png rename to target/classes/images/background.png diff --git a/project-1/target/classes/images/player.png b/target/classes/images/player.png similarity index 100% rename from project-1/target/classes/images/player.png rename to target/classes/images/player.png diff --git a/project-1/target/classes/images/sandwich.png b/target/classes/images/sandwich.png similarity index 100% rename from project-1/target/classes/images/sandwich.png rename to target/classes/images/sandwich.png diff --git a/project-1/target/classes/images/zombie.png b/target/classes/images/zombie.png similarity index 100% rename from project-1/target/classes/images/zombie.png rename to target/classes/images/zombie.png diff --git a/project-1/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties similarity index 100% rename from project-1/target/maven-archiver/pom.properties rename to target/maven-archiver/pom.properties diff --git a/project-1/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst similarity index 100% rename from project-1/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst rename to target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst diff --git a/project-1/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst similarity index 100% rename from project-1/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst rename to target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst diff --git a/project-1/test/.DS_Store b/test/.DS_Store similarity index 100% rename from project-1/test/.DS_Store rename to test/.DS_Store diff --git a/project-1/test/test1/environment.csv b/test/test1/environment.csv similarity index 96% rename from project-1/test/test1/environment.csv rename to test/test1/environment.csv index 34433464a67b782b64b56ef3d04904a00c63c7ab..79fea88a9ab126ee1e10f0828bcff2047ec182f7 100644 --- a/project-1/test/test1/environment.csv +++ b/test/test1/environment.csv @@ -1,3 +1,3 @@ -Player,650,100,2 -Zombie,300,200 +Player,650,100,2 +Zombie,300,200 Sandwich,500,400 \ No newline at end of file diff --git a/project-1/test/test1/output.csv b/test/test1/output.csv similarity index 100% rename from project-1/test/test1/output.csv rename to test/test1/output.csv diff --git a/project-1/test/test2/environment.csv b/test/test2/environment.csv similarity index 96% rename from project-1/test/test2/environment.csv rename to test/test2/environment.csv index 52b5d638b191e77b95ccbbf9c9e6d430333dd896..114e4b5d2caee833c42560d1813c65d6bb319405 100644 --- a/project-1/test/test2/environment.csv +++ b/test/test2/environment.csv @@ -1,3 +1,3 @@ -Player,650,100,3 -Zombie,500,500 +Player,650,100,3 +Zombie,500,500 Sandwich,300,200 \ No newline at end of file diff --git a/project-1/test/test2/output.csv b/test/test2/output.csv similarity index 100% rename from project-1/test/test2/output.csv rename to test/test2/output.csv