Commit Graph

65 Commits

Author SHA1 Message Date
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
ncusimano a8465d9962 Updates to Villager and Update to Main 2023-08-19 16:08:58 -06:00
ncusimano e52f893517 Merge branch 'master' into Player 2023-08-19 16:06:42 -06:00
Spencer Killen 5d7d4e90bc
a 2023-08-19 15:42:56 -06:00
Spencer Killen fb4f550890
a 2023-08-19 15:05:31 -06:00
Spencer Killen f79b1d84e1
a 2023-08-19 15:01:10 -06:00
Spencer Killen 16e6c9bb9d
a 2023-08-19 15:00:16 -06:00
Spencer Killen 2ae40bb7f6
a 2023-08-19 14:51:31 -06:00
Spencer Killen 6568462d0a
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-19 14:50:42 -06:00
Spencer Killen 158fc450f8
a 2023-08-19 14:49:36 -06:00
vengefulcartographer 7007ae3ffc Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-19 13:35:59 -06:00
vengefulcartographer 1838dc5b7b level 2023-08-19 13:34:34 -06:00
Spencer Killen 5a9e2575bf
a 2023-08-19 12:27:23 -06:00
Spencer Killen bfe712c456
Merge remote-tracking branch 'origin/Player' 2023-08-19 11:59:59 -06:00
Spencer Killen 0adc2c92e2
a 2023-08-19 11:58:20 -06:00
ncusimano f6931cf64f Added Comments 2023-08-19 11:58:11 -06:00
Spencer Killen 86b796b09f
Add camera lock 2023-08-19 11:51:06 -06:00
Spencer Killen 4f01afff2f
a 2023-08-19 11:32:30 -06:00
Spencer Killen cc12e8fc12
Merge remote-tracking branch 'origin/Player' 2023-08-19 11:32:26 -06:00
ncusimano 61cd28172c Camera Updates 2023-08-19 11:30:53 -06:00
ncusimano aa25e5c772 Updates 2023-08-19 11:17:09 -06:00
ncusimano 5ca8491046 Update! 2023-08-19 11:08:45 -06:00
Spencer Killen b84692b120
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-19 11:06:06 -06:00
Spencer Killen 2c3c20a503
Environment 2023-08-19 11:06:05 -06:00
vengefulcartographer 10b8fa0cac decorations 2023-08-19 11:05:28 -06:00
ncusimano c96e96a9e9 Villager Actions
Not yet complete
2023-08-19 11:04:45 -06:00
Spencer Killen 8560d4ac4d
Add screen shader 2023-08-19 10:45:09 -06:00
Spencer Killen af90e9390a
Add slime animation controller 2023-08-19 02:19:56 -06:00
Spencer Killen 0c570d8959
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-19 01:31:25 -06:00