569b3394a0
Merge pull request 'Development' ( #8 ) from InfoProjekt/game:Development into main
...
Reviewed-on: Lyzzy/game#8
2024-03-07 15:35:48 +00:00
9396218a11
Merge pull request 'main' ( #72 ) from Spafi/game:main into Development
...
Reviewed-on: #72
2024-03-07 14:27:03 +00:00
321dac7cca
wrong location
...
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-03-07 14:26:57 +00:00
abfa24ced8
wrong location
...
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-03-07 14:26:52 +00:00
11c7a9037b
wrong location
...
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-03-07 14:26:45 +00:00
9c36e8d570
wrong location
...
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-03-07 14:26:36 +00:00
SpagettiFisch
a68bba70bb
image files changed
...
new mob sprites
relocated all image files
disabled collision between player and npcs and mobs
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-07 14:57:18 +01:00
SpagettiFisch
b7fb7e1f1e
Merge branch 'main' of https://git.spafi.eu/Lyzzy/game
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-07 13:56:24 +01:00
SpagettiFisch
5010609378
relocated image files
...
changed room generation
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-07 13:55:01 +01:00
73165bd33e
speech and fireplace
2024-03-07 12:52:41 +00:00
b368fe4665
zombie speech and fireplace
2024-03-07 12:52:17 +00:00
af5204857b
some fixes
...
forgot what i did
2024-03-07 09:43:33 +00:00
1d03d60ac2
Merge pull request 'new river sprite file added' ( #67 ) from Spafi/game:main into Development
...
Reviewed-on: #67
2024-03-07 08:51:52 +00:00
SpagettiFisch
c3c44bbc71
new river sprite file added
...
new idea lol
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-07 09:50:10 +01:00
a41ee41fba
Merge pull request 'main' ( #66 ) from jaffa/game:main into Development
...
Reviewed-on: #66
2024-03-07 08:24:16 +00:00
47c93f61dc
Upload files to "art/sprite files"
2024-03-07 08:18:47 +00:00
1fd852e31e
Merge pull request 'Development' ( #1 ) from InfoProjekt/game:Development into main
...
Reviewed-on: jaffa/game#1
2024-03-07 08:13:31 +00:00
f21d980352
Merge pull request 'doubled image size' ( #65 ) from Spafi/game:main into Development
...
Reviewed-on: #65
2024-03-07 06:51:08 +00:00
SpagettiFisch
1b6ccb17b0
Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game
2024-03-07 07:49:49 +01:00
SpagettiFisch
6034a8382f
changed image size
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-07 07:49:16 +01:00
SpagettiFisch
746982641a
Merge https://git.spafi.eu/InfoProjekt/game
2024-03-07 07:46:26 +01:00
b3c7d87926
Merge pull request 'Added Label class' ( #64 ) from Lyzzy/game:main into Development
...
Reviewed-on: #64
2024-03-07 06:45:57 +00:00
41f8b76b90
added Label class
...
Label class in classes, added text to book, changed wind spell a bit but dunno if really good
2024-03-06 17:40:02 +00:00
96c0a691b7
empty image cuz im stupid
2024-03-06 17:36:57 +00:00
25f04f994f
added Label class
...
added Label class in classes and added text to book, changed wind attack a bit but idk if good
2024-03-06 17:35:27 +00:00
e2ec301fce
Merge pull request 'Development' ( #6 ) from InfoProjekt/game:Development into main
...
Reviewed-on: Lyzzy/game#6
2024-03-06 15:44:25 +00:00
55b50531f9
Merge pull request 'wind slash spell' ( #63 ) from Spafi/game:main into Development
...
Reviewed-on: #63
2024-03-06 14:29:34 +00:00
SpagettiFisch
c9a98fb94c
added new icons for spell selection inside the book
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-06 14:27:06 +01:00
SpagettiFisch
501e84181f
added a new missile
...
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>
2024-03-06 14:26:32 +01:00
0564d778a1
Merge pull request 'updated the button class -> can now take any arguments for the onClick Function' ( #62 ) from Spafi/game:main into Development
...
Reviewed-on: #62
2024-03-06 11:12:00 +00:00
SpagettiFisch
953edca694
updated the button class -> can now take any arguments for the onClick Function
...
changed all buttons according to this
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-06 12:10:59 +01:00
96b15fd425
Merge pull request 'manual merge of lyzzys updates into Development' ( #60 ) from Spafi/game:main into Development
...
Reviewed-on: #60
2024-03-06 06:45:56 +00:00
SpagettiFisch
ef3a617e4d
Merge branch 'main' of https://git.spafi.eu/Spafi/game ; branch 'main' of https://git.spafi.eu/Lyzzy/game
2024-03-06 07:42:45 +01:00
4cfb4b92f0
Dateien nach "/" hochladen
2024-03-05 15:48:06 +00:00
44793f22a5
Merge pull request 'Collisions fixed' ( #58 ) from Spafi/game:main into Development
...
Reviewed-on: #58
2024-03-04 16:18:33 +00:00
SpagettiFisch
3ad2ad6478
optimized collision with npcs and mobs
...
added wall collision
enabled hitboxes for object and wall highlighting
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-04 17:15:19 +01:00
SpagettiFisch
0cd9444222
Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-03 13:36:15 +01:00
SpagettiFisch
d86f8c360b
fixed bug which stopped movement if colliding with projectiles
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-03 13:31:01 +01:00
6fce7e0fd2
Merge pull request 'Development' ( #57 ) from Development into main
...
Reviewed-on: #57
2024-03-03 12:28:45 +00:00
cb9a7e6ff5
Merge pull request 'mobs can die, main can attack, book object added to main, npc object added' ( #56 ) from Lyzzy/game:main into Development
...
Reviewed-on: #56
2024-03-03 12:21:58 +00:00
b29a279fb1
Gegner Schaden, Buch, Main Angriff, NPC
...
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.
2024-03-01 21:56:14 +00:00
f6827b5f05
revert 8b2dab980b
...
revert Schaden Gegner, Buch, Angriff
2024-03-01 21:50:39 +00:00
5625db18c7
Buch and Feuer added
...
changable
2024-03-01 21:47:51 +00:00
8b2dab980b
Schaden Gegner, Buch, Angriff
2024-03-01 21:46:15 +00:00
2ef0948274
Merge pull request 'Development' ( #5 ) from InfoProjekt/game:Development into main
...
Reviewed-on: Lyzzy/game#5
2024-03-01 11:25:20 +00:00
6ed85baed0
Merge pull request 'added some missing spaces lol' ( #55 ) from Spafi/game:main into Development
...
Reviewed-on: #55
2024-02-29 13:38:47 +00:00
SpagettiFisch
218eb2ea7e
added some missing spaces lol
...
added character collisions (not great yet tho)
some simple background elements added and testet WIP
2024-02-29 14:25:23 +01:00
9c36772aa7
Merge pull request 'Development' ( #4 ) from InfoProjekt/game:Development into main
...
Reviewed-on: Lyzzy/game#4
2024-02-29 08:09:19 +00:00
886059527b
Merge pull request 'main' ( #54 ) from Spafi/game:main into Development
...
Reviewed-on: #54
2024-02-26 11:29:29 +00:00
SpagettiFisch
c741c8199a
Merge branch 'main' of https://git.spafi.eu/Spafi/game
2024-02-26 12:25:34 +01:00
