niklas/silent-fh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
150 Commits 2 Branches 0 Tags
6020ca5edb4db1c8ab7becccd74e96fbca0326f1
Commit Graph
150 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Kevin Baumgartner 7e6d1813b5 Merge branch 'main' into feat/highscore 2026-05-08 16:42:23 +02:00
Lukas Kammerhofer a1096f3b83 projectile movement and tower despawn 2026-05-08 16:40:33 +02:00
Kevin Baumgartner 1553630e1c feat(highscore): add method to get formatted top 5 highscores 2026-05-08 16:36:07 +02:00
Berger Lena 337f11b431 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	src/settings.py
 2026-05-08 16:29:47 +02:00
Berger Lena a9209bb261 chore:cleanup settings.py structure and formatting 
- remove HP bar colors
- fix double parentheses in start and end screen background colors
- add section headers for PLAYER and SPRITE
- improve spacing and structure between sections
 2026-05-08 16:28:40 +02:00
Lukas Kammerhofer 665e852ed9 tower shooting function 2026-05-08 16:28:33 +02:00
Haiden Niklas 6463d3d215 Merge branch 'feat/items' into 'main' 
feat: item

See merge request swd25-bootcamp/silent-fh!19
 2026-05-08 14:24:02 +00:00
Berger Lena f52ef23e6c feat: item 
- Add logic to spawn items at random intervals
- Add mechanic to collect items with 'E' key
- Refactor _random_position to a  function
 2026-05-08 16:23:02 +02:00
Kevin Baumgartner 7846bfa042 feat(highscore): add methods for highscore handling 2026-05-08 16:18:25 +02:00
Lukas Kammerhofer 7a42484ded tower building check function 2026-05-08 16:16:55 +02:00
Berger Lena 4a7e754771 Merge remote-tracking branch 'origin/main' into feat/items 2026-05-08 16:04:36 +02:00
Kevin Baumgartner 3c8e0a9b9a feat(highscore): create basic structure for highscore 2026-05-08 16:04:12 +02:00
Berger Lena c0a5c12d4e feature: item 
- add draw method to Item class with fallback colors
- fix ItemManager class name typo and missing self parameter in _random_position
- add draw and clear methods to ItemManager
- rename ITEM_SPAWN_INTERVAL to ITEM_SHOPPING_TIMER in is_expired
 2026-05-08 16:03:42 +02:00
Haiden Niklas 613dfb88ee Merge branch 'feat/assets-for-gameplay' into 'main' 
feat(assets): add some more assets for items and tower who throws items

See merge request swd25-bootcamp/silent-fh!18
 2026-05-08 14:02:46 +00:00
Haiden Niklas 26d71ef633 feat(assets): add some more assets for items and tower who throws items 2026-05-08 14:02:46 +00:00
Berger Lena 99d095c761 Merge branch 'main' into feat/items 
# Conflicts:
#	src/settings.py
 2026-05-08 16:02:33 +02:00