Commit Graph

112 Commits

Author SHA1 Message Date
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 3ed04bb92e
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 12:31:28 -06:00
Spencer Killen b4e0603e33
jostick camera 2023-08-20 12:31:24 -06:00
ncusimano d62d10e7e0 Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 12:18:50 -06:00
ncusimano 2c5a328665 Resolve Conflict
Also has Cultist updates
2023-08-20 12:18:04 -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
vengefulcartographer 478a16f72b moved holster up 2023-08-20 11:00:14 -06:00
Spencer Killen 61b11defb9
colorgame 2023-08-20 02:05:40 -06:00
Spencer Killen e6fbcbc1aa
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 01:03:31 -06:00
Spencer Killen 5d9cfdb01f
fun with colours 2023-08-20 01:03:30 -06:00
vengefulcartographer cddbd39765 Update island 2023-08-20 00:12:47 -06:00
vengefulcartographer 0277e45a03 update island 2023-08-20 00:11:36 -06:00
vengefulcartographer c77ef38bdb Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 00:10:14 -06:00
vengefulcartographer 1f8288735c ocean wave 2023-08-20 00:09:59 -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