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 |
|
demenik
|
58e8dda94a
|
feat: Integrate InteractionAction into Context Menu
|
2025-12-02 12:54:28 +01:00 |
|
demenik
|
1b169b00de
|
feat: Implement InteractionAction system for Pom
|
2025-12-02 12:54:20 +01:00 |
|
demenik
|
c5c4b31d71
|
feat: Add has_item helper to Inventory
|
2025-12-02 12:54:09 +01:00 |
|
demenik
|
3da9931513
|
feat: Allow TileState to hold ItemType (Seeds)
|
2025-12-02 12:53:58 +01:00 |
|
Dominik Bernroider
|
3009d09720
|
Merge branch '25-pom-interactions' into 'dev'
Implement Pom Interactions
See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!21
|
2025-12-01 17:00:30 +00:00 |
|
demenik
|
73382c25a9
|
fix: Add GlobalTransform to Context Menu to fix clicking through the
menu
|
2025-12-01 17:51:33 +01:00 |
|
demenik
|
c567872254
|
style: Remove useless println
|
2025-12-01 17:50:45 +01:00 |
|
demenik
|
a048d9e84c
|
feat: Add placeholder interact menu (#25)
|
2025-12-01 17:49:38 +01:00 |
|
demenik
|
15ea976442
|
feat: Implement interact click logic (#25)
|
2025-12-01 17:05:51 +01:00 |
|
demenik
|
e840e9a78b
|
refactor: Move mouse click to grid position logic into utils.rs
|
2025-12-01 16:59:33 +01:00 |
|
demenik
|
e990957ac0
|
fix: Update toggle TileState debug bind to Shift + LMB instead of only
LMB
|
2025-12-01 16:52:46 +01:00 |
|
Dominik Bernroider
|
08e2502176
|
Merge branch '34-shopping-menu' into 'dev'
Implement Shoppung Menu
See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!20
|
2025-12-01 15:10:34 +00:00 |
|
demenik
|
323f9e1e9e
|
feat: Add berry debug binds
|
2025-12-01 16:00:38 +01:00 |
|
demenik
|
08c5312a85
|
feat: Add shop buy logic (#34)
|
2025-12-01 15:48:08 +01:00 |
|
demenik
|
9d69d8f253
|
feat: Add keybind for shop (#34)
|
2025-12-01 15:20:31 +01:00 |
|
demenik
|
8d2a41fe5c
|
fix: Change description of BerrySeed
|
2025-12-01 15:14:24 +01:00 |
|