Lyzzy/game

Fork 0

forked from InfoProjekt/game

Development #1

Merged

Lyzzy merged 25 commits from InfoProjekt/game:Development into main

2024-02-17 14:23:41 +01:00

Lyzzy commented

2024-02-17 14:23:24 +01:00

Owner

No description provided.

Lyzzy added 25 commits 2024-02-17 14:23:25 +01:00

Legende für Anmerkungen hinzugefügt 1d112ca5b5

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>

Merge pull request 'Legende für Anmerkungen hinzugefügt' (#21 ) from Spafi/game:main into Development c99d3412f3

Reviewed-on: InfoProjekt/game#21

ideas.txt aktualisiert 04c2997fe7

Gegner und NPCs hinzugefügt
"Waffen", bzw. ANgriffsarten hinzugefügt

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>

Merge pull request 'ideas.txt aktualisiert' (#24 ) from Spafi/game:main into Development eb1d2629c2

Reviewed-on: InfoProjekt/game#24

Merge pull request 'main' (#26 ) from Lyzzy/game:main into Development 634fffde4b

Reviewed-on: InfoProjekt/game#26

Merge pull request 'storyline.txt aktualisiert' (#27 ) from Lyzzy/game:main into Development a11182d9f6

Reviewed-on: InfoProjekt/game#27

Dateien nach "/" hochladen d555c3930c

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>

Mauertexturen nach "/art" hochladen 7e066fbb10

Die ersten Texturen für Mauern hochladen.

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>

Mauertexturen nach "/art" hochladen 27327ac7da

Den Rest davon noch mit hochladen

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>

Tileset nach "/art" hochgeladen 69c55f5dd2

Erstes Tileset mit mehreren Ansätzen erstellt. Burgwand, Ziegelsteinwände, verschiedene Erd- und Grasvarianten.

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>

Merge pull request 'storyline.txt aktualisiert' (#30 ) from Lyzzy/game:main into Development 33a7fdd683

Reviewed-on: InfoProjekt/game#30

first config file 124719c0f9

first 60 fps purple screen created, size depends on config

Merge pull request 'Development' (#1 ) from InfoProjekt/game:Development into main 418ae5ee7b

Reviewed-on: Spafi/game#1

startscreen added 51a287ba66

also some buttons added to be completed
button class initalized

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>

Merge pull request 'main' (#32 ) from Spafi/game:main into Development aea443cdb4

Reviewed-on: InfoProjekt/game#32

added a medieval like font f8e491f2a5

added the textbox for the buttons (not just any blank color)
added function for exiting the game

added a lot of new fonts 5123b19cb0

assigned all of them a easier and more understandable key phrase or key word
added the key word dictionary in classes.py

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>

added a read.me 9d63d09357

Merge pull request 'main' (#34 ) from Spafi/game:main into Development a9f5335edc

Reviewed-on: InfoProjekt/game#34

edited file structure ea6d64b087

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>

Merge pull request 'edited file structure' (#35 ) from Spafi/game:main into Development 44973edb66

Reviewed-on: InfoProjekt/game#35

first movement (wasd) with character integrated 2e66145dcc

started a new class for scenes

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>

added new classes to READ.ME 4e1674d6f3

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>

resorted the Scene class into a subclass of GameObjects 8f78002015

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>

Merge pull request 'First movement and game object managing/handling' (#36 ) from Spafi/game:main into Development b921da8a9a