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
b318e7d65a
Updating Scene
2023-04-08 22:34:07 +02:00
4eb022a49c
Merge branch 'dev-art'
2023-04-08 22:27:38 +02:00
edb4265367
Implementing WeaponSystem and Entity System to go along with (so that weapons can be tested)
2023-04-08 17:00:54 +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
fa686fb55a
Merge Stuff Together, Setuped Cave in PlayerMovement Scene
2023-04-08 02:17:24 +02:00
9ea57c4566
Merge remote-tracking branch 'refs/remotes/origin/dev-player-movement'
2023-04-08 01:54:37 +02:00
579faa06df
Implementing Tileset for Map Generation
2023-04-08 01:52:42 +02:00
AXVIII3
080401b9a3
Final Player Movement \w Animations
2023-04-07 22:56:18 +05:30
537589e30b
Putting Generated Map into PlayerMovement Scene For testing
2023-04-07 16:22:55 +02:00
5a625f1792
Merge remote-tracking branch 'refs/remotes/origin/dev-base'
...
Conflicts:
project.godot
2023-04-07 16:18:21 +02:00
ef60fdd59f
Fixing Strucuter and Cleaning Up
2023-04-07 16:11:07 +02:00
AXVIII3
4b2d83a4c5
Basic Movement
2023-04-07 19:28:30 +05:30
b49f0378da
- Adding Cave Generation
...
- Placeholder Art
- Setting Physics Layer
2023-04-07 15:33:54 +02:00
5825a5fb2e
Set Import Mode and Create a Basic Test Scene for Compiling
2023-04-07 10:54:56 +02:00
bf97ae2d0e
Adding Folder Structure
2023-04-07 10:44:34 +02:00