niklas/silent-fh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
171 Commits 2 Branches 0 Tags
bce77b816dc1816032b428f3489abc37ef22e1bd
Commit Graph
171 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Berger Lena 7c576806b2 feature: ECTS generation 
- add update method to increase ECTS balance over time when player is at desk
 2026-05-07 21:19:55 +02:00
Kevin Baumgartner 387a328b1c feat(text_input): add event handler function (mouse and keyboard input) 2026-05-07 21:19:42 +02:00
Niklas Haiden 74b0af92fd add some settings for the sprite assets 2026-05-07 21:19:26 +02:00
Haiden Niklas 2c58ebce65 Merge branch 'feat/map' into 'main' 
feat: implement basic map structure

See merge request swd25-bootcamp/silent-fh!4
 2026-05-07 19:18:07 +00:00
Lukas Kammerhofer db64d956b3 map layout changes 2026-05-07 21:17:12 +02:00
Berger Lena 342c086852 feature: ECTS basic mechanic 
- add ECTS class to track balance and generation rate
- add ECTS and beer constants to settings
 2026-05-07 21:12:48 +02:00
Kevin Baumgartner b625acdd60 feat(text_input): add draw function 2026-05-07 21:12:02 +02:00
Kevin Baumgartner dbbd40b58a feat(text_input): add text input class with initialization 2026-05-07 20:55:22 +02:00
Lukas Kammerhofer da184af639 pygame.init() to display the first map 2026-05-07 20:52:34 +02:00
Haiden Niklas e262b982e0 Merge branch 'feat/door_basic_mechanic' into 'main' 
feature: door basic mechanic

See merge request swd25-bootcamp/silent-fh!9
 2026-05-07 18:48:54 +00:00
Berger Lena 9b74401b08 feature: door basic mechanic 
- Move hardcoded door size and colors to settings.py
- Update Door class to use constants for drawing
 2026-05-07 20:47:42 +02:00
Lukas Kammerhofer 4207ebc45a wall border and sticky description 2026-05-07 20:45:07 +02:00
Kevin Baumgartner e63cf0f639 Merge branch 'main' into feat/startscreen 2026-05-07 20:43:00 +02:00
Kevin Baumgartner 6d6fbc895b feat(startscreen): add comments 2026-05-07 20:39:17 +02:00
Haiden Niklas dee0abefbc Merge branch 'feat/desk' into 'main' 
feature: desk basic mechanic

See merge request swd25-bootcamp/silent-fh!7
 2026-05-07 18:37:12 +00:00
Haiden Niklas 9fc7a2cbda feature: desk basic mechanic 2026-05-07 18:37:12 +00:00
Lukas Kammerhofer 5e7a3197c0 def draw_map to display the map 2026-05-07 20:37:08 +02:00
Kevin Baumgartner 9ddfa8ce74 feat(startscreen): add reaction on button events 2026-05-07 20:30:26 +02:00
Haiden Niklas 9cb8bd2d24 Merge branch 'feat/add-niklas-sprites' into 'main' 
feat(player): add niklas as playable character in sprites folder

See merge request swd25-bootcamp/silent-fh!8
 2026-05-07 18:14:30 +00:00
Niklas Haiden c45987636e feat(player): add niklas as playable character in sprites folder 2026-05-07 20:13:33 +02:00
Kevin Baumgartner af1b44c7be feat(startscreen): add start and quit buttons on startscreen 2026-05-07 20:11:13 +02:00
Lukas Kammerhofer 72684f8e5f Merge remote-tracking branch 'origin/feat/map' into feat/map 
# Conflicts:
#	src/map.py
 2026-05-07 20:06:29 +02:00
Lukas Kammerhofer 9200b8257f tile accedd control function + tile update 2026-05-07 20:02:35 +02:00
Kevin Baumgartner ebce7c3dcd feat(startscreen): implement button draw method 2026-05-07 19:54:49 +02:00
Haiden Niklas febccb1826 Merge branch 'feat/table-asset' into 'main' 
feat: add table asset

See merge request swd25-bootcamp/silent-fh!5
 2026-05-07 17:51:44 +00:00
Haiden Niklas 18e8d32f99 feat: add table asset 2026-05-07 17:51:44 +00:00
Lukas Kammerhofer 7c6d8594d7 function:get_tile - check if in map 2026-05-07 19:50:18 +02:00
Lukas Kammerhofer 833c735d38 add room description 2026-05-07 19:50:18 +02:00
Lukas Kammerhofer 83dcf7b51c map basic tile structure 2026-05-07 19:50:18 +02:00
Lukas Kammerhofer 40ae16e467 Map-Start, safe commit 2026-05-07 19:50:18 +02:00
Lukas Kammerhofer 75741f18ee defined colors and tile/screen size 2026-05-07 19:50:18 +02:00
Lukas Kammerhofer 796bb5532f initial commit 2026-05-07 19:50:18 +02:00