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
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
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
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: InfoProjekt/game#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: InfoProjekt/game#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: InfoProjekt/game#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
7725bea20c
art/sprite files /oldmanwalk.png gelöscht
...
deleted a kinda corrupted file
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-02-26 11:25:28 +00:00
15e2715207
art/sprite files /oldmanattack.png gelöscht
...
deleted kinda corrupted file
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-02-26 11:25:15 +00:00
SpagettiFisch
a9e99da219
fixed arrow oriantation
...
randomised skeletton move speed
changed Iframes to 250 ms
2024-02-26 12:21:45 +01:00
162542f198
Merge pull request 'Development' ( #3 ) from InfoProjekt/game:Development into main
...
Reviewed-on: #3
2024-02-26 07:50:43 +00:00
SpagettiFisch
2e36e11fa7
Merge branch 'InfoProjekt-Development1'
2024-02-26 08:47:47 +01:00
SpagettiFisch
15d39949b4
pull from main repository
2024-02-26 08:23:50 +01:00
85464d1637
Merge pull request 'Leben und Sterben hinzugefügt' ( #53 ) from Lyzzy/game:main into Development
...
Reviewed-on: InfoProjekt/game#53
2024-02-26 07:05:23 +00:00
69cc080ea9
Label und Oldman added
2024-02-25 10:14:07 +00:00
d731f4f63d
Dateien nach "/" hochladen
2024-02-25 10:11:37 +00:00
2d3161482f
Dateien nach "art/images" hochladen
2024-02-25 00:35:57 +00:00
f9ede25093
Dateien nach "art/images" hochladen
2024-02-25 00:35:29 +00:00
e80ce5ad0d
Dateien nach "/" hochladen
2024-02-25 00:26:31 +00:00
SpagettiFisch
1856b2b08a
Merge branch 'InfoProjekt-Development'
2024-02-23 10:46:14 +01:00
SpagettiFisch
4a88bb98d5
removed one empty line
2024-02-23 10:45:54 +01:00
b31a12b43b
Merge pull request 'Skeleton, Pfeile und Movement' ( #52 ) from Lyzzy/game:main into Development
...
Reviewed-on: InfoProjekt/game#52
Comments werden eh überbewertet ngl
2024-02-22 21:13:15 +00:00
ef9e7a6ef1
Merge pull request 'Dateien nach "/" hochladen' ( #3 ) from lyzzy-patch-1 into main
...
Reviewed-on: Lyzzy/game#3
2024-02-22 20:35:41 +00:00
4b12f09ebd
Dateien nach "/" hochladen
2024-02-22 20:34:45 +00:00
SpagettiFisch
ed6c91fa8f
test for gameobjects (level, rooms and scenes) created
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-02-22 10:59:02 +01:00
66afe87660
Merge pull request 'Development' ( #2 ) from InfoProjekt/game:Development into main
...
Reviewed-on: Lyzzy/game#2
2024-02-21 15:16:32 +00:00
1663a85955
Merge pull request 'Development' ( #37 ) from jaffa/game:Development into Development
...
Reviewed-on: InfoProjekt/game#37
2024-02-20 10:32:56 +00:00
c5cc9e6acc
Merge pull request 'Development' ( #1 ) from InfoProjekt/game:Development into main
...
Reviewed-on: Lyzzy/game#1
2024-02-17 13:23:41 +00:00
b55b145346
oldmanattack
2024-02-17 09:35:43 +00:00
13daa19bbb
Delete art/sprite files /a
2024-02-17 09:33:57 +00:00
5db6b8dac1
oldmanwalk
2024-02-17 09:33:38 +00:00
fc3a9afd2d
Add art/sprite files /a
2024-02-17 09:32:59 +00:00
b921da8a9a
Merge pull request 'First movement and game object managing/handling' ( #36 ) from Spafi/game:main into Development
...
Reviewed-on: InfoProjekt/game#36
2024-02-16 17:09:44 +00:00
SpagettiFisch
8f78002015
resorted the Scene class into a subclass of GameObjects
...
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>
2024-02-16 18:05:03 +01:00
SpagettiFisch
4e1674d6f3
added new classes to READ.ME
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-02-16 18:03:05 +01:00
SpagettiFisch
2e66145dcc
first movement (wasd) with character integrated
...
started a new class for scenes
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-02-16 17:34:37 +01:00
44973edb66
Merge pull request 'edited file structure' ( #35 ) from Spafi/game:main into Development
...
Reviewed-on: InfoProjekt/game#35
2024-02-15 09:16:17 +00:00
SpagettiFisch
ea6d64b087
edited file structure
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-02-15 09:50:02 +01:00
a9f5335edc
Merge pull request 'main' ( #34 ) from Spafi/game:main into Development
...
Reviewed-on: InfoProjekt/game#34
2024-02-14 08:02:18 +00:00
SpagettiFisch
9d63d09357
added a read.me
2024-02-14 09:00:30 +01:00
