jaffa/game
1
0
Fork 0
forked from InfoProjekt/game
Code Pull requests Activity
93 commits 2 branches 0 tags 23 MiB
Commit graph

93 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jefferson Mousikas
b55b145346 oldmanattack 2024-02-17 09:35:43 +00:00
Jefferson Mousikas
13daa19bbb Delete art/sprite files /a 2024-02-17 09:33:57 +00:00
Jefferson Mousikas
5db6b8dac1 oldmanwalk 2024-02-17 09:33:38 +00:00
Jefferson Mousikas
fc3a9afd2d Add art/sprite files /a 2024-02-17 09:32:59 +00:00
Spafi
b921da8a9a Merge pull request 'First movement and game object managing/handling' (#36) from Spafi/game:main into Development 
Reviewed-on: InfoProjekt/game#36
 2024-02-16 17:09:44 +00:00
SpagettiFisch
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

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
 2024-02-16 18:05:03 +01:00
SpagettiFisch
4e1674d6f3 added new classes to READ.ME 
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
 2024-02-16 18:03:05 +01:00
SpagettiFisch
2e66145dcc first movement (wasd) with character integrated 
started a new class for scenes

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
 2024-02-16 17:34:37 +01:00
Spafi
44973edb66 Merge pull request 'edited file structure' (#35) from Spafi/game:main into Development 
Reviewed-on: InfoProjekt/game#35
 2024-02-15 09:16:17 +00:00
SpagettiFisch
ea6d64b087 edited file structure 
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
 2024-02-15 09:50:02 +01:00
Spafi
a9f5335edc Merge pull request 'main' (#34) from Spafi/game:main into Development 
Reviewed-on: InfoProjekt/game#34
 2024-02-14 08:02:18 +00:00
SpagettiFisch
9d63d09357 added a read.me 2024-02-14 09:00:30 +01:00
SpagettiFisch
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

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
 2024-02-14 08:49:47 +01:00
SpagettiFisch
f8e491f2a5 added a medieval like font 
added the textbox for the buttons (not just any blank color)
added function for exiting the game
 2024-02-13 12:32:23 +01:00
Spafi
aea443cdb4 Merge pull request 'main' (#32) from Spafi/game:main into Development 
Reviewed-on: InfoProjekt/game#32
 2024-02-13 10:30:16 +00:00
SpagettiFisch
51a287ba66 startscreen added 
also some buttons added to be completed
button class initalized

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
 2024-02-13 10:21:42 +01:00
Spafi
418ae5ee7b Merge pull request 'Development' (#1) from InfoProjekt/game:Development into main 
Reviewed-on: Spafi/game#1
 2024-02-13 07:35:47 +00:00
SpagettiFisch
124719c0f9 first config file 
first 60 fps purple screen created, size depends on config
 2024-02-12 13:36:26 +01:00
Spafi
33a7fdd683 Merge pull request 'storyline.txt aktualisiert' (#30) from Lyzzy/game:main into Development 
Reviewed-on: InfoProjekt/game#30
 2024-02-11 12:59:22 +00:00
Lyzzy
1eb858bc30 storyline.txt aktualisiert 2024-02-05 21:46:16 +00:00
Spafi
69c55f5dd2 Tileset nach "/art" hochgeladen 
Erstes Tileset mit mehreren Ansätzen erstellt. Burgwand, Ziegelsteinwände, verschiedene Erd- und Grasvarianten.

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
 2024-01-31 17:26:25 +00:00
Spafi
27327ac7da Mauertexturen nach "/art" hochladen 
Den Rest davon noch mit hochladen

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
 2024-01-31 07:05:18 +00:00
Spafi
7e066fbb10 Mauertexturen nach "/art" hochladen 
Die ersten Texturen für Mauern hochladen.

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
 2024-01-31 07:04:24 +00:00
Spafi
d555c3930c Dateien nach "/" hochladen 
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
 2024-01-18 10:00:14 +00:00
Spafi
a11182d9f6 Merge pull request 'storyline.txt aktualisiert' (#27) from Lyzzy/game:main into Development 
Reviewed-on: InfoProjekt/game#27
 2024-01-18 09:51:20 +00:00
Lyzzy
76e3f0c2b8 storyline.txt aktualisiert 
Signed-off-by: Lyzzy <lyzzbackup@gmail.com>
 2024-01-18 09:50:31 +00:00
Spafi
634fffde4b Merge pull request 'main' (#26) from Lyzzy/game:main into Development 
Reviewed-on: InfoProjekt/game#26
 2024-01-18 09:40:01 +00:00
Lyzzy
08193cda28 storyline aktualisiert 2024-01-18 09:38:25 +00:00
Lyzzy
125b0dc0a7 storyline aktualisiert 
Signed-off-by: Lyzzy <lyzzbackup@gmail.com>
 2024-01-18 08:51:13 +00:00
Lyzzy
6bca46bb56 storyline hinzugefügt 2024-01-18 08:42:49 +00:00
Spafi
eb1d2629c2 Merge pull request 'ideas.txt aktualisiert' (#24) from Spafi/game:main into Development 
Reviewed-on: InfoProjekt/game#24
 2024-01-12 11:28:14 +00:00
Spafi
04c2997fe7 ideas.txt aktualisiert 
Gegner und NPCs hinzugefügt
"Waffen", bzw. ANgriffsarten hinzugefügt

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
 2024-01-12 11:27:02 +00:00
Spafi
c99d3412f3 Merge pull request 'Legende für Anmerkungen hinzugefügt' (#21) from Spafi/game:main into Development 
Reviewed-on: InfoProjekt/game#21
 2024-01-10 13:46:27 +00:00
Spafi
1d112ca5b5 Legende für Anmerkungen hinzugefügt 
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
 2024-01-10 13:43:00 +00:00
Spafi
abf23e4ea7 Merge pull request 'ideas.txt aktualisiert' (#1) from Spafi/game:main into main 
Reviewed-on: InfoProjekt/game#1
 2024-01-10 11:03:41 +00:00
Spafi
a74af7ea99 ideas.txt aktualisiert 
erste Ideen aufgeschrieben
Unterteilung in Game und Story

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
 2024-01-10 11:02:06 +00:00
Spafi
6cf22b691d ideas.txt hinzugefügt 
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
 2024-01-10 09:17:10 +00:00