 Joshua Reason
|
e5d7cb6b6b
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
|
Joshua Reason
|
49d950df58
|
Did things
|
3 years ago |
 Mack Branagan
|
92589d2d97
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
|
Mack Branagan
|
978eee34b1
|
Finished Credits
|
3 years ago |
|
Joshua Reason
|
9338ac806f
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
|
Joshua Reason
|
96c96c9c27
|
Added hold to yeet
|
3 years ago |
 Jordan
|
80b34da3a7
|
destroy baby, spawn 2 new babies
|
3 years ago |
|
Joshua Reason
|
16f9d2a90b
|
Child is returned to Spawner On Yeet
|
3 years ago |
|
Joshua Reason
|
f0a6e0facf
|
Bug fixes
|
3 years ago |
|
Joshua Reason
|
8c1acae133
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
|
Joshua Reason
|
c193d05eca
|
Working On Credits
|
3 years ago |
 MrJDunn
|
42cc22dc88
|
SFX added
|
3 years ago |
|
MrJDunn
|
56783c31c8
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
|
MrJDunn
|
258a5adffa
|
Incorrect babies are now yeeted back to player who threw them
|
3 years ago |
|
Mack Branagan
|
55fcd8a11d
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
|
Mack Branagan
|
cffb69df5a
|
Added obstacles, Fixed Shadows
|
3 years ago |
|
MrJDunn
|
fd66c05224
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
|
Jordan
|
6db9d33043
|
jeff pls yeet
|
3 years ago |
|
Jordan
|
6325e8dfee
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
|
Jordan
|
2be31208a5
|
baby check working
|
3 years ago |
|
MrJDunn
|
17eb8370e6
|
Audio assetts imported
|
3 years ago |
|
Joshua Reason
|
efebdb7424
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
# Conflicts:
# Assets/Scenes/PlayerJoinScene.unity
|
3 years ago |
|
Joshua Reason
|
9bdf434a10
|
Working Credits
|
3 years ago |
|
Jordan
|
3b56e85e11
|
set up main game with parents new spawn locations
|
3 years ago |
|
Mack Branagan
|
4ff8cbd90a
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
|
Mack Branagan
|
e33c7fa85a
|
Menu and UI Scenes
|
3 years ago |
|
Jordan
|
39108a2208
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
|
Jordan
|
52985187c8
|
parent visual stuff
|
3 years ago |
|
MrJDunn
|
399c6716e7
|
Added lastHeld property to YeetHandle, which tracks last GameObject that held it
|
3 years ago |
|
MrJDunn
|
c0c9b65719
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
|
MrJDunn
|
696cb7eb1e
|
Player stops moving when yeeting
|
3 years ago |
|
MrJDunn
|
921e3d3cd9
|
Babies are now held overhead
|
3 years ago |
 Ellie
|
757d07bfd0
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
|
Ellie
|
20166e1477
|
SpeechBubble and package
|
3 years ago |
|
MrJDunn
|
e31502a5ea
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
|
MrJDunn
|
9d40d6577e
|
Added material field to line renderer
|
3 years ago |
|
Joshua Reason
|
f789e9279b
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
# Conflicts:
# Assets/Scenes/PlayerJoinScene.unity
|
3 years ago |
|
Joshua Reason
|
2f2ee1c1b4
|
Added ability to join if testing in the game scene
|
3 years ago |
|
MrJDunn
|
86192cd544
|
Merged in join scene
|
3 years ago |
|
Joshua Reason
|
7d4ea22a65
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
|
Joshua Reason
|
5c39b7d647
|
Merged animation with input
|
3 years ago |
|
Jordan
|
ab2f50a8b7
|
remove old baby parts, update parent behaviour
|
3 years ago |
|
Ellie
|
cc5e8697bc
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
|
Ellie
|
11aa395905
|
Player Animations
|
3 years ago |
|
MrJDunn
|
79263538aa
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
|
MrJDunn
|
639e7cd7cc
|
Babies stop wriggling when held now
|
3 years ago |
|
Ellie
|
3c3fbdcfe0
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
|
Ellie
|
a1bde0b2b7
|
Player Animations
|
3 years ago |
|
Joshua Reason
|
3329629f85
|
Merge branch 'feature/RoundManager' into develop
|
3 years ago |
|
Joshua Reason
|
22b4755b70
|
Working play controller
|
3 years ago |
