a1a7e5f9d3
Merge pull request 'Getting Stuff Together' ( #42 ) from dev-base into stable
...
Reviewed-on: #42
2023-04-09 17:21:28 +00:00
a82210061e
Cleaning up Merge
2023-04-09 17:22:06 +02:00
8b9bf7e52d
Merge branch 'dev-menu' into dev-base
...
Fuck you AXVIII3 You changed files your not supposed to change your in branch, ending with a fucking hell of a merge commit
2023-04-09 17:10:55 +02:00
AXVIII3
03192a25bf
Main Menu, Settings Menu and Save system
2023-04-09 17:30:52 +05:30
3adb32dc4a
Merge branch 'dev-base'
...
Conflicts:
Assets/Sprites/EvilBunny/bunny_down.png
Assets/Sprites/EvilBunny/bunny_down.png.import
Assets/Sprites/EvilBunny/bunny_left.png
Assets/Sprites/EvilBunny/bunny_left.png.import
Assets/Sprites/EvilBunny/bunny_righ.png
Assets/Sprites/EvilBunny/bunny_up.png
Assets/Sprites/EvilBunny/bunny_up.png.import
Assets/Sprites/bunny_down.png
Assets/Sprites/bunny_left.png
Assets/Sprites/bunny_left.png.import
Assets/Sprites/bunny_righ.png
Assets/Sprites/bunny_righ.png.import
Assets/Sprites/bunny_up.png
Assets/Sprites/bunny_up.png.import
Assets/Sprites/crucefix.png.import
2023-04-08 22:51:17 +02:00
4eb022a49c
Merge branch 'dev-art'
2023-04-08 22:27:38 +02:00
f5391051d6
Update Jesus -> needs implementation in other branches
2023-04-08 21:51:47 +02:00
2a814abe05
Basic Movement and Map Generation ( #22 )
...
Basic Movement and Map Generation are Done
also got some art in stock, missing a lot still though.
nothing to fancy for now
Co-authored-by: Snoweuph, AXVIII3
Reviewed-on: #22
2023-04-08 00:41:09 +00:00
AXVIII3
080401b9a3
Final Player Movement \w Animations
2023-04-07 22:56:18 +05:30
