Merge develop into main #1

Merged

Sadra3st merged 23 commits from develop into main 2026-05-21 20:43:16 +00:00

Conversation 0 Commits 23 Files Changed 51

+3356 -301

mohammadreza commented 2026-05-17 16:50:09 +00:00

Owner

Copy Link

Copy Source

No description provided.

mohammadreza added 22 commits 2026-05-17 16:50:10 +00:00

add Colors.java b25cbc6ede

add Dragon.java Enemy.java Goblin.java Skeleton.java Vampire.java e3d7d1d554

add Assassin.java Wizard.java Knight.java Player.java 011526da36

add AssassinArmor.java DragonArmor.java GoblinArmor.java SkeletonArmor.java VampireArmor.java WizardArmor.java 32f93927c8

debug Entity.java 43421d5f25

debug Item.java 6a68d82f7a

debug Main.java 07fd0bad33

add abilities 3ca0ce99db

debug Consumable.java 1f187ff4d8

implement Flask.java (renamed to HealFlask.java) 3cca5e91a8

implement Location.java 74ae9dfc5b

implement Sword.java fc67dbb4f9

implement Weapon.java e2f6bf8e27

add GameLoop.java 4bd9823445

add combat 42a1a97cab

add ManaFlask.java 59c7671ca8

add Dagger.java ab0e9cb3a4

add all managers 2d2f969fc9

add BurnEffect.java FreezeEffect.java PoisonEffect.java StatusEffect.java e6dec6d0e8

Update README.md 6a1802c064

Upload files to "/" 573aa369fc

Update README.md 63a6c1bbbc

mohammadreza added 1 commit 2026-05-17 18:22:58 +00:00

Update README.md 56c1cb9d34

Sadra3st merged commit 9e6eb971ad into main 2026-05-21 20:43:16 +00:00

Sadra3st referenced this issue from a commit 2026-05-21 20:43:16 +00:00

Merge pull request 'Merge develop into main' (#1) from develop into main

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No labels

Milestone

No items

No Milestone

Assignees

Clear assignees

Sadra3st (Sadra Seyedtabaei) mohammadreza

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: mohammadreza/HW-04-JAVA-KNIGHT#1