niklas/silent-fh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
133 Commits 2 Branches 0 Tags
810a44c904475a21a8e2cae7b3481197d99d5534
Commit Graph
133 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Lukas Kammerhofer b9a1bff5e4 random spawn of tower field 2026-05-08 16:00:50 +02:00
Lukas Kammerhofer a9df61e9bc initial commit 2026-05-08 15:51:41 +02:00
Haiden Niklas be38a927dc Merge branch 'feat/endscreen' into 'main' 
feat: implement endscreen

See merge request swd25-bootcamp/silent-fh!16
 2026-05-08 13:50:53 +00:00
Berger Lena 2a6c93998b refactor: create ItemManger class 
- add itemManager class and moved randomPosition and update into it
- add is_expired to check if time ran out to buy spawned item
 2026-05-08 15:47:29 +02:00
Kevin Baumgartner b98528fd37 Merge branch 'main' into feat/endscreen 2026-05-08 15:39:27 +02:00
Haiden Niklas 91ea521d12 Merge branch 'feat/game_loop' into 'main' 
feat: implement a basic gameloop

See merge request swd25-bootcamp/silent-fh!17
 2026-05-08 13:35:05 +00:00
Haiden Niklas acd1593ec2 Merge branch 'main' into 'feat/game_loop' 2026-05-08 13:34:15 +00:00
Kevin Baumgartner 58d887689e feat(endscreen): get font from settings 2026-05-08 15:33:15 +02:00
Niklas Haiden 20e106cb01 feat: implement gameloop 
Implement a basic game loop that draws the startscreen, and the map after you hit the right button
 2026-05-08 15:32:58 +02:00
Berger Lena 3ca2ef1332 feature: item 
- add Item base class with collision rect, spawn timer, and sprite loading
 2026-05-08 15:25:06 +02:00
Lukas Kammerhofer b1f8b56b03 troubleshooting, adding desks in the map 2026-05-08 15:22:24 +02:00
Haiden Niklas 19f048c650 Merge branch 'feat/hud' into 'main' 
feat: HUD

See merge request swd25-bootcamp/silent-fh!15
 2026-05-08 13:18:28 +00:00
Berger Lena bd2152ac3b feat: HUD 
- add tower constants including cost, projectile stats, and duration
- add item buying timer for shop items
- add _draw_status_bar to handle dynamic HP rendering
- add _format_time for MM:SS display
 2026-05-08 15:17:07 +02:00
Berger Lena f6beb533d6 feat: HUD 
- add HUD class with font initialization
- add status bars for doors and zombie hp
- add ECTS balance and generation rate display
- add game timer
 2026-05-08 15:16:28 +02:00
Berger Lena 96571641a2 feat: HUD 
- add tower constants including cost, projectile stats, and duration
- add item buying timer for shop items
- add _draw_status_bar to handle dynamic HP rendering
- add _format_time for MM:SS display
 2026-05-08 15:16:28 +02:00
Kevin Baumgartner bf8115f292 feat(endscreen): show results on endscreen and draw buttons for restart/menu 2026-05-08 15:15:37 +02:00
Berger Lena 32525ccdbb feat: item 
- Add function for finding a random item spawn position
 2026-05-08 15:13:31 +02:00