Development #6

Merged

Lyzzy merged 12 commits from InfoProjekt/game:Development into main 2024-03-06 16:44:25 +01:00

Conversation 0 Commits 12 Files changed 6 +187 -70

Lyzzy commented 2024-03-06 16:44:17 +01:00

Owner

Copy link

No description provided.

Lyzzy added 12 commits 2024-03-06 16:44:18 +01:00

Merge pull request 'mobs can die, main can attack, book object added to main, npc object added' (#56) from Lyzzy/game:main into Development ... cb9a7e6ff5

Reviewed-on: InfoProjekt/game#56

fixed bug which stopped movement if colliding with projectiles ... d86f8c360b

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>

Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game ... 0cd9444222

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>

optimized collision with npcs and mobs ... 3ad2ad6478

added wall collision
enabled hitboxes for object and wall highlighting

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>

Merge pull request 'Collisions fixed' (#58) from Spafi/game:main into Development ... 44793f22a5

Reviewed-on: InfoProjekt/game#58

Merge branch 'main' of https://git.spafi.eu/Spafi/game; branch 'main' of https://git.spafi.eu/Lyzzy/game ef3a617e4d

Merge pull request 'manual merge of lyzzys updates into Development' (#60) from Spafi/game:main into Development ... 96b15fd425

Reviewed-on: InfoProjekt/game#60

updated the button class -> can now take any arguments for the onClick Function ... 953edca694

changed all buttons according to this

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>

Merge pull request 'updated the button class -> can now take any arguments for the onClick Function' (#62) from Spafi/game:main into Development ... 0564d778a1

Reviewed-on: InfoProjekt/game#62

added a new missile ... 501e84181f

new to character: wind slash attack
added projectile lifetime (in frames, maybe change to 5*fps later)

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>

added new icons for spell selection inside the book ... c9a98fb94c

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>

Merge pull request 'wind slash spell' (#63) from Spafi/game:main into Development ... 55b50531f9

Reviewed-on: InfoProjekt/game#63

Lyzzy merged commit e2ec301fce into main 2024-03-06 16:44:25 +01:00

Lyzzy referenced this pull request from a commit 2024-03-06 16:44:25 +01:00

Merge pull request 'Development' (#6) from InfoProjekt/game:Development into main

Lyzzy referenced this pull request from a commit 2024-03-10 10:32:19 +01:00

Merge pull request 'InfoProjekt-Development3' (#6) from InfoProjekt-Development3 into main

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Lyzzy/game#6

No description provided.