Commit graph

41 commits

Author SHA1 Message Date
SpagettiFisch
64a3381eb9 Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-12 21:50:04 +01:00
SpagettiFisch
a72349f7df changed to normal version again (no dev shortcuts)
changed font for Think (because the f looked like a p)
uploaded bossbar images

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-12 21:45:52 +01:00
b124f8817c Upload files to "art/images/people" 2024-03-12 16:18:45 +00:00
d4da02ee8d Delete art/images/people/fairy.png 2024-03-12 16:18:31 +00:00
SpagettiFisch
fb3ba25b89 managed the room thing, you can now actually switch rooms
the boss is killable
you get a tbc screen after killing the boss

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-12 12:50:13 +01:00
SpagettiFisch
04e0b68cd7 Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-12 07:41:12 +01:00
SpagettiFisch
d132757717 added new npc
started migrating object creation into the room classs

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-12 07:39:36 +01:00
a13042ffdd Upload files to "art/images/weapons" 2024-03-11 21:49:24 +00:00
89255505ec Upload files to "art/images/people" 2024-03-11 21:05:33 +00:00
aa83465577 Upload files to "art/images/people" 2024-03-11 10:39:37 +00:00
cc24152e7f Upload files to "art/images/people" 2024-03-10 23:37:57 +00:00
SpagettiFisch
7709fd52f7 Merge branch 'main' of https://git.spafi.eu/Spafi/game 2024-03-10 22:59:55 +01:00
SpagettiFisch
0f755996b6 added icon
added door sprite
addedd startscreen

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-10 22:59:46 +01:00
f86f2e5dce added last part of tutorial 2024-03-10 18:42:40 +01:00
04547161a3 picture 2024-03-10 16:05:15 +01:00
4d40e44e2d starting to add some storyline, added Rat 2024-03-10 12:58:59 +01:00
3fe22ff6ac updated convo, still weird tho 2024-03-09 21:27:54 +01:00
9147971be8 added house 2024-03-09 20:14:40 +01:00
c17b65d2f3 added village somehow 2024-03-09 15:54:19 +01:00
67f1e081fa added village 2024-03-09 14:00:00 +01:00
614654692f changed Book and Convo, renamed Speech 2024-03-09 11:11:28 +01:00
SpagettiFisch
a68bba70bb image files changed
new mob sprites
relocated all image files
disabled collision between player and npcs and mobs

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-07 14:57:18 +01:00
SpagettiFisch
b7fb7e1f1e Merge branch 'main' of https://git.spafi.eu/Lyzzy/game
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-07 13:56:24 +01:00
SpagettiFisch
5010609378 relocated image files
changed room generation

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-07 13:55:01 +01:00
73165bd33e speech and fireplace 2024-03-07 12:52:41 +00:00
SpagettiFisch
c3c44bbc71 new river sprite file added
new idea lol

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-07 09:50:10 +01:00
96c0a691b7 empty image cuz im stupid 2024-03-06 17:36:57 +00:00
SpagettiFisch
c9a98fb94c added new icons for spell selection inside the book
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-06 14:27:06 +01:00
SpagettiFisch
501e84181f added a new missile
new to character: wind slash attack
added projectile lifetime (in frames, maybe change to 5*fps later)

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-06 14:26:32 +01:00
5625db18c7 Buch and Feuer added
changable
2024-03-01 21:47:51 +00:00
SpagettiFisch
218eb2ea7e added some missing spaces lol
added character collisions (not great yet tho)
some simple background elements added and testet WIP
2024-02-29 14:25:23 +01:00
SpagettiFisch
15d39949b4 pull from main repository 2024-02-26 08:23:50 +01: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
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
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
SpagettiFisch
ea6d64b087 edited file structure
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-02-15 09:50:02 +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
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
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
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
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