sjkillen
/
SlimeoosOdyssey
1
0
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity
161 Commits 8 Branches 0 Tags 137 MiB
Commit Graph

154 Commits

Author SHA1 Message Date
Spencer Killen 475398bef7
a 2023-08-20 17:35:02 -06:00
Spencer Killen d4caed7c8d
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 17:27:14 -06:00
Spencer Killen f5c2d190d3
push 2023-08-20 17:26:28 -06:00
ncusimano c898f5fc10 Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 17:26:06 -06:00
ncusimano 297a56088b Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 17:25:56 -06:00
vengefulcartographer ed231c7ca6 pause menu 2023-08-20 17:22:02 -06:00
ncusimano 76ab245ad1 Slime sound 2023-08-20 17:21:02 -06:00
Spencer Killen cded78e677
pause 2023-08-20 17:18:44 -06:00
Spencer Killen 915d20005b
a 2023-08-20 17:12:21 -06:00
Spencer Killen 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
Spencer Killen 3b749fe157
a 2023-08-20 16:53:58 -06:00
Spencer Killen 9bb2929507
revert grapeman 2023-08-20 16:53:03 -06:00
Spencer Killen d82a4cc483
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 16:52:31 -06:00
Spencer Killen 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
Spencer Killen 9712819295
fix glitched beachball 2023-08-20 16:31:27 -06:00
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 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
Spencer Killen 7471d64491
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 15:00:57 -06:00
Spencer Killen 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
Spencer Killen d22b1d281d
a 2023-08-20 14:06:31 -06:00
Spencer Killen 332e9e0066
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 13:44:54 -06:00
Spencer Killen 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
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 47b6c465de Villager and Cultist changes 2023-08-20 13:31:07 -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 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