niklas/silent-fh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
153 Commits 2 Branches 0 Tags
689d1567566f06cbdb287ad416f0b274c19e0653
Commit Graph
153 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kevin Baumgartner 975d0d1e71 feat(endscreen): implement simple endscreen with differentiation between won/lose 2026-05-08 15:07:17 +02:00
Berger Lena 11ece2ee54 feat: item 
- Create item.py
- Add update to remove expired items
- Add item settings for spawn interval, despawn timer, and size
 2026-05-08 15:03:41 +02:00
Lukas Kammerhofer 2fe4235fa5 check if player is in room 2026-05-08 14:59:46 +02:00
Lukas Kammerhofer c9d719fdd4 list of desks in the room for item spawns collision 2026-05-08 14:56:49 +02:00
Lukas Kammerhofer b9c300a47a check if pixel point is in room 2026-05-08 14:52:55 +02:00
Kevin Baumgartner 7a5d063de6 feat(endscreen): implement init for endscreen 2026-05-08 14:52:23 +02:00
Lukas Kammerhofer 16ceb11df9 rooms in px - desk in the room center 2026-05-08 14:45:59 +02:00
Haiden Niklas 872786c8e3 Merge branch 'feat/walking-players' into 'main' 
feat: walking players implementation

See merge request swd25-bootcamp/silent-fh!13
 2026-05-08 12:36:56 +00:00
Haiden Niklas 91d02e073b Merge branch 'main' into 'feat/walking-players' 2026-05-08 12:35:02 +00:00
Kevin Baumgartner b1aa4fe435 Merge branch 'main' into feat/endscreen 2026-05-08 14:34:51 +02:00
Kevin Baumgartner 5712715420 feat(endscreen): create structure for endscreen 2026-05-08 14:34:06 +02:00
Niklas Haiden a96dfefa07 feat(actors): implement needed functions for the actors 2026-05-08 14:33:05 +02:00
Haiden Niklas 39cf7c6a24 Merge branch 'feat/startscreen' into 'main' 
feat: implement startscreen

See merge request swd25-bootcamp/silent-fh!6
 2026-05-08 12:31:04 +00:00
Niklas Haiden a2185273f3 fix: readd missing file 2026-05-08 14:30:33 +02:00
Kevin Baumgartner 011cb867b3 Merge branch 'main' into feat/startscreen 
# Conflicts:
#	src/settings.py
 2026-05-08 13:54:57 +02:00
Kevin Baumgartner 8c454edd5b feat(startscreen): change ui texts from german to english and fix button click event 2026-05-08 13:50:42 +02:00
Haiden Niklas 09d72d0206 Merge branch 'feat/hud' into 'main' 
feature: HUD

See merge request swd25-bootcamp/silent-fh!12
 2026-05-08 08:32:10 +00:00
Berger Lena cb5f40dbc4 feat: HUD & SETTINGS 
- add tower constants including cost, projectile stats, and duration
- add item buying timer for shop items
 2026-05-07 22:22:18 +02:00
Kevin Baumgartner 0194438b38 Merge branch 'main' into feat/startscreen 
# Conflicts:
#	src/settings.py
 2026-05-07 22:21:02 +02:00
Kevin Baumgartner b15c5b5e28 feat(text_input): switch color definitions to settings file 2026-05-07 22:18:10 +02:00
Berger Lena 2788d352d0 feature: HUD 
- create new hud.py file
- add zombie difficulty stats (easy, medium, hard) to settings
- add coffee item stats (cost and heal value) to settings
- add HUD configuration (font, colors, dimensions) to settings
- reorganize HP bar colors into the new HUD settings section
 2026-05-07 22:14:52 +02:00
Niklas Haiden 74139aa63d feat(actor): implement player / actor class 2026-05-07 22:07:15 +02:00
Kevin Baumgartner 496c74fed2 feat(text_input): add text input on start screen and temporary test 2026-05-07 22:00:29 +02:00
Haiden Niklas 34cfa3c8c3 Merge branch 'feat/ects' into 'main' 
feature: ECTS basic mechanic

See merge request swd25-bootcamp/silent-fh!11
 2026-05-07 19:25:18 +00:00
Kevin Baumgartner f28356d0ae Merge branch 'main' into feat/startscreen 2026-05-07 21:24:46 +02:00
Berger Lena 8bb05de946 feature: ECTS upgrade mechanic 
- add upgrade_rate method to increase ECTS/per second
 2026-05-07 21:23:56 +02:00
Haiden Niklas 4f5f5d0b62 Merge branch 'feat/text_input' into 'main' 
feat: implement text input

See merge request swd25-bootcamp/silent-fh!10
 2026-05-07 19:23:53 +00:00
Berger Lena ad7e18c024 feature: ects upgrade mechanic 
- add upgrade_rate method to increase ects/per second
 2026-05-07 21:23:27 +02:00
Kevin Baumgartner f0bf7bcff3 Merge branch 'main' into feat/text_input 2026-05-07 21:22:43 +02:00
Niklas Haiden 7a47237e09 Merge branch 'refs/heads/main' into feat/walking-players 
# Conflicts:
#	src/settings.py
 2026-05-07 21:21:07 +02:00