Commit Graph

225 Commits

Author SHA1 Message Date
demenik
337444b19d fix: Remove debug features from release build 2025-12-12 14:44:37 +01:00
Dominik Bernroider
93946696e3 Merge branch '47-achievement-menu-ui-implementation' into 'dev'
Achievement Menu UI

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!46
2025-12-11 19:30:20 +00:00
demenik
526a4657ae fix: Make save game delete button not rounded 2025-12-11 20:24:29 +01:00
demenik
01067d4770 fix: Change order of buttons in load save game menu 2025-12-11 20:22:31 +01:00
demenik
2857f59a85 feat: Show achievement progress in savegame load menu (#47) 2025-12-11 20:21:46 +01:00
demenik
52dd300ca0 feat: Add achievements button to HUD settings (#47) 2025-12-11 20:21:02 +01:00
demenik
8c9a27f0df feat: Implement achievement menu UI (#47) 2025-12-11 20:20:30 +01:00
demenik
d58b23c1b1 feat: Add title and description methods to AchievementId (#47) 2025-12-11 20:19:00 +01:00
demenik
e8af0add0b feat: Add achievement sprite (#47) 2025-12-11 19:52:53 +01:00
Dominik Bernroider
13ba8ace79 Merge branch '69-fix-42-tests' into 'dev'
Fix #42's test

Closes #42

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!45
2025-12-11 17:50:29 +00:00
demenik
aa70598316 test: Fix achievement integration test setup and system visibility (#42) 2025-12-11 18:47:42 +01:00
Dominik Bernroider
18b179bc42 Merge branch '42-achievement-data-persistence' into 'dev'
Add achievement tracking and persistence

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!44
2025-12-11 16:46:22 +00:00
demenik
63a23ae9a8 test: Add achievement unlock logic test 2025-12-11 17:42:55 +01:00
demenik
aae0420528 refactor: Remove empty trailing line 2025-12-11 17:35:41 +01:00
demenik
efc69f6be0 test: Fix session tests for new session tracker field 2025-12-11 17:35:00 +01:00
demenik
172f32a4d8 feat: Add achievement tracking and persistence (#42) 2025-12-11 17:26:19 +01:00
Dominik Bernroider
1e7e4e7b95 Merge branch '68-startscreen-settings-implementation' into 'dev'
StartScreen Settings implementation

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!43
2025-12-11 13:02:30 +00:00
demenik
ac06bc598b feat: Add UI for start screen settings 2025-12-11 13:55:43 +01:00
demenik
2a1f8a7e7c feat: Implement timer settings in start screen 2025-12-11 13:55:14 +01:00
Dominik Bernroider
f5fb1ba2ce Merge branch '54-sessiontracker-updates-too-late' into 'dev'
SessionTracker Update Fix

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!42
2025-12-10 19:04:42 +00:00
demenik
24cecb582a test: Update session test to reflect SessionTracker bug fix 2025-12-10 20:00:07 +01:00
demenik
c4bbe2015f fix: SessionTracker now updates at the same time berries are granted
(#54)
2025-12-10 19:50:25 +01:00
demenik
57904e055b fix: Initialize Notifications resource in wonderevent tests 2025-12-10 18:37:22 +01:00
Dominik Bernroider
38f0debde5 Merge branch '66-add-keybinds' into 'dev'
Add keybinds for Inventory and Settings

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!41
2025-12-10 17:31:48 +00:00
demenik
ccf8209a7f feat: show keybinds on hud buttons (#66) 2025-12-10 18:29:20 +01:00
demenik
81ff75630e feat: add keybinds for inventory and settings (#66) 2025-12-10 18:28:55 +01:00
Dominik Bernroider
734fa79d2e Merge branch '65-add-code-comments' into 'dev'
Add code documentation

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!40
2025-12-10 17:17:37 +00:00
demenik
04a9125a31 docs: document game phases, save system, notifications, and events (#65) 2025-12-10 18:14:15 +01:00
demenik
392b93d47b docs: add documentation for inventory and shop systems (#65) 2025-12-10 18:13:22 +01:00
demenik
e5713fdb94 docs: document player character (Pom) and input handling (#65) 2025-12-10 18:13:13 +01:00
demenik
604bbf5f78 docs: add comments to UI components, HUD, and start screen (#65) 2025-12-10 18:12:36 +01:00
demenik
040b2742ca docs: document grid system and game screen environment (#65) 2025-12-10 18:12:27 +01:00
demenik
49302948d2 docs: add documentation to core, config, and utility modules (#65) 2025-12-10 18:12:06 +01:00
demenik
70720f82e2 fix: Add berries_per_focus_minute to the config test 2025-12-10 17:48:17 +01:00
demenik
5106561503 docs: Change // (regular comment) to /// (doc comment) 2025-12-10 17:46:27 +01:00
Dominik Bernroider
6bd135ca72 Merge branch '67-pom-interaction-trap-prevention' into 'dev'
Implement Pom Interaction Trapping Prevention

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!39
2025-12-10 16:43:19 +00:00
demenik
2dcf2cd133 test: Add integration tests for trapping prevention 2025-12-10 17:38:38 +01:00
demenik
ccab27b933 feat: Prevent player from being trapped by planting 2025-12-10 17:38:25 +01:00
Dominik Bernroider
4942c28f52 Merge branch '64-audio-feedback-at-phase-end' into 'dev'
Implement audio feedback at phase end

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!38
2025-12-10 15:20:15 +00:00
demenik
5376a38288 feat: Add phase end sound effect (#64) 2025-12-10 16:17:41 +01:00
Dominik Bernroider
27884df815 Merge branch '63-grant-berries-as-focus-reward' into 'dev'
Grant berries as focus reward + Notifications

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!37
2025-12-10 14:54:55 +00:00
demenik
a4f5771d57 feat: Add notification for wonder event (#41) 2025-12-10 15:50:51 +01:00
demenik
110b306194 docs: Add system description comment for berry reward system 2025-12-10 15:48:02 +01:00
demenik
53b10d6c0b chore: Capitalize debug print 2025-12-10 15:46:03 +01:00
demenik
0b9cae2dfa fix: Grant focus reward berries at the end of the focus phase 2025-12-10 15:45:38 +01:00
demenik
3b310ea198 fix: Stop granting berries for minutes passed in pause phase 2025-12-10 15:26:11 +01:00
demenik
3a8e16d085 feat: Add notification feature and display notification for berry reward
(#63)
2025-12-10 15:01:29 +01:00
demenik
a20807ce09 feat: Add focus minute berry reward (#63) 2025-12-10 14:11:02 +01:00
demenik
0362620433 feat: Add berries_per_focus_minute option in GameConfig (#63) 2025-12-10 14:00:47 +01:00
Dominik Bernroider
d0643cc6a6 Merge branch '60-new-game-reset-bug' into 'dev'
Fix New Game Reset Bug

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!36
2025-12-10 12:51:50 +00:00