57ffcf133c
changed will to live (level) back to non dev
...
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-03-12 21:02:21 +00:00
45c18a7713
changed will to live (level) back to non dev
...
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-03-12 21:00:05 +00:00
e383c8afed
Merge pull request 'changed to normal version again (no dev shortcuts)' ( #84 ) from Spafi/game:main into Development
...
Reviewed-on: #84
2024-03-12 20:51:23 +00:00
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
3448ec4120
Update classes.py
...
sound effects für reddy, zombie, skelett, oldman attack, hurt sound effect für oldman, Tür und Portal sounds
2024-03-12 17:52:27 +00:00
c81b3fa355
Upload files to "audio/soundeffects"
2024-03-12 16:48:24 +00:00
4d90ac3e38
Upload files to "audio/soundeffects"
2024-03-12 16:47:40 +00:00
dfc2ea8086
Upload files to "audio/soundeffects"
2024-03-12 16:46:44 +00: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
7a85a049de
Delete audio/soundeffects/altefrauspeak.mp3
2024-03-12 15:57:10 +00:00
5db4df24a0
Delete audio/soundeffects/dorfaeltesterspeak.mp3
2024-03-12 15:57:04 +00:00
2f8e393c1e
Delete viecher.py
...
nichts mehr drin
2024-03-12 15:56:39 +00:00
08edd05403
Merge pull request 'room update and boss' ( #83 ) from Spafi/game:main into Development
...
Reviewed-on: #83
2024-03-12 11:52:26 +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
f482a2445c
Delete audio/soundeffects/fireball.mp3
2024-03-11 21:44:35 +00:00
df7aff13df
Upload files to "audio/soundeffects"
2024-03-11 21:44:26 +00:00
e5adb43ec6
Delete audio/soundeffects/fireball.mp3
2024-03-11 21:44:05 +00:00
6d68ec88e0
Upload files to "audio/soundeffects"
2024-03-11 21:43:51 +00:00
f458a4e89b
Delete audio/soundeffects/fireball.mp3
2024-03-11 21:43:30 +00:00
c9c87da15a
Delete audio/soundeffects/door.mp3
2024-03-11 21:43:27 +00:00
37aee3dfff
Upload files to "audio/soundeffects"
2024-03-11 21:43:13 +00:00
38ddb5fbd6
Delete audio/soundeffects/door.mp3
2024-03-11 21:42:38 +00:00
8198079512
Delete audio/soundeffects/fireball.mp3
2024-03-11 21:42:34 +00:00
6ee5cba861
Upload files to "audio/soundeffects"
2024-03-11 21:42:12 +00:00
89255505ec
Upload files to "art/images/people"
2024-03-11 21:05:33 +00:00
a35dcfb823
Update main.py
2024-03-11 19:47:09 +00:00
d08274c2f6
Upload files to "audio/soundeffects"
2024-03-11 19:27:59 +00:00
6601e00318
Upload files to "audio/soundeffects"
2024-03-11 19:22:27 +00:00
b2ac429eaa
Delete audio/soundeffects/a
2024-03-11 19:17:12 +00:00
98b8a2bcb6
Upload files to "audio/soundeffects"
2024-03-11 19:17:07 +00:00
a7dd1dbf27
Upload files to "audio/music"
2024-03-11 19:09:46 +00:00
9e9ab2156a
Delete audio/music/a
2024-03-11 19:07:23 +00:00
3e655a09f3
Upload files to "audio/music"
2024-03-11 19:07:13 +00:00
585d19fb37
Delete audio/soundeffects/fireball.mp3
2024-03-11 18:58:17 +00:00
f755bef435
Upload files to "audio/soundeffects"
2024-03-11 18:58:10 +00:00
065036d430
Add audio/soundeffects/a
2024-03-11 18:56:13 +00:00
46c05a8de5
Delete audio/soundeffects
2024-03-11 18:55:56 +00:00
643e74ab58
Add audio/soundeffects
2024-03-11 18:55:35 +00:00
72f0050055
Add audio/music/a
2024-03-11 18:55:05 +00:00
0dda6fd38c
Delete music /a
2024-03-11 18:50:56 +00:00
19f5027b60
Add music /a
2024-03-11 18:49:44 +00:00
SpagettiFisch
74abed824d
Merge branch 'main' of https://git.spafi.eu/Spafi/game
2024-03-11 11:46:35 +01:00
073062ce0c
Merge pull request 'Development' ( #8 ) from InfoProjekt/game:Development into main
...
Reviewed-on: Spafi/game#8
2024-03-11 10:46:24 +00:00
SpagettiFisch
76ef4f6559
doors can now be passed through
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-11 11:44:58 +01:00
aa83465577
Upload files to "art/images/people"
2024-03-11 10:39:37 +00:00
80ec47143e
Merge pull request 'Update viecher.py' ( #82 ) from jaffa-patch-1 into Development
...
Reviewed-on: #82
2024-03-11 06:56:30 +00:00
a9770aff7e
Update viecher.py
...
added animations for old man walking, old man attacking and zombie attacking
2024-03-10 23:47:22 +00:00
cc24152e7f
Upload files to "art/images/people"
2024-03-10 23:37:57 +00:00
01d91e68c7
Merge pull request 'fied a bug were the game would crash during door creation' ( #81 ) from Spafi/game:main into Development
...
Reviewed-on: #81
2024-03-10 22:07:53 +00:00
SpagettiFisch
3883237f91
fied a bug were the game would crash during door creation
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-10 23:07:38 +01:00
8dd5ad2dc6
Merge pull request 'game icon and room update' ( #80 ) from Spafi/game:main into Development
...
Reviewed-on: #80
2024-03-10 22:03:06 +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
SpagettiFisch
229435f682
added room constallations
...
now with useless doors
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-10 22:58:58 +01:00
67ba9a62a1
Merge pull request 'Development' ( #7 ) from InfoProjekt/game:Development into main
...
Reviewed-on: Spafi/game#7
2024-03-10 21:29:19 +00:00
73508253c4
Merge pull request 'storyline' ( #79 ) from Lyzzy/game:main into Development
...
Reviewed-on: #79
2024-03-10 18:02:21 +00:00
f86f2e5dce
added last part of tutorial
2024-03-10 18:42:40 +01:00
fc3773150a
-
2024-03-10 16:19:57 +01:00
04547161a3
picture
2024-03-10 16:05:15 +01:00
93bbb0eb84
Stoorryy
2024-03-10 16:05:09 +01:00
4e976c3895
wuhu
2024-03-10 15:14:21 +01:00
e540693def
story yea yea
2024-03-10 15:06:44 +01:00
248fc2a112
fix fix
2024-03-10 14:30:20 +01:00
726c5ee2a2
storyline
2024-03-10 14:23:22 +01:00
bb8ec349dd
Merge branch 'main' of https://git.spafi.eu/Lyzzy/game
2024-03-10 13:04:29 +01:00
4d40e44e2d
starting to add some storyline, added Rat
2024-03-10 12:58:59 +01:00
2a2d7b2765
Merge pull request 'Development' ( #11 ) from InfoProjekt/game:Development into main
...
Reviewed-on: Lyzzy/game#11
2024-03-10 11:51:09 +00:00
4a47efe94d
Merge pull request 'changed NPC talk key to f and resolved merge conflicts' ( #77 ) from Spafi/game:main into Development
...
Reviewed-on: #77
2024-03-10 11:46:45 +00:00
SpagettiFisch
4ccc2dde11
Merge branch 'main' of https://git.spafi.eu/Spafi/game
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-10 12:42:41 +01:00
SpagettiFisch
67a0937c4b
changed NPC talking key to f
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-10 12:42:09 +01:00
01c3aeae4a
Merge pull request 'Development' ( #10 ) from InfoProjekt/game:Development into main
...
Reviewed-on: Lyzzy/game#10
2024-03-10 09:32:18 +00:00
3232096d66
Merge pull request 'changed stuff' ( #76 ) from Spafi/game:main into Development
...
Reviewed-on: #76
2024-03-10 08:27:07 +00:00
e8d81dfb11
Merge pull request 'InfoProjekt-Development3' ( #6 ) from InfoProjekt-Development3 into main
...
Reviewed-on: Spafi/game#6
2024-03-10 08:26:52 +00:00
SpagettiFisch
0032f8b2e1
Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game into InfoProjekt-Development3
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-10 09:23:59 +01:00
SpagettiFisch
b1b7b21aa2
changed stuff
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-10 09:17:22 +01:00
523b34615b
Merge pull request 'Changed Book and fixed NPC convo' ( #75 ) from Lyzzy/game:main into Development
...
Reviewed-on: #75
2024-03-10 08:16:42 +00: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
52d3ec6e8d
fixed that herberts attributes stay the same
2024-03-09 16:26:53 +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
2970e5cecd
fixed Convo
2024-03-09 12:03:59 +01:00
614654692f
changed Book and Convo, renamed Speech
2024-03-09 11:11:28 +01:00
1f38a04004
Merge pull request 'Development' ( #9 ) from InfoProjekt/game:Development into main
...
Reviewed-on: Lyzzy/game#9
2024-03-09 09:06:05 +00:00
d85c6ec22c
Merge pull request 'fixed wall colision' ( #74 ) from Spafi/game:main into Development
...
Reviewed-on: #74
2024-03-08 07:36:57 +00:00
SpagettiFisch
bd5ff8b3fe
fixed wall colision
...
added object collision for mobs
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-08 08:36:13 +01:00
091726b8ca
Merge pull request 'attack now with left mouse click' ( #73 ) from Spafi/game:main into Development
...
Reviewed-on: #73
2024-03-07 20:05:46 +00:00
SpagettiFisch
31a9742a9c
attack now with left mouse click
...
emter conversaton now with f
no change to leave conversation
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-07 20:50:09 +01:00
4d228bf6e0
test2
2024-03-07 16:44:38 +01:00
956c25769c
test
2024-03-07 16:41:11 +01:00
569b3394a0
Merge pull request 'Development' ( #8 ) from InfoProjekt/game:Development into main
...
Reviewed-on: Lyzzy/game#8
2024-03-07 15:35:48 +00:00
9396218a11
Merge pull request 'main' ( #72 ) from Spafi/game:main into Development
...
Reviewed-on: #72
2024-03-07 14:27:03 +00:00
321dac7cca
wrong location
...
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-03-07 14:26:57 +00:00
abfa24ced8
wrong location
...
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-03-07 14:26:52 +00:00
11c7a9037b
wrong location
...
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-03-07 14:26:45 +00:00
9c36e8d570
wrong location
...
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-03-07 14:26:36 +00: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
b368fe4665
zombie speech and fireplace
2024-03-07 12:52:17 +00:00
af5204857b
some fixes
...
forgot what i did
2024-03-07 09:43:33 +00:00
1d03d60ac2
Merge pull request 'new river sprite file added' ( #67 ) from Spafi/game:main into Development
...
Reviewed-on: #67
2024-03-07 08:51:52 +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
a41ee41fba
Merge pull request 'main' ( #66 ) from jaffa/game:main into Development
...
Reviewed-on: #66
2024-03-07 08:24:16 +00:00
47c93f61dc
Upload files to "art/sprite files"
2024-03-07 08:18:47 +00:00
1fd852e31e
Merge pull request 'Development' ( #1 ) from InfoProjekt/game:Development into main
...
Reviewed-on: jaffa/game#1
2024-03-07 08:13:31 +00:00
f21d980352
Merge pull request 'doubled image size' ( #65 ) from Spafi/game:main into Development
...
Reviewed-on: #65
2024-03-07 06:51:08 +00:00
SpagettiFisch
1b6ccb17b0
Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game
2024-03-07 07:49:49 +01:00
SpagettiFisch
6034a8382f
changed image size
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-07 07:49:16 +01:00
SpagettiFisch
746982641a
Merge https://git.spafi.eu/InfoProjekt/game
2024-03-07 07:46:26 +01:00
b3c7d87926
Merge pull request 'Added Label class' ( #64 ) from Lyzzy/game:main into Development
...
Reviewed-on: #64
2024-03-07 06:45:57 +00:00
41f8b76b90
added Label class
...
Label class in classes, added text to book, changed wind spell a bit but dunno if really good
2024-03-06 17:40:02 +00:00
96c0a691b7
empty image cuz im stupid
2024-03-06 17:36:57 +00:00
25f04f994f
added Label class
...
added Label class in classes and added text to book, changed wind attack a bit but idk if good
2024-03-06 17:35:27 +00:00
e2ec301fce
Merge pull request 'Development' ( #6 ) from InfoProjekt/game:Development into main
...
Reviewed-on: Lyzzy/game#6
2024-03-06 15:44:25 +00:00
55b50531f9
Merge pull request 'wind slash spell' ( #63 ) from Spafi/game:main into Development
...
Reviewed-on: #63
2024-03-06 14:29:34 +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
0564d778a1
Merge pull request 'updated the button class -> can now take any arguments for the onClick Function' ( #62 ) from Spafi/game:main into Development
...
Reviewed-on: #62
2024-03-06 11:12:00 +00:00
SpagettiFisch
953edca694
updated the button class -> can now take any arguments for the onClick Function
...
changed all buttons according to this
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
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
...
Reviewed-on: #60
2024-03-06 06:45:56 +00:00
SpagettiFisch
ef3a617e4d
Merge branch 'main' of https://git.spafi.eu/Spafi/game ; branch 'main' of https://git.spafi.eu/Lyzzy/game
2024-03-06 07:42:45 +01:00
4cfb4b92f0
Dateien nach "/" hochladen
2024-03-05 15:48:06 +00:00
44793f22a5
Merge pull request 'Collisions fixed' ( #58 ) from Spafi/game:main into Development
...
Reviewed-on: #58
2024-03-04 16:18:33 +00:00
SpagettiFisch
3ad2ad6478
optimized collision with npcs and mobs
...
added wall collision
enabled hitboxes for object and wall highlighting
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-04 17:15:19 +01:00
SpagettiFisch
0cd9444222
Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-03 13:36:15 +01:00
SpagettiFisch
d86f8c360b
fixed bug which stopped movement if colliding with projectiles
...
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-03 13:31:01 +01:00
