 Joshua Reason
|
671815fa44
|
Merge branch 'main' of https://git.joshuareason.com/Jam/GGJ_2022
|
2 years ago |
|
Joshua Reason
|
3cebe38265
|
Ported Level 1
|
2 years ago |
 Jeff
|
6e478c297b
|
Made ui buttons transperent
|
2 years ago |
|
Jeff
|
5788775733
|
Merge branch 'main' of http://git.joshuareason.com/Jam/GGJ_2022 into main
|
2 years ago |
|
Jeff
|
15b07d201c
|
Added clouds to menu
|
2 years ago |
|
Joshua Reason
|
8326b80e09
|
Changed animation speed of spike
|
2 years ago |
|
Joshua Reason
|
ad156071c6
|
Added collider to death sprites
|
2 years ago |
 Tau-er\Bobbster
|
628c312f47
|
Merge branch 'main' of http://git.joshuareason.com/Jam/GGJ_2022 into main
|
2 years ago |
|
Tau-er\Bobbster
|
190effff70
|
Merge branch 'main' of http://git.joshuareason.com/Jam/GGJ_2022 into main
|
2 years ago |
|
Jeff
|
e8239d1edd
|
Merge branch 'jeff' into main
# Conflicts:
# ProjectSettings/EditorBuildSettings.asset
|
2 years ago |
|
Tau-er\Bobbster
|
8f6a8151f9
|
Tile palettes cleaned up
|
2 years ago |
|
Jeff
|
76244e2909
|
Level UI
|
2 years ago |
|
Joshua Reason
|
934add0a80
|
Removed Grid from being a a prefab
|
2 years ago |
|
Joshua Reason
|
da76e3019a
|
Template Level
|
2 years ago |
|
Joshua Reason
|
69ae9f37cd
|
Merge branch 'main' of https://git.joshuareason.com/Jam/GGJ_2022
# Conflicts:
# Assets/Variables/Runtime/freezePlayer.asset
|
2 years ago |
|
Joshua Reason
|
2e30d42332
|
Start of Template Level
|
2 years ago |
|
Tau-er\Bobbster
|
141f1dce29
|
Merge branch 'main' of http://git.joshuareason.com/Jam/GGJ_2022 into main
|
2 years ago |
|
Tau-er\Bobbster
|
9a307fcc13
|
Parallax finalized
|
2 years ago |
|
Jeff
|
af77004618
|
Merge branch 'main' into jeff
|
2 years ago |
|
Jeff
|
d5538d9978
|
Merge branch 'main' of http://git.joshuareason.com/Jam/GGJ_2022 into main
# Conflicts:
# Assets/Scenes/Level 2.unity
|
2 years ago |
|
Jeff
|
570cbef4ec
|
Made a scene for testing moving paltforms
|
2 years ago |
|
Tau-er\Bobbster
|
90222b70ce
|
Paralllaaaaax
|
2 years ago |
|
Jeff
|
4ab8037bb9
|
Improved camera follower y tracking
|
2 years ago |
|
Jeff
|
f1e07f2128
|
Platform now moves player
|
2 years ago |
|
Tau-er\Bobbster
|
8609cb3166
|
Sky backdrop started...
|
2 years ago |
|
Jeff
|
a5a31d0962
|
Moving platforms fixed
Level 2 ground fixed
|
2 years ago |
|
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 |
