Commit graph

152 commits

Author SHA1 Message Date
0c18478e1d
a 2023-08-20 17:01:30 -06:00
ncusimano
c1693ff787 Cultist Killability 2023-08-20 16:58:05 -06:00
vengefulcartographer
70309d0949 Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 16:54:21 -06:00
3b749fe157
a 2023-08-20 16:53:58 -06:00
9bb2929507
revert grapeman 2023-08-20 16:53:03 -06:00
d82a4cc483
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 16:52:31 -06:00
0a95e545ce
daynight 2023-08-20 16:49:08 -06:00
vengefulcartographer
db2602ae30 Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 16:48:36 -06:00
vengefulcartographer
4611460751 title screen 2023-08-20 16:48:12 -06:00
ncusimano
7c47381d86 Spawner Added
On top of skyscraper :)
2023-08-20 16:43:13 -06:00
9712819295
fix glitched beachball 2023-08-20 16:31:27 -06:00
5f36024e8f
a 2023-08-20 16:27:51 -06:00
5894fd7826
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 16:25:45 -06:00
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
dd395a335f Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 15:23:23 -06:00
vengefulcartographer
04ce565c1b pause menu done 2023-08-20 15:23:11 -06:00
ncusimano
6f9894ede9 Merge branch 'master' into NoahBackup-08-20-1.22PM 2023-08-20 15:03:55 -06:00
ncusimano
d227d15ed3 Cultist Works! 2023-08-20 15:03:09 -06:00
ncusimano
bbb160cd40 Merge branch 'master' into NoahBackup-08-20-1.22PM 2023-08-20 15:02:53 -06:00
7471d64491
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 15:00:57 -06:00
0ebfcb9f32
a 2023-08-20 15:00:54 -06:00
vengefulcartographer
cf7d391b00 Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 14:59:43 -06:00
vengefulcartographer
0f2f954930 pause menu 2023-08-20 14:59:32 -06:00
d22b1d281d
a 2023-08-20 14:06:31 -06:00
332e9e0066
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 13:44:54 -06:00
0f80bc6c21
remove signal 2023-08-20 13:44:54 -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
4aab474313
better texture 2023-08-20 13:42:35 -06:00
fef587d00a
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 13:34:05 -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
e8e0140a1f
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 13:31:12 -06:00
ncusimano
47b6c465de Villager and Cultist changes 2023-08-20 13:31:07 -06:00
b95f3ea0fe
a 2023-08-20 13:30:11 -06:00
ncusimano
3bf7a73c1b Resolve Merges
Kept incoming changes
2023-08-20 13:29:27 -06:00
aac237f44b
Fix colour changing 2023-08-20 13:24:04 -06:00
c1cd31bc81
foostep sounds 2023-08-20 12:53:08 -06:00
cc9cc3436d
Woohoo 2023-08-20 12:35:52 -06:00
3ed04bb92e
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 12:31:28 -06:00
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
16d31becb5
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 12:14:11 -06:00
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
61b11defb9
colorgame 2023-08-20 02:05:40 -06:00