niklas/silent-fh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106 Commits 2 Branches 0 Tags
7e6d1813b5d337ec9708c0a0f39d32ff9dd36d28
Commit Graph
106 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Lukas Kammerhofer f67f349a5e function:get_tile - check if in map 2026-05-07 19:48:55 +02:00
Kevin Baumgartner dbd98d4533 feat(startscreen): add button initialization 2026-05-07 19:47:31 +02:00
Lukas Kammerhofer 884cb153e8 add room description 2026-05-07 19:44:40 +02:00
Haiden Niklas 37c9f2fc59 Merge branch 'feat/better-readme' into 'main' 
chore: update README with coding guidelines, and a short description

See merge request swd25-bootcamp/silent-fh!2
 2026-05-07 17:44:15 +00:00
Haiden Niklas 0bb5b3b104 chore: update README with coding guidelines, and a short description 2026-05-07 17:44:15 +00:00
Berger Lena 6f3439045c feature: door basic mechanic 
- add door color and border color
- add draw method to render the door
- add take_damage method to handle health reduction and door breaking
 2026-05-07 19:39:09 +02:00
Kevin Baumgartner 49c6d485db feat(startscreen): add exit/quit functionality 2026-05-07 19:38:16 +02:00
Berger Lena 7723f5b17e Merge remote-tracking branch 'origin/main' 2026-05-07 19:36:41 +02:00
Kevin Baumgartner 80c56ad447 feat(startscreen): add title and welcome message 2026-05-07 19:35:09 +02:00
Lukas Kammerhofer c8430ac7f4 map basic tile structure 2026-05-07 19:33:12 +02:00
Lukas Kammerhofer cc06400c56 Map-Start, safe commit 2026-05-07 19:25:19 +02:00
Lukas Kammerhofer bdd633ff85 defined colors and tile/screen size 2026-05-07 19:25:19 +02:00
Lukas Kammerhofer b2ba681fb5 initial commit 2026-05-07 19:25:19 +02:00
Kevin Baumgartner 8f68bf841d feat(startscreen): add class for buttons 2026-05-07 19:25:16 +02:00
Haiden Niklas 0dd5e2946a Merge branch 'feat/add-person-assets' into 'main' 
feat(assets-sprite): add sprite assets for walking persons

See merge request swd25-bootcamp/silent-fh!1
 2026-05-07 17:18:06 +00:00