Commit Graph

93 Commits

Author SHA1 Message Date
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 77877b0c35 Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 00:00:47 -06:00
ncusimano 0e4b71387e New Slimes Just Dropped 2023-08-20 00:00:17 -06:00
vengefulcartographer 25c7c0771c moved holster 2023-08-19 23:37:41 -06:00
Spencer Killen 6d3b2f70dd
a 2023-08-19 23:32:59 -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
Spencer Killen e7fc622871
a 2023-08-19 22:38:08 -06:00
vengefulcartographer a90a0f01c6 world environment sunset 2023-08-19 22:37:52 -06:00
Spencer Killen 8f5abaee24
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-19 22:07:43 -06:00
Spencer Killen 7296881f17
a 2023-08-19 22:06:30 -06:00
vengefulcartographer f450e131ec music fixed 2023-08-19 22:05:23 -06:00
Spencer Killen fb915405d6
different colour slimes 2023-08-19 21:58:05 -06:00
vengefulcartographer 8f28bc4c0a music added 2023-08-19 21:56:19 -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
vengefulcartographer 3562f24ad3 Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-19 21:30:38 -06:00
vengefulcartographer 0110dae2cf last song 2023-08-19 21:30:22 -06:00
Spencer Killen a5476d4ddd
Fix rocks colour villagers 2023-08-19 21:21:54 -06:00
Spencer Killen c4a3b3bdc0
a 2023-08-19 20:56:23 -06:00
Spencer Killen 429b91facf
villager animations 2023-08-19 20:45:30 -06:00
Spencer Killen b310830c9d
gameplay 2023-08-19 20:42:02 -06:00
Spencer Killen d052cf41ed
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-19 20:18:28 -06:00
Spencer Killen 73be2a700c
Giant pickups 2023-08-19 20:18:07 -06:00
vengefulcartographer 67200911d0 new song format 2023-08-19 20:12:22 -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 db3240dd4c
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-19 18:44:52 -06:00
ncusimano 8abfb91237 Push 2023-08-19 18:43:22 -06:00
Spencer Killen 62d8ce3b30
a 2023-08-19 18:18:34 -06:00
ncusimano 8dad9b406c Update Villager.gd
Updates to Villager Script
2023-08-19 17:29:27 -06:00
vengefulcartographer 0633136cf9 sand fix 2023-08-19 17:17:56 -06:00
Spencer Killen 2f9d1df923
Merge branch 'stable2' 2023-08-19 17:16:06 -06:00
Spencer Killen b6f3174547
Collision 2023-08-19 17:15:16 -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 8465f2eadb
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-19 16:51:14 -06:00
Spencer Killen 860237cee1
a 2023-08-19 16:51:10 -06:00
ncusimano 9208a53c71 Update Villager.gd 2023-08-19 16:41:21 -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