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 |
|
demenik
|
9842fe16d6
|
feat: Display shop offers (#34)
|
2025-12-01 15:13:48 +01:00 |
|
demenik
|
f908192c0e
|
fix: Improve button/pill_button UI element to allow any child
|
2025-12-01 14:26:16 +01:00 |
|
demenik
|
7a608516eb
|
feat: Add shop button to HUD (#34)
|
2025-12-01 13:57:31 +01:00 |
|
demenik
|
4b28f80bcb
|
feat: Add shop logic and popup UI (#34). Update config tests and
defaults
|
2025-12-01 13:42:19 +01:00 |
|
Dominik Bernroider
|
91300e3f4d
|
Merge branch '51-berry-seed-type-generation' into 'dev'
Berry Seed Type Generation
See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!19
|
2025-11-30 16:16:44 +00:00 |
|
demenik
|
d250d67b33
|
fix: Add growth_stages for seeds (#51)
|
2025-11-30 17:11:00 +01:00 |
|
demenik
|
710f7beb5a
|
feat: Add seed game config entries (#51)
|
2025-11-30 16:59:23 +01:00 |
|
demenik
|
7337b553ba
|
fix: Add 3 seed variants (#51)
|
2025-11-30 16:40:36 +01:00 |
|
demenik
|
7de1f31b43
|
feat: Add BerrySeed ItemType (#51)
|
2025-11-30 16:31:23 +01:00 |
|
demenik
|
5d73ae3036
|
fix: Add slice names
|
2025-11-30 16:28:56 +01:00 |
|
demenik
|
4412246f2d
|
feat: Add berry sprite (#51)
|
2025-11-30 16:26:47 +01:00 |
|
demenik
|
746f57e170
|
feat: Add seed texture (#51)
|
2025-11-30 15:57:33 +01:00 |
|
Dominik Bernroider
|
5e0664d15e
|
Merge branch '55-create-tests' into 'dev'
Create tests and CI
See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!18
|
2025-11-29 18:02:51 +00:00 |
|
demenik
|
4a4c60a9ed
|
ops: Add automatic test runs and building for linux x86_64
|
2025-11-29 18:57:31 +01:00 |
|
demenik
|
c69649f1ae
|
feat: Add all tests from #55 except sowing, watering, and harvesting
|
2025-11-29 18:40:37 +01:00 |
|
demenik
|
2547fae542
|
docs: Correct link in README.md
|
2025-11-29 16:28:22 +01:00 |
|
Dominik Bernroider
|
4e764afea0
|
Merge branch '52-move-and-interaction-click-outside-of-grid' into 'dev'
Fix move/interaction click handling
See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!17
|
2025-11-29 15:27:38 +00:00 |
|
demenik
|
90b6785bad
|
refactor: Remove dbg prints in ui_blocks()
|
2025-11-29 16:19:08 +01:00 |
|
demenik
|
c3ef1f5315
|
refactor: Move ui_blocks() to ui feature
|
2025-11-29 16:17:40 +01:00 |
|
demenik
|
7db11e9065
|
fix: Fix #52 (Move/interaction click outside grid) and fix
move/interaction click through popups
|
2025-11-29 16:08:51 +01:00 |
|
Moritz Peter Maile
|
151ff44135
|
Merge branch 'dev' into 'main'
Merge Sprint 2
See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!16
|
2025-11-28 16:37:06 +00:00 |
|
Dominik Bernroider
|
668b7e9cdc
|
Merge branch '56-add-ui-library' into 'dev'
Add UI Library
See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!15
|
2025-11-28 14:57:03 +00:00 |
|
demenik
|
1dcf505d69
|
fix: Add padding to HUD buttons
|
2025-11-28 15:52:53 +01:00 |
|
demenik
|
6536d54972
|
fix: Use button UI component in HUD
|
2025-11-28 15:51:28 +01:00 |
|