Commit Graph

89 Commits

Author SHA1 Message Date
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
Spencer Killen 048c233514
grape man animation controller 2023-08-19 01:31:24 -06:00
ncusimano 2da89d6d9c Merge branch 'master' into Player 2023-08-18 23:19:55 -06:00
ncusimano 9a4f3e5b1a Merge branch 'master' into Player 2023-08-18 23:16:18 -06:00
vengefulcartographer f4d371afca Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-18 23:15:53 -06:00
vengefulcartographer dd0fc32866 palm trees finished 2023-08-18 23:15:42 -06:00
ncusimano 0d0f255827 Working Camera
Camera Works!
2023-08-18 23:15:14 -06:00
Spencer Killen 253fca1070
Fix island 2023-08-18 23:10:22 -06:00
Spencer Killen f12869398d
a 2023-08-18 23:06:22 -06:00
Spencer Killen 487083f5b3
move to blends 2023-08-18 23:01:44 -06:00
vengefulcartographer 6c553d93d6 Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-18 23:00:51 -06:00
vengefulcartographer c17955da17 blend file 2023-08-18 23:00:39 -06:00
Spencer Killen cd410e0eb0
Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 2023-08-18 23:00:25 -06:00
Spencer Killen bf6a8bfb6c
Grape man 2023-08-18 23:00:23 -06:00
vengefulcartographer 8a49d26294 island 2023-08-18 23:00:01 -06:00
ncusimano 5b8fb7b298 Camera Implementation
Very Basic
2023-08-18 21:27:39 -06:00
ncusimano 7644862ffa Added a Default Player Scene 2023-08-18 20:59:38 -06:00
vengefulcartographer e36ef90462 test island 2023-08-18 20:53:00 -06:00
Spencer Killen f8060149b8
Initial project 2023-08-18 18:09:19 -06:00