InfoProjekt/game
3
0
Fork 3
Code Issues 17 Pull requests Projects Releases 1 Packages Wiki Activity

Commit graph

  • 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
  • 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
  • b31a12b43b Merge pull request 'Skeleton, Pfeile und Movement' (#52) from Lyzzy/game:main into Development Spafi 2024-02-22 21:13:15 +00:00
  • ef9e7a6ef1 Merge pull request 'Dateien nach "/" hochladen' (#3) from lyzzy-patch-1 into main Lyzzy 2024-02-22 20:35:41 +00:00
  • 4b12f09ebd Dateien nach "/" hochladen Lyzzy 2024-02-22 20:34:45 +00:00
  • ed6c91fa8f test for gameobjects (level, rooms and scenes) created SpagettiFisch 2024-02-22 10:59:02 +01:00
  • 66afe87660 Merge pull request 'Development' (#2) from InfoProjekt/game:Development into main Lyzzy 2024-02-21 15:16:32 +00:00
  • 1663a85955 Merge pull request 'Development' (#37) from jaffa/game:Development into Development Spafi 2024-02-20 10:32:56 +00:00
  • c5cc9e6acc Merge pull request 'Development' (#1) from InfoProjekt/game:Development into main Lyzzy 2024-02-17 13:23:41 +00:00
  • b55b145346 oldmanattack Jefferson Mousikas 2024-02-17 09:35:43 +00:00
  • 13daa19bbb Delete art/sprite files /a Jefferson Mousikas 2024-02-17 09:33:57 +00:00
  • 5db6b8dac1 oldmanwalk Jefferson Mousikas 2024-02-17 09:33:38 +00:00
  • fc3a9afd2d Add art/sprite files /a Jefferson Mousikas 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 Spafi 2024-02-16 17:09:44 +00:00
  • 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 SpagettiFisch 2024-02-16 18:05:03 +01:00
  • 4e1674d6f3 added new classes to READ.ME SpagettiFisch 2024-02-16 18:03:05 +01:00
  • 2e66145dcc first movement (wasd) with character integrated started a new class for scenes SpagettiFisch 2024-02-16 17:34:37 +01:00
  • 44973edb66 Merge pull request 'edited file structure' (#35) from Spafi/game:main into Development Spafi 2024-02-15 09:16:17 +00:00
  • ea6d64b087 edited file structure SpagettiFisch 2024-02-15 09:50:02 +01:00
  • a9f5335edc Merge pull request 'main' (#34) from Spafi/game:main into Development Spafi 2024-02-14 08:02:18 +00:00
  • 9d63d09357 added a read.me SpagettiFisch 2024-02-14 09:00:30 +01:00
  • 5123b19cb0 added a lot of new fonts assigned all of them a easier and more understandable key phrase or key word added the key word dictionary in classes.py SpagettiFisch 2024-02-14 08:49:47 +01:00
  • f8e491f2a5 added a medieval like font added the textbox for the buttons (not just any blank color) added function for exiting the game SpagettiFisch 2024-02-13 12:32:23 +01:00
  • aea443cdb4 Merge pull request 'main' (#32) from Spafi/game:main into Development Spafi 2024-02-13 10:30:16 +00:00
  • 51a287ba66 startscreen added also some buttons added to be completed button class initalized SpagettiFisch 2024-02-13 10:21:42 +01:00
  • 418ae5ee7b Merge pull request 'Development' (#1) from InfoProjekt/game:Development into main Spafi 2024-02-13 07:35:47 +00:00
  • 124719c0f9 first config file first 60 fps purple screen created, size depends on config SpagettiFisch 2024-02-12 13:36:26 +01:00
  • 33a7fdd683 Merge pull request 'storyline.txt aktualisiert' (#30) from Lyzzy/game:main into Development Spafi 2024-02-11 12:59:22 +00:00
  • 1eb858bc30 storyline.txt aktualisiert Lyzzy 2024-02-05 21:46:16 +00:00
  • 69c55f5dd2 Tileset nach "/art" hochgeladen Spafi 2024-01-31 17:26:25 +00:00
  • 27327ac7da Mauertexturen nach "/art" hochladen Spafi 2024-01-31 07:05:18 +00:00
  • 7e066fbb10 Mauertexturen nach "/art" hochladen Spafi 2024-01-31 07:04:24 +00:00
  • d555c3930c Dateien nach "/" hochladen Spafi 2024-01-18 10:00:14 +00:00
  • a11182d9f6 Merge pull request 'storyline.txt aktualisiert' (#27) from Lyzzy/game:main into Development Spafi 2024-01-18 09:51:20 +00:00
  • 76e3f0c2b8 storyline.txt aktualisiert Lyzzy 2024-01-18 09:50:31 +00:00
  • 634fffde4b Merge pull request 'main' (#26) from Lyzzy/game:main into Development Spafi 2024-01-18 09:40:01 +00:00