jaffa/game
1
0
Fork 0
forked from InfoProjekt/game
Code Pull requests Activity

Development #1

Merged
jaffa merged 88 commits from InfoProjekt/game:Development into main 2024-03-07 09:13:31 +01:00
Conversation 0 Commits 88 Files changed 99 +1084
jaffa commented 2024-03-07 09:12:47 +01:00
Owner
Copy link
No description provided.
jaffa added 88 commits 2024-03-07 09:12:47 +01:00 
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
Reviewed-on: InfoProjekt/game#21
Gegner und NPCs hinzugefügt
"Waffen", bzw. ANgriffsarten hinzugefügt

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
Reviewed-on: InfoProjekt/game#24
Signed-off-by: Lyzzy <lyzzbackup@gmail.com>
Reviewed-on: InfoProjekt/game#26
Signed-off-by: Lyzzy <lyzzbackup@gmail.com>
Reviewed-on: InfoProjekt/game#27
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
Die ersten Texturen für Mauern hochladen.

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
Den Rest davon noch mit hochladen

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
Erstes Tileset mit mehreren Ansätzen erstellt. Burgwand, Ziegelsteinwände, verschiedene Erd- und Grasvarianten.

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
Reviewed-on: InfoProjekt/game#30
first 60 fps purple screen created, size depends on config
Reviewed-on: Spafi/game#1
also some buttons added to be completed
button class initalized

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
Reviewed-on: InfoProjekt/game#32
added the textbox for the buttons (not just any blank color)
added function for exiting the game
assigned all of them a easier and more understandable key phrase or key word
added the key word dictionary in classes.py

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
Reviewed-on: InfoProjekt/game#34
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
Reviewed-on: InfoProjekt/game#35
started a new class for scenes

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
added the class Room to GameObjects
added a very simple start screen
WIP: disabled option button until option function is implemented

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
Reviewed-on: InfoProjekt/game#36
Reviewed-on: Lyzzy/game#1
Reviewed-on: InfoProjekt/game#37
Reviewed-on: Lyzzy/game#2
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
Reviewed-on: Lyzzy/game#3
Reviewed-on: InfoProjekt/game#52
Comments werden eh überbewertet ngl
Reviewed-on: InfoProjekt/game#53
Reviewed-on: Spafi/game#3
randomised skeletton move speed
changed Iframes to 250 ms
deleted kinda corrupted file

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
deleted a kinda corrupted file

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
Reviewed-on: InfoProjekt/game#54
Reviewed-on: Lyzzy/game#4
added character collisions (not great yet tho)
some simple background elements added and testet WIP
Reviewed-on: InfoProjekt/game#55
Reviewed-on: Lyzzy/game#5
changable
revert Schaden Gegner, Buch, Angriff
Dem Gegner kann jetzt durch Main Angriff Schaden zugefügt werden und er kann sterben
Das Buch kann durch Drücken von e geöffnet werden, das Spiel hält an
Der Main kann (nachdem mit NPC geredet) Feuerbälle mit f schießen (Schussrichtung adden!!)
Ein NPC wurde hinzugefügt, der steht. Main redet automatisch mit ihm wenn main reinläuft. Durch Leertaste wird Unterhaltung beendet.
Reviewed-on: InfoProjekt/game#56
Reviewed-on: InfoProjekt/game#57
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
added wall collision
enabled hitboxes for object and wall highlighting

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
Reviewed-on: InfoProjekt/game#58
Reviewed-on: InfoProjekt/game#60
changed all buttons according to this

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
Reviewed-on: InfoProjekt/game#62
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>
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
Reviewed-on: InfoProjekt/game#63
Reviewed-on: Lyzzy/game#6
added Label class in classes and added text to book, changed wind attack a bit but idk if good
Label class in classes, added text to book, changed wind spell a bit but dunno if really good
Reviewed-on: InfoProjekt/game#64
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
Reviewed-on: InfoProjekt/game#65
jaffa merged commit 1fd852e31e into main 2024-03-07 09:13:31 +01:00
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
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: jaffa/game#1
No description provided.
Delete branch "InfoProjekt/game:Development"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?