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

Commit graph

  • f86f2e5dce added last part of tutorial main Lyzzy 2024-03-10 18:42:40 +01:00
  • fc3773150a - Lyzzy 2024-03-10 16:19:57 +01:00
  • 04547161a3 picture Lyzzy 2024-03-10 16:05:15 +01:00
  • 93bbb0eb84 Stoorryy Lyzzy 2024-03-10 16:05:09 +01:00
  • 4e976c3895 wuhu Lyzzy 2024-03-10 15:14:21 +01:00
  • e540693def story yea yea Lyzzy 2024-03-10 15:06:44 +01:00
  • 248fc2a112 fix fix Lyzzy 2024-03-10 14:30:20 +01:00
  • 726c5ee2a2 storyline Lyzzy 2024-03-10 14:23:22 +01:00
  • bb8ec349dd Merge branch 'main' of https://git.spafi.eu/Lyzzy/game Lyzzy 2024-03-10 13:04:29 +01:00
  • 4d40e44e2d starting to add some storyline, added Rat Lyzzy 2024-03-10 12:58:59 +01:00
  • 2a2d7b2765 Merge pull request 'Development' (#11) from InfoProjekt/game:Development into main Lyzzy 2024-03-10 11:51:09 +00:00
  • 4a47efe94d Merge pull request 'changed NPC talk key to f and resolved merge conflicts' (#77) from Spafi/game:main into Development Spafi 2024-03-10 11:46:45 +00:00
  • 4ccc2dde11 Merge branch 'main' of https://git.spafi.eu/Spafi/game SpagettiFisch 2024-03-10 12:42:41 +01:00
  • 67a0937c4b changed NPC talking key to f SpagettiFisch 2024-03-10 12:42:09 +01:00
  • 01c3aeae4a Merge pull request 'Development' (#10) from InfoProjekt/game:Development into main Lyzzy 2024-03-10 09:32:18 +00:00
  • 3232096d66 Merge pull request 'changed stuff' (#76) from Spafi/game:main into Development Spafi 2024-03-10 08:27:07 +00:00
  • e8d81dfb11 Merge pull request 'InfoProjekt-Development3' (#6) from InfoProjekt-Development3 into main Spafi 2024-03-10 08:26:52 +00:00
  • 0032f8b2e1 Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game into InfoProjekt-Development3 SpagettiFisch 2024-03-10 09:23:59 +01:00
  • b1b7b21aa2 changed stuff SpagettiFisch 2024-03-10 09:17:22 +01:00
  • 523b34615b Merge pull request 'Changed Book and fixed NPC convo' (#75) from Lyzzy/game:main into Development Spafi 2024-03-10 08:16:42 +00:00
  • 3fe22ff6ac updated convo, still weird tho Lyzzy 2024-03-09 21:27:54 +01:00
  • 9147971be8 added house Lyzzy 2024-03-09 20:14:40 +01:00
  • 52d3ec6e8d fixed that herberts attributes stay the same Lyzzy 2024-03-09 16:26:53 +01:00
  • c17b65d2f3 added village somehow Lyzzy 2024-03-09 15:54:19 +01:00
  • 67f1e081fa added village Lyzzy 2024-03-09 14:00:00 +01:00
  • 2970e5cecd fixed Convo Lyzzy 2024-03-09 12:03:59 +01:00
  • 614654692f changed Book and Convo, renamed Speech Lyzzy 2024-03-09 11:11:28 +01:00
  • 1f38a04004 Merge pull request 'Development' (#9) from InfoProjekt/game:Development into main Lyzzy 2024-03-09 09:06:05 +00:00
  • d85c6ec22c Merge pull request 'fixed wall colision' (#74) from Spafi/game:main into Development Spafi 2024-03-08 07:36:57 +00:00
  • bd5ff8b3fe fixed wall colision added object collision for mobs SpagettiFisch 2024-03-08 08:36:13 +01:00
  • 091726b8ca Merge pull request 'attack now with left mouse click' (#73) from Spafi/game:main into Development Spafi 2024-03-07 20:05:46 +00:00
  • 31a9742a9c attack now with left mouse click emter conversaton now with f no change to leave conversation SpagettiFisch 2024-03-07 20:50:09 +01:00
  • 4d228bf6e0 test2 Lyzzy 2024-03-07 16:44:38 +01:00
  • 956c25769c test Lyzzy 2024-03-07 16:41:11 +01:00
  • 569b3394a0 Merge pull request 'Development' (#8) from InfoProjekt/game:Development into main Lyzzy 2024-03-07 15:35:48 +00:00
  • 9396218a11 Merge pull request 'main' (#72) from Spafi/game:main into Development Spafi 2024-03-07 14:27:03 +00:00
  • 321dac7cca wrong location Spafi 2024-03-07 14:26:57 +00:00
  • abfa24ced8 wrong location Spafi 2024-03-07 14:26:52 +00:00
  • 11c7a9037b wrong location Spafi 2024-03-07 14:26:45 +00:00
  • 9c36e8d570 wrong location Spafi 2024-03-07 14:26:36 +00:00
  • a68bba70bb image files changed new mob sprites relocated all image files disabled collision between player and npcs and mobs SpagettiFisch 2024-03-07 14:57:18 +01:00
  • b7fb7e1f1e Merge branch 'main' of https://git.spafi.eu/Lyzzy/game SpagettiFisch 2024-03-07 13:56:24 +01:00
  • 5010609378 relocated image files changed room generation SpagettiFisch 2024-03-07 13:55:01 +01:00
  • 73165bd33e speech and fireplace Lyzzy 2024-03-07 12:52:41 +00:00
  • b368fe4665 zombie speech and fireplace Lyzzy 2024-03-07 12:52:17 +00:00
  • af5204857b some fixes Lyzzy 2024-03-07 09:43:33 +00:00
  • 1d03d60ac2 Merge pull request 'new river sprite file added' (#67) from Spafi/game:main into Development Spafi 2024-03-07 08:51:52 +00:00
  • c3c44bbc71 new river sprite file added new idea lol SpagettiFisch 2024-03-07 09:50:10 +01:00
  • a41ee41fba Merge pull request 'main' (#66) from jaffa/game:main into Development Jefferson Mousikas 2024-03-07 08:24:16 +00:00
  • 47c93f61dc Upload files to "art/sprite files" Jefferson Mousikas 2024-03-07 08:18:47 +00:00
  • 1fd852e31e Merge pull request 'Development' (#1) from InfoProjekt/game:Development into main Jefferson Mousikas 2024-03-07 08:13:31 +00:00
  • f21d980352 Merge pull request 'doubled image size' (#65) from Spafi/game:main into Development Spafi 2024-03-07 06:51:08 +00:00
  • 1b6ccb17b0 Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game SpagettiFisch 2024-03-07 07:49:49 +01:00
  • 6034a8382f changed image size SpagettiFisch 2024-03-07 07:49:16 +01:00
  • 746982641a Merge https://git.spafi.eu/InfoProjekt/game SpagettiFisch 2024-03-07 07:46:26 +01:00
  • b3c7d87926 Merge pull request 'Added Label class' (#64) from Lyzzy/game:main into Development Spafi 2024-03-07 06:45:57 +00:00
  • 41f8b76b90 added Label class Lyzzy 2024-03-06 17:40:02 +00:00
  • 96c0a691b7 empty image cuz im stupid Lyzzy 2024-03-06 17:36:57 +00:00
  • 25f04f994f added Label class Lyzzy 2024-03-06 17:35:27 +00:00
  • e2ec301fce Merge pull request 'Development' (#6) from InfoProjekt/game:Development into main Lyzzy 2024-03-06 15:44:25 +00:00
  • 55b50531f9 Merge pull request 'wind slash spell' (#63) from Spafi/game:main into Development Spafi 2024-03-06 14:29:34 +00:00
  • c9a98fb94c added new icons for spell selection inside the book SpagettiFisch 2024-03-06 14:27:06 +01:00
  • 501e84181f added a new missile new to character: wind slash attack added projectile lifetime (in frames, maybe change to 5*fps later) SpagettiFisch 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 Spafi 2024-03-06 11:12:00 +00:00
  • 953edca694 updated the button class -> can now take any arguments for the onClick Function changed all buttons according to this SpagettiFisch 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 Spafi 2024-03-06 06:45:56 +00:00
  • ef3a617e4d Merge branch 'main' of https://git.spafi.eu/Spafi/game; branch 'main' of https://git.spafi.eu/Lyzzy/game SpagettiFisch 2024-03-06 07:42:45 +01:00
  • 4cfb4b92f0 Dateien nach "/" hochladen Lyzzy 2024-03-05 15:48:06 +00:00
  • 44793f22a5 Merge pull request 'Collisions fixed' (#58) from Spafi/game:main into Development Spafi 2024-03-04 16:18:33 +00:00
  • 3ad2ad6478 optimized collision with npcs and mobs added wall collision enabled hitboxes for object and wall highlighting SpagettiFisch 2024-03-04 17:15:19 +01:00
  • ac1a7fe73a Dateien nach "/" hochladen lyzzy-patch-3 Lyzzy 2024-03-04 13:30:24 +00:00
  • f180ab650e Dateien nach "/" hochladen lyzzy-patch-2 Lyzzy 2024-03-04 13:27:30 +00:00
  • 0cd9444222 Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game SpagettiFisch 2024-03-03 13:36:15 +01:00
  • d86f8c360b fixed bug which stopped movement if colliding with projectiles SpagettiFisch 2024-03-03 13:31:01 +01:00
  • 6fce7e0fd2 Merge pull request 'Development' (#57) from Development into main Spafi 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 Spafi 2024-03-03 12:21:58 +00:00
  • b29a279fb1 Gegner Schaden, Buch, Main Angriff, NPC Lyzzy 2024-03-01 21:56:14 +00:00
  • f6827b5f05 revert 8b2dab980b Lyzzy 2024-03-01 21:50:39 +00:00
  • 5625db18c7 Buch and Feuer added Lyzzy 2024-03-01 21:47:51 +00:00
  • 8b2dab980b Schaden Gegner, Buch, Angriff Lyzzy 2024-03-01 21:46:15 +00:00
  • 2ef0948274 Merge pull request 'Development' (#5) from InfoProjekt/game:Development into main Lyzzy 2024-03-01 11:25:20 +00:00
  • 6ed85baed0 Merge pull request 'added some missing spaces lol' (#55) from Spafi/game:main into Development Spafi 2024-02-29 13:38:47 +00:00
  • 218eb2ea7e added some missing spaces lol added character collisions (not great yet tho) some simple background elements added and testet WIP SpagettiFisch 2024-02-29 14:25:23 +01:00
  • 9c36772aa7 Merge pull request 'Development' (#4) from InfoProjekt/game:Development into main Lyzzy 2024-02-29 08:09:19 +00:00
  • 886059527b Merge pull request 'main' (#54) from Spafi/game:main into Development Spafi 2024-02-26 11:29:29 +00:00
  • c741c8199a Merge branch 'main' of https://git.spafi.eu/Spafi/game SpagettiFisch 2024-02-26 12:25:34 +01:00
  • 7725bea20c art/sprite files /oldmanwalk.png gelöscht Spafi 2024-02-26 11:25:28 +00:00
  • 15e2715207 art/sprite files /oldmanattack.png gelöscht Spafi 2024-02-26 11:25:15 +00:00
  • a9e99da219 fixed arrow oriantation randomised skeletton move speed changed Iframes to 250 ms SpagettiFisch 2024-02-26 12:21:45 +01:00
  • 162542f198 Merge pull request 'Development' (#3) from InfoProjekt/game:Development into main Spafi 2024-02-26 07:50:43 +00:00
  • 2e36e11fa7 Merge branch 'InfoProjekt-Development1' SpagettiFisch 2024-02-26 08:47:47 +01:00
  • 15d39949b4 pull from main repository SpagettiFisch 2024-02-26 08:23:50 +01:00
  • 85464d1637 Merge pull request 'Leben und Sterben hinzugefügt' (#53) from Lyzzy/game:main into Development Spafi 2024-02-26 07:05:23 +00:00
  • 69cc080ea9 Label und Oldman added Lyzzy 2024-02-25 10:14:07 +00:00
  • d731f4f63d Dateien nach "/" hochladen Lyzzy 2024-02-25 10:11:37 +00:00
  • 2d3161482f Dateien nach "art/images" hochladen Lyzzy 2024-02-25 00:35:57 +00:00
  • f9ede25093 Dateien nach "art/images" hochladen Lyzzy 2024-02-25 00:35:29 +00:00
  • e80ce5ad0d Dateien nach "/" hochladen Lyzzy 2024-02-25 00:26:31 +00:00
  • 1856b2b08a Merge branch 'InfoProjekt-Development' SpagettiFisch 2024-02-23 10:46:14 +01:00
  • 4a88bb98d5 removed one empty line SpagettiFisch 2024-02-23 10:45:54 +01:00