Commit graph

Select branches

Hide pull requests

NoahBackup

NoahBackup-08-20-1.22PM

Player

master

premerge

soundboard

stable

stable2

Mono Color

• 73be2a700c
  
  Giant pickups Spencer Killen 2023-08-19 20:18:07 -06:00
• 67200911d0 new song format vengefulcartographer 2023-08-19 20:12:22 -06:00
• f9b21c3bf6
  
  a Spencer Killen 2023-08-19 19:22:57 -06:00
• 7adfcc2766
  
  a Spencer Killen 2023-08-19 18:58:08 -06:00
• 4ef9927141
  
  a Spencer Killen 2023-08-19 18:56:38 -06:00
• db3240dd4c
  
  Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 Spencer Killen 2023-08-19 18:44:52 -06:00
• 8abfb91237 Push ncusimano 2023-08-19 18:43:22 -06:00
• 5ef736efc2 Update Villager.gd Player ncusimano 2023-08-19 18:36:00 -06:00
• 62d8ce3b30
  
  a Spencer Killen 2023-08-19 18:18:34 -06:00
• 8dad9b406c Update Villager.gd ncusimano 2023-08-19 17:29:27 -06:00
• 0633136cf9 sand fix vengefulcartographer 2023-08-19 17:17:56 -06:00
• 2f9d1df923
  
  Merge branch 'stable2' Spencer Killen 2023-08-19 17:16:06 -06:00
• b6f3174547
  
  Collision stable2 Spencer Killen 2023-08-19 17:15:16 -06:00
• 5a90fc89e4
  
  Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 Spencer Killen 2023-08-19 17:03:20 -06:00
• a95e64bdf5
  
  a Spencer Killen 2023-08-19 17:02:32 -06:00
• b7442f9efa Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 vengefulcartographer 2023-08-19 17:01:07 -06:00
• d9d0388176 added sounds vengefulcartographer 2023-08-19 16:59:20 -06:00
• 8465f2eadb
  
  Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 Spencer Killen 2023-08-19 16:51:14 -06:00
• 860237cee1
  
  a Spencer Killen 2023-08-19 16:51:10 -06:00
• 9208a53c71 Update Villager.gd ncusimano 2023-08-19 16:41:21 -06:00
• d5d7295602
  
  a Spencer Killen 2023-08-19 16:32:19 -06:00
• 9c90404a7f
  
  Merge remote-tracking branch 'origin/Player' Spencer Killen 2023-08-19 16:14:35 -06:00
• a8465d9962 Updates to Villager and Update to Main ncusimano 2023-08-19 16:08:58 -06:00
• e52f893517 Merge branch 'master' into Player ncusimano 2023-08-19 16:06:42 -06:00
• ec8e1d33c0 push premerge vengefulcartographer 2023-08-19 15:50:24 -06:00
• 4b21259716
  
  Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 Spencer Killen 2023-08-19 15:48:53 -06:00
• 5d7d4e90bc
  
  a stable Spencer Killen 2023-08-19 15:42:56 -06:00
• 55ae507421 Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 vengefulcartographer 2023-08-19 15:42:39 -06:00
• 4d5f69398e grape guy souns vengefulcartographer 2023-08-19 15:41:47 -06:00
• fb4f550890
  
  a Spencer Killen 2023-08-19 15:05:31 -06:00
• f79b1d84e1
  
  a Spencer Killen 2023-08-19 15:01:10 -06:00
• 16e6c9bb9d
  
  a Spencer Killen 2023-08-19 15:00:16 -06:00
• 2ae40bb7f6
  
  a Spencer Killen 2023-08-19 14:51:31 -06:00
• 6568462d0a
  
  Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 Spencer Killen 2023-08-19 14:50:42 -06:00
• 158fc450f8
  
  a Spencer Killen 2023-08-19 14:49:36 -06:00
• 7007ae3ffc Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 vengefulcartographer 2023-08-19 13:35:59 -06:00
• 1838dc5b7b level vengefulcartographer 2023-08-19 13:34:34 -06:00
• 5a9e2575bf
  
  a Spencer Killen 2023-08-19 12:27:23 -06:00
• bfe712c456
  
  Merge remote-tracking branch 'origin/Player' Spencer Killen 2023-08-19 11:59:59 -06:00
• 0adc2c92e2
  
  a Spencer Killen 2023-08-19 11:58:20 -06:00
• f6931cf64f Added Comments ncusimano 2023-08-19 11:58:11 -06:00
• 86b796b09f
  
  Add camera lock Spencer Killen 2023-08-19 11:51:06 -06:00
• 4f01afff2f
  
  a Spencer Killen 2023-08-19 11:32:30 -06:00
• cc12e8fc12
  
  Merge remote-tracking branch 'origin/Player' Spencer Killen 2023-08-19 11:32:26 -06:00
• 61cd28172c Camera Updates ncusimano 2023-08-19 11:30:53 -06:00
• aa25e5c772 Updates ncusimano 2023-08-19 11:17:09 -06:00
• 5ca8491046 Update! ncusimano 2023-08-19 11:08:45 -06:00
• b84692b120
  
  Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 Spencer Killen 2023-08-19 11:06:06 -06:00
• 2c3c20a503
  
  Environment Spencer Killen 2023-08-19 11:06:05 -06:00
• 10b8fa0cac decorations vengefulcartographer 2023-08-19 11:05:28 -06:00
• c96e96a9e9 Villager Actions ncusimano 2023-08-19 11:04:45 -06:00
• 8560d4ac4d
  
  Add screen shader Spencer Killen 2023-08-19 10:45:09 -06:00
• af90e9390a
  
  Add slime animation controller Spencer Killen 2023-08-19 02:19:56 -06:00
• 0c570d8959
  
  Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 Spencer Killen 2023-08-19 01:31:25 -06:00
• 048c233514
  
  grape man animation controller Spencer Killen 2023-08-19 01:31:24 -06:00
• 2da89d6d9c Merge branch 'master' into Player ncusimano 2023-08-18 23:19:55 -06:00
• 9a4f3e5b1a Merge branch 'master' into Player ncusimano 2023-08-18 23:16:18 -06:00
• f4d371afca Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 vengefulcartographer 2023-08-18 23:15:53 -06:00
• dd0fc32866 palm trees finished vengefulcartographer 2023-08-18 23:15:42 -06:00
• 0d0f255827 Working Camera ncusimano 2023-08-18 23:15:14 -06:00
• 253fca1070
  
  Fix island Spencer Killen 2023-08-18 23:10:22 -06:00
• f12869398d
  
  a Spencer Killen 2023-08-18 23:06:22 -06:00
• 487083f5b3
  
  move to blends Spencer Killen 2023-08-18 23:01:44 -06:00
• 6c553d93d6 Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 vengefulcartographer 2023-08-18 23:00:51 -06:00
• c17955da17 blend file vengefulcartographer 2023-08-18 23:00:39 -06:00
• cd410e0eb0
  
  Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23 Spencer Killen 2023-08-18 23:00:25 -06:00
• bf6a8bfb6c
  
  Grape man Spencer Killen 2023-08-18 23:00:23 -06:00
• 8a49d26294 island vengefulcartographer 2023-08-18 23:00:01 -06:00
• 5b8fb7b298 Camera Implementation ncusimano 2023-08-18 21:27:39 -06:00
• 7644862ffa Added a Default Player Scene ncusimano 2023-08-18 20:59:38 -06:00
• e36ef90462 test island vengefulcartographer 2023-08-18 20:53:00 -06:00
• f8060149b8
  
  Initial project Spencer Killen 2023-08-18 18:09:19 -06:00