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

Commit graph

  • 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
  • 08193cda28 storyline aktualisiert Lyzzy 2024-01-18 09:38:25 +00:00
  • 125b0dc0a7 storyline aktualisiert Lyzzy 2024-01-18 08:51:13 +00:00
  • 6bca46bb56 storyline hinzugefügt Lyzzy 2024-01-18 08:42:49 +00:00
  • eb1d2629c2 Merge pull request 'ideas.txt aktualisiert' (#24) from Spafi/game:main into Development Spafi 2024-01-12 11:28:14 +00:00
  • 04c2997fe7 ideas.txt aktualisiert Spafi 2024-01-12 11:27:02 +00:00
  • c99d3412f3 Merge pull request 'Legende für Anmerkungen hinzugefügt' (#21) from Spafi/game:main into Development Spafi 2024-01-10 13:46:27 +00:00
  • 1d112ca5b5 Legende für Anmerkungen hinzugefügt Spafi 2024-01-10 13:43:00 +00:00
  • abf23e4ea7 Merge pull request 'ideas.txt aktualisiert' (#1) from Spafi/game:main into main Spafi 2024-01-10 11:03:41 +00:00
  • a74af7ea99 ideas.txt aktualisiert Spafi 2024-01-10 11:02:06 +00:00
  • 6cf22b691d ideas.txt hinzugefügt Spafi 2024-01-10 09:17:10 +00:00