diff --git a/Java/scripts/build.sh b/Java/scripts/build.sh index 540c54f..09d99a2 100755 --- a/Java/scripts/build.sh +++ b/Java/scripts/build.sh @@ -5,5 +5,5 @@ javac -source ${SOURCE_VERSION} -target ${TARGET_VERSION} -Xlint:unchecked -cp $ printf "\n\n\nRunning Program...\n\n" ORIGINAL_LOC=$(pwd) cd $OUT_DIR -java ${CUSTOM_PARAMS} -cp .:../lib/bin -Djava.library.path="${LIBRARY_PATH}" ${MAIN_CLASS} "$@" -${ORIGINAL_LOC}/${LANGUAGE}/scripts/clean.sh \ No newline at end of file +java ${CUSTOM_PARAMS} -cp .:../lib/bin/ -Djava.library.path="${LIBRARY_PATH}" ${MAIN_CLASS} "$@" +#${ORIGINAL_LOC}/${LANGUAGE}/scripts/clean.sh \ No newline at end of file diff --git a/Java/scripts/build2.sh b/Java/scripts/build2.sh new file mode 100644 index 0000000..f9be65b --- /dev/null +++ b/Java/scripts/build2.sh @@ -0,0 +1,9 @@ +#Builds and runs the project. +#Java +source ${LANGUAGE}/scripts/version_info +javac -source ${SOURCE_VERSION} -target ${TARGET_VERSION} -Xlint:unchecked -cp ${CLASS_PATH2} -d ${OUT_DIR} ${PROJECT_DIR}/*.java +printf "\n\n\nRunning Program...\n\n" +ORIGINAL_LOC=$(pwd) +cd $OUT_DIR +java ${CUSTOM_PARAMS} -cp ".;../lib/bin/ " "-Djava.library.path=${LIBRARY_PATH}" ${MAIN_CLASS} "$@" +#${ORIGINAL_LOC}/${LANGUAGE}/scripts/clean.sh \ No newline at end of file diff --git a/Java/scripts/md5 b/Java/scripts/md5 index 7439c4b..7253680 100644 --- a/Java/scripts/md5 +++ b/Java/scripts/md5 @@ -1,6 +1,6 @@ -build.sh:293285766098a4e3d4d708e58a69de82 - -clean.sh:668a2f9b568c55f6a044a509315032f6 - -commit.sh:5e4448db9ad48e72ec3a1ff4f5763b41 - -jar.sh:2f59229fcaf02779bfaa43144f3be66f - -release.sh:b1b62203411b18d0fec1db3dc2e5a061 - -update.sh:3be721658983183efa395984acd96b03 - +build.sh:293285766098a4e3d4d708e58a69de82 *- +clean.sh:668a2f9b568c55f6a044a509315032f6 *- +commit.sh:5e4448db9ad48e72ec3a1ff4f5763b41 *- +jar.sh:2f59229fcaf02779bfaa43144f3be66f *- +release.sh:b1b62203411b18d0fec1db3dc2e5a061 *- +update.sh:3be721658983183efa395984acd96b03 *- diff --git a/bin/RabiClone.jar b/bin/RabiClone.jar deleted file mode 100644 index 4b1b868..0000000 Binary files a/bin/RabiClone.jar and /dev/null differ diff --git a/bin/sig/DrawLoop.class b/bin/sig/DrawLoop.class new file mode 100644 index 0000000..e621c47 Binary files /dev/null and b/bin/sig/DrawLoop.class differ diff --git a/bin/sig/RabiClone.class b/bin/sig/RabiClone.class new file mode 100644 index 0000000..8112cef Binary files /dev/null and b/bin/sig/RabiClone.class differ diff --git a/bin/sig/engine/Action.class b/bin/sig/engine/Action.class new file mode 100644 index 0000000..b11c6f4 Binary files /dev/null and b/bin/sig/engine/Action.class differ diff --git a/bin/sig/engine/Alpha.class b/bin/sig/engine/Alpha.class new file mode 100644 index 0000000..3992038 Binary files /dev/null and b/bin/sig/engine/Alpha.class differ diff --git a/bin/sig/engine/AnimatedObject.class b/bin/sig/engine/AnimatedObject.class new file mode 100644 index 0000000..d94ac6e Binary files /dev/null and b/bin/sig/engine/AnimatedObject.class differ diff --git a/bin/sig/engine/AnimatedSprite.class b/bin/sig/engine/AnimatedSprite.class new file mode 100644 index 0000000..2e4c077 Binary files /dev/null and b/bin/sig/engine/AnimatedSprite.class differ diff --git a/bin/sig/engine/Color.class b/bin/sig/engine/Color.class new file mode 100644 index 0000000..d22c5a9 Binary files /dev/null and b/bin/sig/engine/Color.class differ diff --git a/bin/sig/engine/Edge.class b/bin/sig/engine/Edge.class new file mode 100644 index 0000000..2021032 Binary files /dev/null and b/bin/sig/engine/Edge.class differ diff --git a/bin/sig/engine/Font.class b/bin/sig/engine/Font.class new file mode 100644 index 0000000..b820d90 Binary files /dev/null and b/bin/sig/engine/Font.class differ diff --git a/bin/sig/engine/GameEntity.class b/bin/sig/engine/GameEntity.class new file mode 100644 index 0000000..0791c4c Binary files /dev/null and b/bin/sig/engine/GameEntity.class differ diff --git a/bin/sig/engine/Key.class b/bin/sig/engine/Key.class new file mode 100644 index 0000000..1eb0344 Binary files /dev/null and b/bin/sig/engine/Key.class differ diff --git a/bin/sig/engine/KeyBind.class b/bin/sig/engine/KeyBind.class new file mode 100644 index 0000000..7febcf4 Binary files /dev/null and b/bin/sig/engine/KeyBind.class differ diff --git a/bin/sig/engine/MouseScrollValue.class b/bin/sig/engine/MouseScrollValue.class new file mode 100644 index 0000000..764332b Binary files /dev/null and b/bin/sig/engine/MouseScrollValue.class differ diff --git a/bin/sig/engine/Object.class b/bin/sig/engine/Object.class new file mode 100644 index 0000000..8f753a3 Binary files /dev/null and b/bin/sig/engine/Object.class differ diff --git a/bin/sig/engine/PaletteColor.class b/bin/sig/engine/PaletteColor.class new file mode 100644 index 0000000..3d07ea3 Binary files /dev/null and b/bin/sig/engine/PaletteColor.class differ diff --git a/bin/sig/engine/Panel$1.class b/bin/sig/engine/Panel$1.class new file mode 100644 index 0000000..347a110 Binary files /dev/null and b/bin/sig/engine/Panel$1.class differ diff --git a/bin/sig/engine/Panel$2.class b/bin/sig/engine/Panel$2.class new file mode 100644 index 0000000..6bf9c10 Binary files /dev/null and b/bin/sig/engine/Panel$2.class differ diff --git a/bin/sig/engine/Panel$3.class b/bin/sig/engine/Panel$3.class new file mode 100644 index 0000000..087dd90 Binary files /dev/null and b/bin/sig/engine/Panel$3.class differ diff --git a/bin/sig/engine/Panel.class b/bin/sig/engine/Panel.class new file mode 100644 index 0000000..efd9841 Binary files /dev/null and b/bin/sig/engine/Panel.class differ diff --git a/bin/sig/engine/Point.class b/bin/sig/engine/Point.class new file mode 100644 index 0000000..81cf6dd Binary files /dev/null and b/bin/sig/engine/Point.class differ diff --git a/bin/sig/engine/Rectangle.class b/bin/sig/engine/Rectangle.class new file mode 100644 index 0000000..11a07e5 Binary files /dev/null and b/bin/sig/engine/Rectangle.class differ diff --git a/bin/sig/engine/Sprite.class b/bin/sig/engine/Sprite.class new file mode 100644 index 0000000..73deef8 Binary files /dev/null and b/bin/sig/engine/Sprite.class differ diff --git a/bin/sig/engine/String.class b/bin/sig/engine/String.class new file mode 100644 index 0000000..58ae64a Binary files /dev/null and b/bin/sig/engine/String.class differ diff --git a/bin/sig/engine/Transform.class b/bin/sig/engine/Transform.class new file mode 100644 index 0000000..0ab741f Binary files /dev/null and b/bin/sig/engine/Transform.class differ diff --git a/bin/sig/map/Background.class b/bin/sig/map/Background.class new file mode 100644 index 0000000..8fd10ee Binary files /dev/null and b/bin/sig/map/Background.class differ diff --git a/bin/sig/map/CollisionType.class b/bin/sig/map/CollisionType.class new file mode 100644 index 0000000..187418a Binary files /dev/null and b/bin/sig/map/CollisionType.class differ diff --git a/bin/sig/map/Map.class b/bin/sig/map/Map.class new file mode 100644 index 0000000..748d351 Binary files /dev/null and b/bin/sig/map/Map.class differ diff --git a/bin/sig/map/Maps.class b/bin/sig/map/Maps.class new file mode 100644 index 0000000..6c8dd0b Binary files /dev/null and b/bin/sig/map/Maps.class differ diff --git a/bin/sig/map/Tile.class b/bin/sig/map/Tile.class new file mode 100644 index 0000000..b252eeb Binary files /dev/null and b/bin/sig/map/Tile.class differ diff --git a/bin/sig/map/Type.class b/bin/sig/map/Type.class new file mode 100644 index 0000000..e2137b3 Binary files /dev/null and b/bin/sig/map/Type.class differ diff --git a/bin/sig/map/View.class b/bin/sig/map/View.class new file mode 100644 index 0000000..0a259e9 Binary files /dev/null and b/bin/sig/map/View.class differ diff --git a/bin/sig/objects/ConfigureControls.class b/bin/sig/objects/ConfigureControls.class new file mode 100644 index 0000000..6a55434 Binary files /dev/null and b/bin/sig/objects/ConfigureControls.class differ diff --git a/bin/sig/objects/EditorRenderer$1.class b/bin/sig/objects/EditorRenderer$1.class new file mode 100644 index 0000000..bec7f6d Binary files /dev/null and b/bin/sig/objects/EditorRenderer$1.class differ diff --git a/bin/sig/objects/EditorRenderer.class b/bin/sig/objects/EditorRenderer.class new file mode 100644 index 0000000..2dec9ce Binary files /dev/null and b/bin/sig/objects/EditorRenderer.class differ diff --git a/bin/sig/objects/LevelRenderer.class b/bin/sig/objects/LevelRenderer.class new file mode 100644 index 0000000..be2fef6 Binary files /dev/null and b/bin/sig/objects/LevelRenderer.class differ diff --git a/bin/sig/objects/Player$1.class b/bin/sig/objects/Player$1.class new file mode 100644 index 0000000..d178b86 Binary files /dev/null and b/bin/sig/objects/Player$1.class differ diff --git a/bin/sig/objects/Player.class b/bin/sig/objects/Player.class new file mode 100644 index 0000000..1caf0a0 Binary files /dev/null and b/bin/sig/objects/Player.class differ diff --git a/bin/sig/objects/actor/State.class b/bin/sig/objects/actor/State.class new file mode 100644 index 0000000..1869626 Binary files /dev/null and b/bin/sig/objects/actor/State.class differ diff --git a/bin/sig/utils/TimeUtils.class b/bin/sig/utils/TimeUtils.class new file mode 100644 index 0000000..7c4050e Binary files /dev/null and b/bin/sig/utils/TimeUtils.class differ diff --git a/build.sh b/build.sh deleted file mode 100755 index 970e35b..0000000 --- a/build.sh +++ /dev/null @@ -1,10 +0,0 @@ -#Builds and runs the project. -#Java -source ${LANGUAGE}/scripts/version_info -rm -Rf out/* -javac -source ${SOURCE_VERSION} -target ${TARGET_VERSION} -Xlint:unchecked -cp ${PROJECT_DIR}/.. -d ${OUT_DIR} ${PROJECT_DIR}/*.java -printf "\n\n\nRunning Program...\n\n" -ORIGINAL_LOC=$(pwd) -cd $OUT_DIR -java -Djava.library.path="${LIBRARY_PATH}" ${MAIN_CLASS} "$@" -${ORIGINAL_LOC}/${LANGUAGE}/scripts/clean.sh \ No newline at end of file diff --git a/maps/world1.map b/maps/world1.map index c5f0e18..7f141c2 100644 Binary files a/maps/world1.map and b/maps/world1.map differ diff --git a/sig b/sig index 5c36672..bdd890d 100755 --- a/sig +++ b/sig @@ -1,4 +1,4 @@ -export AUTO_UPDATE=true +export AUTO_UPDATE=false source utils/define.sh @@ -8,6 +8,7 @@ define MAIN_CLASS "sig.${PROJECT_NAME}" define OUT_DIR "bin" define LIBRARY_PATH "../lib" define CLASS_PATH "${PROJECT_DIR}/..:lib/bin" +define CLASS_PATH2 "${PROJECT_DIR}/..;lib/bin" define CUSTOM_PARAMS "-Xmx2G -Xms2G" define LANGUAGE "Java" diff --git a/sprites/tiles.gif b/sprites/tiles.gif index d8eff40..2b6289e 100644 Binary files a/sprites/tiles.gif and b/sprites/tiles.gif differ diff --git a/src/sig/map/CollisionType.java b/src/sig/map/CollisionType.java index 095a54d..8e2812c 100644 --- a/src/sig/map/CollisionType.java +++ b/src/sig/map/CollisionType.java @@ -2,5 +2,6 @@ package sig.map; public enum CollisionType { BLOCK, + SLOPE, NONE } diff --git a/src/sig/map/Tile.java b/src/sig/map/Tile.java index bd61876..3e3482b 100644 --- a/src/sig/map/Tile.java +++ b/src/sig/map/Tile.java @@ -7,6 +7,12 @@ public enum Tile { PLATFORM_LEDGE(2,0,CollisionType.BLOCK), INVISIBLE_WALL(0,0,true,CollisionType.BLOCK), HIGHLIGHTED_TILE(3,0,CollisionType.BLOCK), + SMALL_SLOPE_LEFT(0,1,CollisionType.BLOCK), + SMALL_SLOPE_RIGHT(1,1,CollisionType.BLOCK), + BIG_SLOPE_LEFT1(2,1,CollisionType.BLOCK), + BIG_SLOPE_LEFT2(3,1,CollisionType.BLOCK), + BIG_SLOPE_RIGHT1(0,2,CollisionType.BLOCK), + BIG_SLOPE_RIGHT2(1,2,CollisionType.BLOCK), ; final public static int TILE_WIDTH=32; diff --git a/utils/filelist b/utils/filelist index 95ad5ff..8a9f471 100644 --- a/utils/filelist +++ b/utils/filelist @@ -1,5 +1,5 @@ .coauthors +.updateDirectories define.sh main.sh search.sh -.updateDirectories diff --git a/utils/md5 b/utils/md5 index baa339d..3ffd1ab 100644 --- a/utils/md5 +++ b/utils/md5 @@ -1,4 +1,4 @@ -define.sh:3ecab0dffe2adfb950f3eb7c7061b750 - -main.sh:d3d1bd0b56d8114eb7479964227f8576 - -search.sh:81d08f5ff48e8a44b5f68387d426da05 - -.updateDirectories:0ede00461e947494545e694040787b3f - +.updateDirectories:0ede00461e947494545e694040787b3f *- +define.sh:3ecab0dffe2adfb950f3eb7c7061b750 *- +main.sh:d3d1bd0b56d8114eb7479964227f8576 *- +search.sh:81d08f5ff48e8a44b5f68387d426da05 *-