Joshua Reason
|
9bdf434a10
|
Working Credits
|
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 |
MrJDunn
|
192badf2b8
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
MrJDunn
|
5ed80ec420
|
New main gameplay scene
|
3 years ago |
Jordan
|
cfc438190f
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
Jordan
|
368db42bc1
|
baby generation
|
3 years ago |
MrJDunn
|
2cb9453dcc
|
Added walls to yeetscene
|
3 years ago |
MrJDunn
|
8d99cba5f9
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
MrJDunn
|
d691820612
|
Added repetitive bgm. Use headphones at own peril
|
3 years ago |
Mack Branagan
|
b8b5f3dd8c
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
Mack Branagan
|
95764cee0f
|
Final Saturday Update
|
3 years ago |
MrJDunn
|
24157bf575
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
MrJDunn
|
f86d40e064
|
Yeet windup
|
3 years ago |
Mack Branagan
|
93330b3062
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
Mack Branagan
|
dfef8f9de8
|
Resized Play Area
|
3 years ago |
Ellie
|
ed09f131a8
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
Ellie
|
246ebd2ffa
|
Baby Toddle Animations added
|
3 years ago |
Joshua Reason
|
4202b63b39
|
Merge remote-tracking branch 'origin/develop' into feature/RoundManager
# Conflicts:
# Packages/manifest.json
# Packages/packages-lock.json
|
3 years ago |
Joshua Reason
|
40ba5d8790
|
Join Screen working
|
3 years ago |
MrJDunn
|
d87f91a6c6
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
MrJDunn
|
98c808e26a
|
Moved Yeet behaviour from PlayerInputController to YeetController
|
3 years ago |
Jordan
|
9347b96506
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
Jordan
|
404c53bfb1
|
unique random babies
|
3 years ago |
MrJDunn
|
f01a7ec67c
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
MrJDunn
|
69a6155b99
|
Yeet handle script added to allow things to be yeeted
|
3 years ago |
Mack Branagan
|
52f9141830
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
Mack Branagan
|
5043f287f4
|
More detailed environment models
|
3 years ago |
MrJDunn
|
d73d87c216
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
MrJDunn
|
e27b79be0a
|
Picking up random objects
|
3 years ago |
Joshua Reason
|
a4b55e6ad1
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
Joshua Reason
|
5a91cc28da
|
Added axis lock to player prefabs
|
3 years ago |
MrJDunn
|
5cbee3e4e9
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
# Conflicts:
# ProjectSettings/PackageManagerSettings.asset
|
3 years ago |
MrJDunn
|
0b44273f1f
|
Yeeting with Josh's player manager
|
3 years ago |
Jordan
|
ea96e66e00
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
Jordan
|
af34107512
|
no message
|
3 years ago |
Mack Branagan
|
3e0abe036d
|
Merge branch 'develop' of https://git.joshuareason.com/Jam/GGJ_2021 into develop
|
3 years ago |
Mack Branagan
|
63155c0810
|
More Scene Objects and Testing
|
3 years ago |