|
7d3778486a
|
Merging Stuff Together and Fixing Stuff Brocken From Merge
|
2023-04-09 17:57:37 +02: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 |
|
|
fd552541a7
|
Bunny AI Done using Nav Agent
|
2023-04-09 16:39:45 +02:00 |
|
AXVIII3
|
9d878116f0
|
Music system
|
2023-04-09 17:47:11 +05:30 |
|
AXVIII3
|
03192a25bf
|
Main Menu, Settings Menu and Save system
|
2023-04-09 17:30:52 +05:30 |
|
|
50f435b5f7
|
Updating Testscene
- Make Scaling Right
- Fix Players Collision Box
|
2023-04-08 23:00:44 +02:00 |
|
|
e4e4d7e30b
|
trying to make it merge
|
2023-04-08 22:45:08 +02:00 |
|
|
b318e7d65a
|
Updating Scene
|
2023-04-08 22:34:07 +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 |
|
|
fa686fb55a
|
Merge Stuff Together, Setuped Cave in PlayerMovement Scene
|
2023-04-08 02:17:24 +02:00 |
|
|
f6eb10f644
|
Seting Up Theme so that It can be Used
|
2023-04-07 20:10:23 +02:00 |
|
|
dfb751f37f
|
Set Resize Mode
|
2023-04-07 19:58:16 +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 |
|
|
f4e9656ad5
|
Setup
|
2023-04-06 22:33:13 +02:00 |
|