Niklas Haiden
4faad9dd4b
feat: implement encounter reset mechanics for rooms and doors
2026-05-08 19:32:07 +02:00
Niklas Haiden
d6bdf22a10
refactor: improve room handling and tower expiration logic
2026-05-08 19:30:18 +02:00
Niklas Haiden
e7a4115721
feat: adjust resource costs and intervals for balancing
2026-05-08 19:25:21 +02:00
Haiden Niklas
eabbf90dd0
Merge branch 'feat/monsters' into 'main'
...
feat: implement game loop
See merge request swd25-bootcamp/silent-fh!28
2026-05-08 17:23:38 +00:00
Niklas Haiden
339285e98a
implement missing stuff
2026-05-08 19:23:19 +02:00
Berger Lena
8d8a2b10aa
fix: remove merge conflict marker in settings.py
...
- remove stray `=======` marker
- clean up excess blank lines
2026-05-08 19:12:25 +02:00
Haiden Niklas
689d156756
Merge branch 'feat/tower' into 'main'
...
feat: fused settings
See merge request swd25-bootcamp/silent-fh!29
2026-05-08 17:07:01 +00:00
Haiden Niklas
af6153c43f
Merge branch 'main' into 'feat/tower'
2026-05-08 17:06:10 +00:00
Haiden Niklas
6020ca5edb
Merge branch 'feat/sound' into 'main'
...
feat: sound
See merge request swd25-bootcamp/silent-fh!27
2026-05-08 17:03:34 +00:00
Niklas Haiden
261e0bc223
tower changes
2026-05-08 19:02:28 +02:00
Niklas Haiden
ba0bb49ab8
feat: fix endscreen imports
2026-05-08 19:02:18 +02:00
Niklas Haiden
92ca769376
feat: adjust some tower values
2026-05-08 19:02:06 +02:00
Niklas Haiden
0325fd519c
feat: add book png
2026-05-08 19:01:45 +02:00
Niklas Haiden
8515a843c3
feat: implement game loop for monster interaction
2026-05-08 19:01:36 +02:00
Niklas Haiden
10aa0cc70f
feat: implement monster class
2026-05-08 19:01:23 +02:00
Niklas Haiden
07efc083b5
feat: update hud for usage in game
2026-05-08 19:01:12 +02:00
Berger Lena
daf2de0e73
feat: tower sound effects
...
- integrate sound_manager into Tower class
- add sfx for buy success/fail, tower shoot, and monster hit
2026-05-08 18:57:20 +02:00
Lukas Kammerhofer
cf6af54eb1
fused settings
2026-05-08 18:49:47 +02:00
Berger Lena
20c47e5d55
Merge remote-tracking branch 'origin/main' into feat/sound
2026-05-08 18:46:10 +02:00
Berger Lena
bd1ee01e90
Merge branch 'main' into feat/sound
...
# Conflicts:
# src/settings.py
2026-05-08 18:34:51 +02:00
Berger Lena
16b8f26361
feat: sound
...
- add SoundManager class to handle bgm and sfx
- add script to generate wav sound assets
- integrate sfx for shop purchases and player transform
- add dynamic bgm switching based on player state
- add sound file paths and volume configurations to settings
2026-05-08 18:34:18 +02:00
Haiden Niklas
c8ccd819fb
Merge branch 'feat/tower' into 'main'
...
bugfix
See merge request swd25-bootcamp/silent-fh!26
2026-05-08 16:33:41 +00:00
Lukas Kammerhofer
80f68682d9
bugfix
2026-05-08 18:28:30 +02:00
Haiden Niklas
e72ec2426f
Merge branch 'feat/endscreen' into 'main'
...
feat: implement endscreen finally
See merge request swd25-bootcamp/silent-fh!25
2026-05-08 16:21:10 +00:00
Kevin Baumgartner
41f0ce50ee
Merge branch 'main' into feat/endscreen
2026-05-08 18:19:57 +02:00
Kevin Baumgartner
6fbd750cad
feat(endscreen): fix position of highscore table in endscreen
2026-05-08 18:19:19 +02:00
Niklas Haiden
228d0d30ad
Merge branch 'main' of git-iit.fh-joanneum.at:swd25-bootcamp/silent-fh
2026-05-08 18:17:00 +02:00
Niklas Haiden
8b3c839d45
feat: add book png
2026-05-08 18:16:37 +02:00
Haiden Niklas
ade975e74d
Merge branch 'feat/tower' into 'main'
...
feat: implement tower with book functionality
See merge request swd25-bootcamp/silent-fh!24
2026-05-08 16:13:41 +00:00
Kevin Baumgartner
7d80d05249
feat(endscreen): add highscore table in end screen
2026-05-08 18:05:48 +02:00
Lukas Kammerhofer
e482aa6080
added sprite for book projectile
2026-05-08 17:57:49 +02:00
Lukas Kammerhofer
8f5a0ed6de
added comments
2026-05-08 17:43:39 +02:00
Niklas Haiden
810a44c904
fix: import error
2026-05-08 17:41:45 +02:00
Haiden Niklas
81174eb793
Merge branch 'feat/startscreen' into 'main'
...
feat: implement highscore display in startscreen
See merge request swd25-bootcamp/silent-fh!23
2026-05-08 15:40:20 +00:00
Kevin Baumgartner
7833d381a6
feat(startscreen): add highscore table in start screen
2026-05-08 17:37:30 +02:00
Kevin Baumgartner
80ad07c795
feat(highscore): add draw function in highscore
2026-05-08 17:34:52 +02:00
Lukas Kammerhofer
164e31467c
bugfixing
2026-05-08 17:29:41 +02:00
Haiden Niklas
b3923719fd
Merge branch 'feat/shop-system' into 'main'
...
feat: implement a basic shop system
See merge request swd25-bootcamp/silent-fh!22
2026-05-08 15:29:35 +00:00
Niklas Haiden
83398c6eec
refactor: remove redundant tile_size import and cleanup formatting
2026-05-08 17:25:34 +02:00
Niklas Haiden
89d72b2a2c
Merge branch 'main' of git-iit.fh-joanneum.at:swd25-bootcamp/silent-fh into feat/shop-system
2026-05-08 17:17:18 +02:00
Haiden Niklas
f5a789842c
Merge branch 'feat/map' into 'main'
...
feat: implement towers
See merge request swd25-bootcamp/silent-fh!21
2026-05-08 15:14:52 +00:00
Lukas Kammerhofer
15f3d0e53b
sprite path changed
2026-05-08 17:05:55 +02:00
Lukas Kammerhofer
4cc4feca36
Merge remote-tracking branch 'refs/remotes/origin/main' into feat/map
2026-05-08 17:04:11 +02:00
Lukas Kammerhofer
3fe002daa9
tower sprite, timer, projectiles, all clear
2026-05-08 17:03:06 +02:00
Haiden Niklas
85df16408e
Merge branch 'feat/highscore' into 'main'
...
feat: implement highscore screen
See merge request swd25-bootcamp/silent-fh!20
2026-05-08 15:00:09 +00:00
Niklas Haiden
dd1773e142
fix: fix buying logic for shop
2026-05-08 16:56:14 +02:00
Kevin Baumgartner
b466ee3d7c
feat(highscore): add comments and json file
2026-05-08 16:55:58 +02:00
Niklas Haiden
10e094d969
feat(shop): initial shop implementation with buy functionality and item loading
2026-05-08 16:44:47 +02:00
Niklas Haiden
2adc490f3d
feat(ects): add some helper functions for etcs
2026-05-08 16:44:21 +02:00
Niklas Haiden
538be47bc5
feat(item): add cost attribute and getter function
2026-05-08 16:43:55 +02:00
Niklas Haiden
Haiden Niklas
Berger Lena
Lukas Kammerhofer
Kevin Baumgartner