Commit graph

127 commits

Author SHA1 Message Date
vengefulcartographer
0f2f954930 pause menu 2023-08-20 14:59:32 -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
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
e6fbcbc1aa
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 01:03:31 -06:00
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
ea195e54cc
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-20 00:08:32 -06:00
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
6d3b2f70dd
a 2023-08-19 23:32:59 -06:00
vengefulcartographer
6e28f0721c world border 2023-08-19 23:32:26 -06:00
eec35a04d7
a 2023-08-19 23:10:30 -06:00
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
b82734e335
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-19 22:38:29 -06:00
e7fc622871
a 2023-08-19 22:38:08 -06:00
vengefulcartographer
a90a0f01c6 world environment sunset 2023-08-19 22:37:52 -06:00
8f5abaee24
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-19 22:07:43 -06:00
7296881f17
a 2023-08-19 22:06:30 -06:00
vengefulcartographer
f450e131ec music fixed 2023-08-19 22:05:23 -06:00
fb915405d6
different colour slimes 2023-08-19 21:58:05 -06:00
vengefulcartographer
8f28bc4c0a music added 2023-08-19 21:56:19 -06:00