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

Development #2

Merged
jaffa merged 114 commits from InfoProjekt/game:Development into Development 2024-03-11 00:39:31 +01:00
Conversation 0 Commits 114 Files changed 50 +1312 -335

114 commits

Author SHA1 Message Date
Jefferson Mousikas
cc24152e7f Upload files to "art/images/people" 2024-03-10 23:37:57 +00:00
Spafi
01d91e68c7 Merge pull request 'fied a bug were the game would crash during door creation' (#81) from Spafi/game:main into Development 
Reviewed-on: InfoProjekt/game#81
 2024-03-10 22:07:53 +00:00
SpagettiFisch
3883237f91 fied a bug were the game would crash during door creation 
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
 2024-03-10 23:07:38 +01:00
Spafi
8dd5ad2dc6 Merge pull request 'game icon and room update' (#80) from Spafi/game:main into Development 
Reviewed-on: InfoProjekt/game#80
 2024-03-10 22:03:06 +00:00
SpagettiFisch
7709fd52f7 Merge branch 'main' of https://git.spafi.eu/Spafi/game 2024-03-10 22:59:55 +01:00
SpagettiFisch
0f755996b6 added icon 
added door sprite
addedd startscreen

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
 2024-03-10 22:59:46 +01:00
SpagettiFisch
229435f682 added room constallations 
now with useless doors

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
 2024-03-10 22:58:58 +01:00
Spafi
67ba9a62a1 Merge pull request 'Development' (#7) from InfoProjekt/game:Development into main 
Reviewed-on: Spafi/game#7
 2024-03-10 21:29:19 +00:00
Jefferson Mousikas
73508253c4 Merge pull request 'storyline' (#79) from Lyzzy/game:main into Development 
Reviewed-on: InfoProjekt/game#79
 2024-03-10 18:02:21 +00:00
Lyzzy
f86f2e5dce added last part of tutorial 2024-03-10 18:42:40 +01:00
Lyzzy
fc3773150a - 2024-03-10 16:19:57 +01:00
Lyzzy
04547161a3 picture 2024-03-10 16:05:15 +01:00
Lyzzy
93bbb0eb84 Stoorryy 2024-03-10 16:05:09 +01:00
Lyzzy
4e976c3895 wuhu 2024-03-10 15:14:21 +01:00
Lyzzy
e540693def story yea yea 2024-03-10 15:06:44 +01:00
Lyzzy
248fc2a112 fix fix 2024-03-10 14:30:20 +01:00
Lyzzy
726c5ee2a2 storyline 2024-03-10 14:23:22 +01:00
Lyzzy
bb8ec349dd Merge branch 'main' of https://git.spafi.eu/Lyzzy/game 2024-03-10 13:04:29 +01:00
Lyzzy
4d40e44e2d starting to add some storyline, added Rat 2024-03-10 12:58:59 +01:00
Lyzzy
2a2d7b2765 Merge pull request 'Development' (#11) from InfoProjekt/game:Development into main 
Reviewed-on: Lyzzy/game#11
 2024-03-10 11:51:09 +00:00
Spafi
4a47efe94d Merge pull request 'changed NPC talk key to f and resolved merge conflicts' (#77) from Spafi/game:main into Development 
Reviewed-on: InfoProjekt/game#77
 2024-03-10 11:46:45 +00:00
SpagettiFisch
4ccc2dde11 Merge branch 'main' of https://git.spafi.eu/Spafi/game 
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
 2024-03-10 12:42:41 +01:00
SpagettiFisch
67a0937c4b changed NPC talking key to f 
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
 2024-03-10 12:42:09 +01:00
Lyzzy
01c3aeae4a Merge pull request 'Development' (#10) from InfoProjekt/game:Development into main 
Reviewed-on: Lyzzy/game#10
 2024-03-10 09:32:18 +00:00
Spafi
3232096d66 Merge pull request 'changed stuff' (#76) from Spafi/game:main into Development 
Reviewed-on: InfoProjekt/game#76
 2024-03-10 08:27:07 +00:00
Spafi
e8d81dfb11 Merge pull request 'InfoProjekt-Development3' (#6) from InfoProjekt-Development3 into main 
Reviewed-on: Spafi/game#6
 2024-03-10 08:26:52 +00:00
SpagettiFisch
0032f8b2e1 Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game into InfoProjekt-Development3 
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
 2024-03-10 09:23:59 +01:00
SpagettiFisch
b1b7b21aa2 changed stuff 
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
 2024-03-10 09:17:22 +01:00
Spafi
523b34615b Merge pull request 'Changed Book and fixed NPC convo' (#75) from Lyzzy/game:main into Development 
Reviewed-on: InfoProjekt/game#75
 2024-03-10 08:16:42 +00:00
Lyzzy
3fe22ff6ac updated convo, still weird tho 2024-03-09 21:27:54 +01:00
Lyzzy
9147971be8 added house 2024-03-09 20:14:40 +01:00
Lyzzy
52d3ec6e8d fixed that herberts attributes stay the same 2024-03-09 16:26:53 +01:00
Lyzzy
c17b65d2f3 added village somehow 2024-03-09 15:54:19 +01:00
Lyzzy
67f1e081fa added village 2024-03-09 14:00:00 +01:00
Lyzzy
2970e5cecd fixed Convo 2024-03-09 12:03:59 +01:00
Lyzzy
614654692f changed Book and Convo, renamed Speech 2024-03-09 11:11:28 +01:00
Lyzzy
1f38a04004 Merge pull request 'Development' (#9) from InfoProjekt/game:Development into main 
Reviewed-on: Lyzzy/game#9
 2024-03-09 09:06:05 +00:00
Spafi
d85c6ec22c Merge pull request 'fixed wall colision' (#74) from Spafi/game:main into Development 
Reviewed-on: InfoProjekt/game#74
 2024-03-08 07:36:57 +00:00
SpagettiFisch
bd5ff8b3fe fixed wall colision 
added object collision for mobs

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
 2024-03-08 08:36:13 +01:00
Spafi
091726b8ca Merge pull request 'attack now with left mouse click' (#73) from Spafi/game:main into Development 
Reviewed-on: InfoProjekt/game#73
 2024-03-07 20:05:46 +00:00
SpagettiFisch
31a9742a9c attack now with left mouse click 
emter conversaton now with f
no change to leave conversation

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
 2024-03-07 20:50:09 +01:00
Lyzzy
4d228bf6e0 test2 2024-03-07 16:44:38 +01:00
Lyzzy
956c25769c test 2024-03-07 16:41:11 +01:00
Lyzzy
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
Spafi
9396218a11 Merge pull request 'main' (#72) from Spafi/game:main into Development 
Reviewed-on: InfoProjekt/game#72
 2024-03-07 14:27:03 +00:00
Spafi
321dac7cca wrong location 
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
 2024-03-07 14:26:57 +00:00
Spafi
abfa24ced8 wrong location 
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
 2024-03-07 14:26:52 +00:00
Spafi
11c7a9037b wrong location 
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
 2024-03-07 14:26:45 +00:00
Spafi
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
Lyzzy
73165bd33e speech and fireplace 2024-03-07 12:52:41 +00:00
Lyzzy
b368fe4665 zombie speech and fireplace 2024-03-07 12:52:17 +00:00
Lyzzy
af5204857b some fixes 
forgot what i did
 2024-03-07 09:43:33 +00:00
Spafi
1d03d60ac2 Merge pull request 'new river sprite file added' (#67) from Spafi/game:main into Development 
Reviewed-on: InfoProjekt/game#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
Jefferson Mousikas
a41ee41fba Merge pull request 'main' (#66) from jaffa/game:main into Development 
Reviewed-on: InfoProjekt/game#66
 2024-03-07 08:24:16 +00:00
Jefferson Mousikas
47c93f61dc Upload files to "art/sprite files" 2024-03-07 08:18:47 +00:00
Jefferson Mousikas
1fd852e31e Merge pull request 'Development' (#1) from InfoProjekt/game:Development into main 
Reviewed-on: #1
 2024-03-07 08:13:31 +00:00
Spafi
f21d980352 Merge pull request 'doubled image size' (#65) from Spafi/game:main into Development 
Reviewed-on: InfoProjekt/game#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
Spafi
b3c7d87926 Merge pull request 'Added Label class' (#64) from Lyzzy/game:main into Development 
Reviewed-on: InfoProjekt/game#64
 2024-03-07 06:45:57 +00:00
Lyzzy
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
Lyzzy
96c0a691b7 empty image cuz im stupid 2024-03-06 17:36:57 +00:00
Lyzzy
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
Lyzzy
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
Spafi
55b50531f9 Merge pull request 'wind slash spell' (#63) from Spafi/game:main into Development 
Reviewed-on: InfoProjekt/game#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
Spafi
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: InfoProjekt/game#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
Spafi
96b15fd425 Merge pull request 'manual merge of lyzzys updates into Development' (#60) from Spafi/game:main into Development 
Reviewed-on: InfoProjekt/game#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
Lyzzy
4cfb4b92f0 Dateien nach "/" hochladen 2024-03-05 15:48:06 +00:00
Spafi
44793f22a5 Merge pull request 'Collisions fixed' (#58) from Spafi/game:main into Development 
Reviewed-on: InfoProjekt/game#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
Spafi
6fce7e0fd2 Merge pull request 'Development' (#57) from Development into main 
Reviewed-on: InfoProjekt/game#57
 2024-03-03 12:28:45 +00:00
Spafi
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
Lyzzy
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
Lyzzy
f6827b5f05 revert 8b2dab980b 
revert Schaden Gegner, Buch, Angriff
 2024-03-01 21:50:39 +00:00
Lyzzy
5625db18c7 Buch and Feuer added 
changable
 2024-03-01 21:47:51 +00:00
Lyzzy
8b2dab980b Schaden Gegner, Buch, Angriff 2024-03-01 21:46:15 +00:00
Lyzzy
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
Spafi
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
Lyzzy
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
Spafi
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
Spafi
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
Spafi
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
Spafi
162542f198 Merge pull request 'Development' (#3) from InfoProjekt/game:Development into main 
Reviewed-on: Spafi/game#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
Spafi
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
Lyzzy
69cc080ea9 Label und Oldman added 2024-02-25 10:14:07 +00:00
Lyzzy
d731f4f63d Dateien nach "/" hochladen 2024-02-25 10:11:37 +00:00
Lyzzy
2d3161482f Dateien nach "art/images" hochladen 2024-02-25 00:35:57 +00:00
Lyzzy
f9ede25093 Dateien nach "art/images" hochladen 2024-02-25 00:35:29 +00:00
Lyzzy
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
Spafi
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
Lyzzy
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
Lyzzy
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
Lyzzy
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
Spafi
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
Lyzzy
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