Commit Graph

79 Commits

Author SHA1 Message Date
Spencer Killen 5f36024e8f
a 2023-08-20 16:27:51 -06:00
Spencer Killen 5894fd7826
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 16:25:45 -06:00
Spencer Killen f972ee5974
beach ball 2023-08-20 16:23:50 -06:00
ncusimano a16ea0cd15 Slimes Turn When Stuck :) 2023-08-20 15:43:03 -06:00
vengefulcartographer 04ce565c1b pause menu done 2023-08-20 15:23:11 -06:00
Spencer Killen 0ebfcb9f32
a 2023-08-20 15:00:54 -06:00
Spencer Killen d22b1d281d
a 2023-08-20 14:06:31 -06:00
vengefulcartographer a7ac6e9a66 Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 13:44:07 -06:00
vengefulcartographer 6035ef67f2 daynight in Island 2023-08-20 13:43:47 -06:00
Spencer Killen 4aab474313
better texture 2023-08-20 13:42:35 -06:00
vengefulcartographer 264a029cbd Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 13:32:04 -06:00
vengefulcartographer 8c9ba03def new environment 2023-08-20 13:31:48 -06:00
ncusimano 3bf7a73c1b Resolve Merges
Kept incoming changes
2023-08-20 13:29:27 -06:00
Spencer Killen aac237f44b
Fix colour changing 2023-08-20 13:24:04 -06:00
Spencer Killen c1cd31bc81
foostep sounds 2023-08-20 12:53:08 -06:00
Spencer Killen cc9cc3436d
Woohoo 2023-08-20 12:35:52 -06:00
Spencer Killen 16d31becb5
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 12:14:11 -06:00
Spencer Killen d411911cac
Improve walking 2023-08-20 12:13:54 -06:00
vengefulcartographer 1a41a4b36d soundboard 2023-08-20 11:48:25 -06:00
vengefulcartographer 32f6f40e3b input fiddling 2023-08-20 11:19:59 -06:00
Spencer Killen 61b11defb9
colorgame 2023-08-20 02:05:40 -06:00
Spencer Killen 5d9cfdb01f
fun with colours 2023-08-20 01:03:30 -06:00
Spencer Killen ea195e54cc
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 00:08:32 -06:00
Spencer Killen 9e67ca3822
Add sounds 2023-08-20 00:08:31 -06:00
vengefulcartographer e22b5a7bd0 Building collision 2023-08-20 00:05:58 -06:00
ncusimano 0e4b71387e New Slimes Just Dropped 2023-08-20 00:00:17 -06:00
vengefulcartographer 6e28f0721c world border 2023-08-19 23:32:26 -06:00
Spencer Killen eec35a04d7
a 2023-08-19 23:10:30 -06:00
Spencer Killen bcb99f5ebd
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-19 23:02:08 -06:00
vengefulcartographer d67300d8b8 dirt fix for island 2023-08-19 22:41:36 -06:00
Spencer Killen b82734e335
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-19 22:38:29 -06:00
vengefulcartographer a90a0f01c6 world environment sunset 2023-08-19 22:37:52 -06:00
Spencer Killen fb915405d6
different colour slimes 2023-08-19 21:58:05 -06:00
Spencer Killen 90a94cb16a
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-19 21:48:11 -06:00
Spencer Killen a60de71566
a 2023-08-19 21:47:13 -06:00
vengefulcartographer b6d7b170c4 more sfx 2023-08-19 21:44:27 -06:00
Spencer Killen a5476d4ddd
Fix rocks colour villagers 2023-08-19 21:21:54 -06:00
Spencer Killen 73be2a700c
Giant pickups 2023-08-19 20:18:07 -06:00
Spencer Killen f9b21c3bf6
a 2023-08-19 19:22:57 -06:00
Spencer Killen 7adfcc2766
a 2023-08-19 18:58:08 -06:00
Spencer Killen 4ef9927141
a 2023-08-19 18:56:38 -06:00
Spencer Killen 62d8ce3b30
a 2023-08-19 18:18:34 -06:00
vengefulcartographer 0633136cf9 sand fix 2023-08-19 17:17:56 -06:00
Spencer Killen 5a90fc89e4
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-19 17:03:20 -06:00
Spencer Killen a95e64bdf5
a 2023-08-19 17:02:32 -06:00
vengefulcartographer d9d0388176 added sounds 2023-08-19 16:59:20 -06:00
Spencer Killen 860237cee1
a 2023-08-19 16:51:10 -06:00
Spencer Killen d5d7295602
a 2023-08-19 16:32:19 -06:00
Spencer Killen 9c90404a7f
Merge remote-tracking branch 'origin/Player' 2023-08-19 16:14:35 -06:00
ncusimano e52f893517 Merge branch 'master' into Player 2023-08-19 16:06:42 -06:00