Commit Graph

151 Commits

Author SHA1 Message Date
demenik
14cd5419ac feat: Add wonder_event_url to GameConfig 2025-12-09 15:20:42 +01:00
Dominik Bernroider
5b734e6567 Merge branch '59-popup-and-context-menu-ui-element' into 'dev'
Popup and Context Menu UI Element

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!30
2025-12-09 12:47:49 +00:00
demenik
11bd858fa8 refactor: Use Node::from_padding helper 2025-12-09 13:46:56 +01:00
demenik
e2b6e6ab0a feat: Use spawn_context_menu in features/pom 2025-12-09 13:34:12 +01:00
demenik
bd89ac7435 feat: Add spawn_context_menu to prelude.rs 2025-12-09 13:30:20 +01:00
demenik
21f3359077 feat: Add context menu UI element 2025-12-09 13:29:18 +01:00
demenik
d9a1c9c2a7 feat: Replace old popup with new UI element 2025-12-09 13:21:51 +01:00
demenik
c50601c23a fix: Make popup child a closure 2025-12-09 13:06:01 +01:00
demenik
667cc127ba feat: Add helper to flexbox 2025-12-08 17:28:05 +01:00
demenik
23abbbfa02 fix: Add flex_direction and row_gap to popup 2025-12-08 17:24:56 +01:00
demenik
70768daf82 fix: Fix popup title type 2025-12-08 17:14:14 +01:00
demenik
81a7a5d76b feat: Add popup helper (#59) 2025-12-08 17:04:58 +01:00
Dominik Bernroider
88e12233bd Merge branch '57-exit-popups-with-escape' into 'dev'
Exit popups with Escape

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!29
2025-12-08 13:56:35 +00:00
demenik
881300e0a6 feat: close popups with escape key 2025-12-08 14:52:58 +01:00
demenik
4f41d89f63 chore: switch to stable rust toolchain 2025-12-08 14:52:40 +01:00
Moritz Peter Maile
1581bae4ff Merge branch 'dev' into 'main'
Merge Sprint 3

Closes #52

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!28
2025-12-05 13:04:10 +00:00
Dominik Bernroider
1d7be4e3a0 Merge branch '29-harvesting-crops' into 'dev'
Implement harvesting crops

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!27
2025-12-03 21:54:39 +00:00
demenik
5605d39f56 refactor: Extract shared test setup to common module 2025-12-03 22:45:59 +01:00
demenik
a134851bd2 style: Format code 2025-12-03 22:42:29 +01:00
demenik
5cc21114db refactor: Split interaction tests into multiple files 2025-12-03 22:40:18 +01:00
demenik
f8c14cb82d test: Fix interaction tests for harvesting update 2025-12-03 22:34:07 +01:00
demenik
48b3f475b2 test: Add crop harvesting tests 2025-12-03 22:33:53 +01:00
demenik
8904177869 feat: Implement crop harvesting mechanics 2025-12-03 22:33:36 +01:00
Dominik Bernroider
5367971e1d Merge branch '28-crop-withering' into 'dev'
Implement crop withering

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!26
2025-12-02 18:18:04 +00:00
demenik
0002cafa32 test: Add crop withering tests (#28) 2025-12-02 19:05:37 +01:00
demenik
14d858786b feat: Visualize withered crops (#28) 2025-12-02 19:05:27 +01:00
demenik
d2db146eb6 feat: Implement crop withering mechanics (#28) 2025-12-02 19:05:11 +01:00
Dominik Bernroider
6b28ce7ab1 Merge branch '49-crop-growth' into 'dev'
Implement crop growth

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!25
2025-12-02 16:50:50 +00:00
demenik
9ddd24c282 test: Add growth mechanics tests 2025-12-02 17:05:43 +01:00
demenik
715031d570 feat: Visualise crop growth 2025-12-02 17:04:57 +01:00
demenik
824e4a98e4 feat: Implement crop growth logic on phase change 2025-12-02 17:04:48 +01:00
demenik
7f134ce696 feat: Add growth_stage to TileState 2025-12-02 17:04:31 +01:00
Dominik Bernroider
3a069ad17d Merge branch '27-watering-crops' into 'dev'
Implement watering crops

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!24
2025-12-02 15:25:04 +00:00
demenik
76a0c4340c refactor: Refactor interaction option logic 2025-12-02 16:22:12 +01:00
demenik
c60b2ce2b3 fix: Set transform z-index to fix rendering issues 2025-12-02 16:18:50 +01:00
demenik
4df968af2e feat: Add watering (#27) 2025-12-02 15:46:48 +01:00
demenik
d07dcc3e7c fix: Add missing slice name 2025-12-02 15:43:28 +01:00
demenik
31df3c0d3f feat: Add water sprite 2025-12-02 15:42:14 +01:00
demenik
99756820e0 fix: Delete stale font files 2025-12-02 15:36:38 +01:00
demenik
999b7723a8 feat: Add custom font 2025-12-02 15:35:52 +01:00
Dominik Bernroider
2183d22e7e Merge branch '58-movement-path-visualisation' into 'dev'
Add path visualisation

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!23
2025-12-02 13:50:21 +00:00
demenik
c4f0543bb6 feat: Add path visualisation (#58) 2025-12-02 14:48:03 +01:00
Dominik Bernroider
6d25c5b9ad Merge branch '26-planting-crops' into 'dev'
Implement planting crops

See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!22
2025-12-02 13:13:54 +00:00
demenik
87bea528e7 refactor: Remove debug println 2025-12-02 14:02:10 +01:00
demenik
f42f4e1cf7 feat: Display crop sprite (#26) 2025-12-02 13:47:22 +01:00
demenik
61c2622379 refactor: Remove dbg print 2025-12-02 13:41:47 +01:00
demenik
e2b0284a5c fix: Add crop sprite slice 2025-12-02 13:16:07 +01:00
demenik
86de2e5fe7 feat: Add crop sprite (#26) 2025-12-02 13:15:08 +01:00
demenik
e59c3926b2 fix: Fix interaction and pathfinding tests 2025-12-02 13:02:42 +01:00
demenik
16118a1970 test: Add interaction tests 2025-12-02 12:54:42 +01:00