diff --git a/Programming/2018/starter/canvas.js b/Programming/2018/starter/canvas.js index e186777..663f5f9 100644 --- a/Programming/2018/starter/canvas.js +++ b/Programming/2018/starter/canvas.js @@ -38,8 +38,8 @@ let R_KEY = 82; function preload() { // If you want to use other images, put them in the images folder // and change the panda.png part to be the image file name - petImage = loadImage("images/panda.png"); - foodImage = loadImage("images/bamboo.png"); + petImage = loadImage("images/animal/panda.png"); + foodImage = loadImage("images/food/bamboo.png"); } function setup() { diff --git a/Programming/2018/starter/images/animal/alligator.png b/Programming/2018/starter/images/animal/alligator.png new file mode 100644 index 0000000..5818663 Binary files /dev/null and b/Programming/2018/starter/images/animal/alligator.png differ diff --git a/Programming/2018/starter/images/animal/bear.png b/Programming/2018/starter/images/animal/bear.png new file mode 100644 index 0000000..cbb2948 Binary files /dev/null and b/Programming/2018/starter/images/animal/bear.png differ diff --git a/Programming/2018/starter/images/animal/bird.png b/Programming/2018/starter/images/animal/bird.png new file mode 100644 index 0000000..86190f0 Binary files /dev/null and b/Programming/2018/starter/images/animal/bird.png differ diff --git a/Programming/2018/starter/images/animal/cat.png b/Programming/2018/starter/images/animal/cat.png new file mode 100644 index 0000000..461836e Binary files /dev/null and b/Programming/2018/starter/images/animal/cat.png differ diff --git a/Programming/2018/starter/images/animal/cow.png b/Programming/2018/starter/images/animal/cow.png new file mode 100644 index 0000000..15ed22b Binary files /dev/null and b/Programming/2018/starter/images/animal/cow.png differ diff --git a/Programming/2018/starter/images/animal/deer.png b/Programming/2018/starter/images/animal/deer.png new file mode 100644 index 0000000..dff37b2 Binary files /dev/null and b/Programming/2018/starter/images/animal/deer.png differ diff --git a/Programming/2018/starter/images/animal/dinosaur.png b/Programming/2018/starter/images/animal/dinosaur.png new file mode 100644 index 0000000..0e57992 Binary files /dev/null and b/Programming/2018/starter/images/animal/dinosaur.png differ diff --git a/Programming/2018/starter/images/animal/dolphin.png b/Programming/2018/starter/images/animal/dolphin.png new file mode 100644 index 0000000..91e4ffe Binary files /dev/null and b/Programming/2018/starter/images/animal/dolphin.png differ diff --git a/Programming/2018/starter/images/animal/dragon.png b/Programming/2018/starter/images/animal/dragon.png new file mode 100644 index 0000000..295c85a Binary files /dev/null and b/Programming/2018/starter/images/animal/dragon.png differ diff --git a/Programming/2018/starter/images/animal/elephant.png b/Programming/2018/starter/images/animal/elephant.png new file mode 100644 index 0000000..5de7d1a Binary files /dev/null and b/Programming/2018/starter/images/animal/elephant.png differ diff --git a/Programming/2018/starter/images/animal/fish.png b/Programming/2018/starter/images/animal/fish.png new file mode 100644 index 0000000..28f6066 Binary files /dev/null and b/Programming/2018/starter/images/animal/fish.png differ diff --git a/Programming/2018/starter/images/animal/fox.png b/Programming/2018/starter/images/animal/fox.png new file mode 100644 index 0000000..564fea7 Binary files /dev/null and b/Programming/2018/starter/images/animal/fox.png differ diff --git a/Programming/2018/starter/images/animal/frog.png b/Programming/2018/starter/images/animal/frog.png new file mode 100644 index 0000000..e497039 Binary files /dev/null and b/Programming/2018/starter/images/animal/frog.png differ diff --git a/Programming/2018/starter/images/animal/giraffe.png b/Programming/2018/starter/images/animal/giraffe.png new file mode 100644 index 0000000..fccc766 Binary files /dev/null and b/Programming/2018/starter/images/animal/giraffe.png differ diff --git a/Programming/2018/starter/images/animal/horse.png b/Programming/2018/starter/images/animal/horse.png new file mode 100644 index 0000000..b46f8ac Binary files /dev/null and b/Programming/2018/starter/images/animal/horse.png differ diff --git a/Programming/2018/starter/images/animal/lion.png b/Programming/2018/starter/images/animal/lion.png new file mode 100644 index 0000000..32580db Binary files /dev/null and b/Programming/2018/starter/images/animal/lion.png differ diff --git a/Programming/2018/starter/images/animal/monkey.png b/Programming/2018/starter/images/animal/monkey.png new file mode 100644 index 0000000..6792f22 Binary files /dev/null and b/Programming/2018/starter/images/animal/monkey.png differ diff --git a/Programming/2018/starter/images/animal/mouse.png b/Programming/2018/starter/images/animal/mouse.png new file mode 100644 index 0000000..dc58e3a Binary files /dev/null and b/Programming/2018/starter/images/animal/mouse.png differ diff --git a/Programming/2018/starter/images/panda.png b/Programming/2018/starter/images/animal/panda.png similarity index 100% rename from Programming/2018/starter/images/panda.png rename to Programming/2018/starter/images/animal/panda.png diff --git a/Programming/2018/starter/images/animal/penguin.png b/Programming/2018/starter/images/animal/penguin.png new file mode 100644 index 0000000..ad31088 Binary files /dev/null and b/Programming/2018/starter/images/animal/penguin.png differ diff --git a/Programming/2018/starter/images/animal/pig.png b/Programming/2018/starter/images/animal/pig.png new file mode 100644 index 0000000..8ab401f Binary files /dev/null and b/Programming/2018/starter/images/animal/pig.png differ diff --git a/Programming/2018/starter/images/animal/rabbit.png b/Programming/2018/starter/images/animal/rabbit.png new file mode 100644 index 0000000..c76c34f Binary files /dev/null and b/Programming/2018/starter/images/animal/rabbit.png differ diff --git a/Programming/2018/starter/images/animal/shark.png b/Programming/2018/starter/images/animal/shark.png new file mode 100644 index 0000000..9fd2663 Binary files /dev/null and b/Programming/2018/starter/images/animal/shark.png differ diff --git a/Programming/2018/starter/images/animal/sheep.png b/Programming/2018/starter/images/animal/sheep.png new file mode 100644 index 0000000..88ba652 Binary files /dev/null and b/Programming/2018/starter/images/animal/sheep.png differ diff --git a/Programming/2018/starter/images/animal/squirrel.png b/Programming/2018/starter/images/animal/squirrel.png new file mode 100644 index 0000000..3dea5fc Binary files /dev/null and b/Programming/2018/starter/images/animal/squirrel.png differ diff --git a/Programming/2018/starter/images/animal/tiger.png b/Programming/2018/starter/images/animal/tiger.png new file mode 100644 index 0000000..ec799ee Binary files /dev/null and b/Programming/2018/starter/images/animal/tiger.png differ diff --git a/Programming/2018/starter/images/animal/whale.png b/Programming/2018/starter/images/animal/whale.png new file mode 100644 index 0000000..1748633 Binary files /dev/null and b/Programming/2018/starter/images/animal/whale.png differ diff --git a/Programming/2018/starter/images/animal/wolf.png b/Programming/2018/starter/images/animal/wolf.png new file mode 100644 index 0000000..ea3774a Binary files /dev/null and b/Programming/2018/starter/images/animal/wolf.png differ diff --git a/Programming/2018/starter/images/animal/worm.png b/Programming/2018/starter/images/animal/worm.png new file mode 100644 index 0000000..a57c418 Binary files /dev/null and b/Programming/2018/starter/images/animal/worm.png differ diff --git a/Programming/2018/starter/images/animal/zebra.png b/Programming/2018/starter/images/animal/zebra.png new file mode 100644 index 0000000..f87981a Binary files /dev/null and b/Programming/2018/starter/images/animal/zebra.png differ diff --git a/Programming/2018/starter/images/bamboo.png b/Programming/2018/starter/images/food/bamboo.png similarity index 100% rename from Programming/2018/starter/images/bamboo.png rename to Programming/2018/starter/images/food/bamboo.png diff --git a/Programming/2018/starter/images/food/bananas.png b/Programming/2018/starter/images/food/bananas.png new file mode 100644 index 0000000..1f8de24 Binary files /dev/null and b/Programming/2018/starter/images/food/bananas.png differ diff --git a/Programming/2018/starter/images/food/berries.png b/Programming/2018/starter/images/food/berries.png new file mode 100644 index 0000000..7cdd7ac Binary files /dev/null and b/Programming/2018/starter/images/food/berries.png differ diff --git a/Programming/2018/starter/images/food/carrot.png b/Programming/2018/starter/images/food/carrot.png new file mode 100644 index 0000000..eb47e47 Binary files /dev/null and b/Programming/2018/starter/images/food/carrot.png differ diff --git a/Programming/2018/starter/images/food/cheese.png b/Programming/2018/starter/images/food/cheese.png new file mode 100644 index 0000000..b382bd4 Binary files /dev/null and b/Programming/2018/starter/images/food/cheese.png differ diff --git a/Programming/2018/starter/images/food/chestnut.png b/Programming/2018/starter/images/food/chestnut.png new file mode 100644 index 0000000..b2a9881 Binary files /dev/null and b/Programming/2018/starter/images/food/chestnut.png differ diff --git a/Programming/2018/starter/images/food/grass.png b/Programming/2018/starter/images/food/grass.png new file mode 100644 index 0000000..cb44f13 Binary files /dev/null and b/Programming/2018/starter/images/food/grass.png differ diff --git a/Programming/2018/starter/images/food/hay.png b/Programming/2018/starter/images/food/hay.png new file mode 100644 index 0000000..b4c6b00 Binary files /dev/null and b/Programming/2018/starter/images/food/hay.png differ diff --git a/Programming/2018/starter/images/food/leaves.png b/Programming/2018/starter/images/food/leaves.png new file mode 100644 index 0000000..ee02b19 Binary files /dev/null and b/Programming/2018/starter/images/food/leaves.png differ diff --git a/Programming/2018/starter/images/food/meat.png b/Programming/2018/starter/images/food/meat.png new file mode 100644 index 0000000..4dfca0e Binary files /dev/null and b/Programming/2018/starter/images/food/meat.png differ diff --git a/Programming/2018/starter/index.html b/Programming/2018/starter/index.html index b6a09d7..ad11541 100644 --- a/Programming/2018/starter/index.html +++ b/Programming/2018/starter/index.html @@ -5,7 +5,17 @@ +
+

An error occured inside your game. Go back to the editor to see what it is.

+
+ + diff --git a/Programming/2018/starter/style.css b/Programming/2018/starter/style.css index 52363f7..b2fa990 100644 --- a/Programming/2018/starter/style.css +++ b/Programming/2018/starter/style.css @@ -2,6 +2,15 @@ html, body { height: 100%; } +#errorBox{ + display: none; + position: fixed; + top: 50%; + width: 100%; + font-size: 20px; + background-color: red; +} + body { margin: 0; display: flex;