 Jeff
|
5fbd8247aa
|
Merge branch 'main' into jeff
# Conflicts:
# Assets/Scenes/Level 2.unity
|
2 years ago |
|
Jeff
|
48194276a7
|
Platform mover
|
2 years ago |
 Tau-er\Bobbster
|
ab4aa816a7
|
Merge branch 'main' of http://git.joshuareason.com/Jam/GGJ_2022 into main
# Conflicts:
# Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat
# Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat.meta
|
2 years ago |
|
Tau-er\Bobbster
|
87cc8eff56
|
Palette upgrades
|
2 years ago |
 Joshua Reason
|
77db7eb713
|
Merge branch 'main' of https://git.joshuareason.com/Jam/GGJ_2022
# Conflicts:
# Assets/Art Assets/Textures/Chars/Moose Angel.meta
# Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_0.png.meta
# Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_1.png.meta
# Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_2.png.meta
# Assets/Art Assets/Textures/Chars/Moose Angel/monster_0.png.meta
# Assets/Art Assets/Textures/Chars/Moose Angel/monster_1.png.meta
# Assets/Art Assets/Textures/Chars/Moose Angel/monster_2.png.meta
# Assets/Art Assets/Textures/Environ/backdrop/clouds1.png.meta
# Assets/Art Assets/Textures/Environ/backdrop/clouds2.png.meta
# Assets/Art Assets/Textures/Environ/backdrop/clouds3.png.meta
# Assets/Art Assets/Tiles/Environment/DarkCastle/Spike.asset
# Assets/Art Assets/Tiles/Environment/DarkCastle/Spike.asset.meta
# Assets/Art Assets/Tiles/Environment/Main Palette.prefab
# Assets/Scenes/Level 1.unity
# Assets/Scenes/WalljumpTest.unity
|
2 years ago |
|
Joshua Reason
|
30652155cb
|
Did some things
|
2 years ago |
|
Jeff
|
b66acc370e
|
Merge branch 'main' of http://git.joshuareason.com/Jam/GGJ_2022 into main
# Conflicts:
# Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_1.png.meta
# Assets/Art Assets/Textures/Chars/Moose Angel/face_mask_2.png.meta
# Assets/Art Assets/Textures/Chars/Moose Angel/monster_0.png.meta
# Assets/Art Assets/Textures/Chars/Moose Angel/monster_1.png.meta
# Assets/Art Assets/Textures/Chars/Moose Angel/monster_2.png.meta
# Assets/Art Assets/Textures/Environ/backdrop/clouds1.png.meta
# Assets/Art Assets/Textures/Environ/backdrop/clouds2.png.meta
# Assets/Art Assets/Textures/Environ/backdrop/clouds3.png.meta
|
2 years ago |
|
Jeff
|
49dbe8cf32
|
Added camera follower
|
2 years ago |
|
Tau-er\Bobbster
|
a14ecd0ceb
|
Merge branch 'main' of http://git.joshuareason.com/Jam/GGJ_2022 into main
# Conflicts:
# Assets/Scenes/Level 1.unity
|
2 years ago |
|
Tau-er\Bobbster
|
3518c0a276
|
Assets reorganized for Cristian's sanity
Level 2 exists... (needs a moving platform at beginning)
|
2 years ago |
|
Jeff
|
f77c15cdd0
|
Merge branch 'jeff' into main
# Conflicts:
# Assets/Scenes/Level 1.unity
|
2 years ago |
|
Jeff
|
6dbb8bfaab
|
Wall jump feeeling nice
|
2 years ago |
|
Tau-er\Bobbster
|
e2e6bb0267
|
Improved textures
|
2 years ago |
|
Joshua Reason
|
771c56adb5
|
Actually commiting the level
|
2 years ago |
|
Joshua Reason
|
c98c1bc5c6
|
Added intro and Outro Animations
|
2 years ago |
|
Jeff
|
f5fd3985d1
|
Basic wall jump
|
2 years ago |
|
Joshua Reason
|
bf57f15e1c
|
Added ability to freeze player input
|
2 years ago |
|
Joshua Reason
|
3e9d09d150
|
Merge branch 'main' of https://git.joshuareason.com/Jam/GGJ_2022
|
2 years ago |
|
Joshua Reason
|
6b53f8fc72
|
Added Animations
|
2 years ago |
|
Tau-er\Bobbster
|
20f31eb929
|
Merge branch 'main' of http://git.joshuareason.com/Jam/GGJ_2022 into main
|
2 years ago |
|
Tau-er\Bobbster
|
e0a0eb40de
|
add backdrop assets
|
2 years ago |
|
Joshua Reason
|
48a8ff75a0
|
Merge branch 'main' of https://git.joshuareason.com/Jam/GGJ_2022
|
2 years ago |
|
Joshua Reason
|
7c98457df8
|
Made moving Character
|
2 years ago |
|
Tau-er\Bobbster
|
b45917f575
|
Tilemaps/sprites sliced.
|
2 years ago |
|
Tau-er\Bobbster
|
aefe2b1a8e
|
Merge branch 'main' of http://git.joshuareason.com/Jam/GGJ_2022 into main
# Conflicts:
# Assets/Art Assets/Textures/Chars/char_dude_sheet.png.meta
|
2 years ago |
|
Joshua Reason
|
500253b9c0
|
Work on darkness + added 2d Sprite packages
|
2 years ago |
|
Tau-er\Bobbster
|
8ffefe3d67
|
First art asset dump!
|
2 years ago |
|
Tau-er\Bobbster
|
8c7b931911
|
castle tiles added
|
2 years ago |
|
Joshua Reason
|
1bbaa6ded2
|
Added input system
|
2 years ago |
|
Joshua Reason
|
9e22083a9d
|
Added at bunch or packages for 2d stuff
|
2 years ago |
|
Joshua Reason
|
542ebda76a
|
Initial Setup
|
2 years ago |
