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 |
|
demenik
|
96c76da7f6
|
feat: Add text UI component (#56)
|
2025-11-28 15:48:59 +01:00 |
|
demenik
|
2d0f51ff3d
|
fix: Use UI components for GameScreen settings
|
2025-11-28 15:32:51 +01:00 |
|
demenik
|
202f62b41c
|
fix: Use UI components for inventory
|
2025-11-28 14:56:28 +01:00 |
|
demenik
|
9a1e7cb95a
|
fix: Use flexbox helpers
|
2025-11-28 13:15:14 +01:00 |
|
demenik
|
885bd2aeb0
|
fix: Center UI button content
|
2025-11-28 13:04:56 +01:00 |
|
demenik
|
3ab3c8c2d9
|
feat: Add Flexbox helpers (#56)
|
2025-11-28 12:59:17 +01:00 |
|
demenik
|
5e113717e4
|
fix: Update load popup to use UI components
|
2025-11-28 12:58:57 +01:00 |
|
demenik
|
c540e8a8b7
|
feat: Add pill button (#56)
|
2025-11-28 12:41:49 +01:00 |
|
demenik
|
a2566f3643
|
refactor: Move load savegame popup to savegame feature
|
2025-11-28 12:37:57 +01:00 |
|
demenik
|
cdcb8c08d4
|
fix: Use button component in StartScreen
|
2025-11-28 12:26:34 +01:00 |
|
demenik
|
63dae75761
|
feat: Add button element (#56)
|
2025-11-28 12:21:34 +01:00 |
|
Dominik Bernroider
|
971cf54fa0
|
Merge branch '48-inventory' into 'dev'
Implement Inventory
See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!14
|
2025-11-27 22:16:48 +00:00 |
|
demenik
|
8be97265ee
|
feat: Add inventory display popup (#48)
|
2025-11-27 23:12:07 +01:00 |
|
demenik
|
ca1fe7bcfd
|
merge: Merge remote-tracking branch 'origin/dev' into 48-inventory
|
2025-11-27 21:39:54 +01:00 |
|
Dominik Bernroider
|
5887e46037
|
Merge branch '33-timer-settings' into 'dev'
Implement Timer Settings
See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!13
|
2025-11-27 20:36:12 +00:00 |
|
demenik
|
41cf86063c
|
feat: Implement GameScreen settings with timer settings (#33)
|
2025-11-27 21:30:33 +01:00 |
|
demenik
|
78997acf31
|
feat: Add inventory savegame loading (#48)
|
2025-11-27 18:08:35 +01:00 |
|
demenik
|
afe3b97894
|
feat: Add inventory and item components (#48)
|
2025-11-27 17:47:10 +01:00 |
|
demenik
|
485b2c2907
|
style: Remove unused import
|
2025-11-27 17:39:46 +01:00 |
|
demenik
|
2a17d161f3
|
refactor: Move status to hud
|
2025-11-27 17:33:37 +01:00 |
|
demenik
|
3e04c71e9d
|
refactor: Move load savegame popup to ui folder
|
2025-11-27 17:31:41 +01:00 |
|
Dominik Bernroider
|
8c04f0e484
|
Merge branch '37-savegame-loading' into 'dev'
Savegame loading
See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!12
|
2025-11-27 14:50:10 +00:00 |
|
demenik
|
62bb029084
|
feat: Add savegame deletion (#37)
|
2025-11-27 13:56:30 +01:00 |
|
demenik
|
13fd30b21c
|
refactor: Remove Scroll component from prelude
|
2025-11-27 13:42:33 +01:00 |
|
demenik
|
db8650837a
|
build: Change flake.nix rust version to beta
|
2025-11-27 13:40:57 +01:00 |
|
demenik
|
4cbd477ed6
|
feat: Add savegame loading (#37)
|
2025-11-27 13:40:25 +01:00 |
|
demenik
|
05859d6f9c
|
refactor: Move get_internal_path() out of savegame feature
|
2025-11-26 22:17:25 +01:00 |
|
demenik
|
57a780bff3
|
feat: Load hard-coded savegame file (#37)
|
2025-11-26 22:14:32 +01:00 |
|
Dominik Bernroider
|
2b7f0b39be
|
Merge branch '53-refactor-project-structure' into 'dev'
Refactor project structure
See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!11
|
2025-11-26 19:15:33 +00:00 |
|
demenik
|
0a0122e9b5
|
style: Remove unused import
|
2025-11-26 20:09:46 +01:00 |
|
demenik
|
b63b2d060d
|
refactor: Combine two UiStatusText components into one enum
|
2025-11-26 20:08:55 +01:00 |
|
demenik
|
3b7bfb17e1
|
refactor: Refactor to features (#53)
|
2025-11-26 19:59:53 +01:00 |
|
Dominik Bernroider
|
4c3aeb08ed
|
Merge branch '36-savegame-dumping' into 'dev'
Add savegame dumping
See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!10
|
2025-11-26 17:45:15 +00:00 |
|
demenik
|
b00d8e33f6
|
feat: Add savegame dumping (#36)
|
2025-11-26 18:39:02 +01:00 |
|
demenik
|
f782167e73
|
docs: Update README.md and add MIT License
|
2025-11-24 18:34:08 +01:00 |
|
Dominik Bernroider
|
84370563c2
|
Merge branch '39-game-configuration-fallback' into 'dev'
Resolve "Game Configuration Fallback"
See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!9
|
2025-11-24 17:04:14 +00:00 |
|
demenik
|
a91aefca1f
|
fix: Add default values in assets/config.json
|
2025-11-24 18:03:48 +01:00 |
|
demenik
|
4718271ba2
|
feat: Add configuration fallback #39
|
2025-11-24 18:03:14 +01:00 |
|
Dominik Bernroider
|
09a8282688
|
Merge branch '30-pause-phase' into 'dev'
Resolve "Pause Phase"
See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!8
|
2025-11-24 16:55:25 +00:00 |
|
demenik
|
9665840683
|
feat: Add phases (#30, #31)
|
2025-11-24 17:54:51 +01:00 |
|
demenik
|
ff7cd5698b
|
fix: Pathfinding propagation misuse
|
2025-11-24 15:14:16 +01:00 |
|
Dominik Bernroider
|
d525271b51
|
Merge branch '38-game-configuration' into 'dev'
feat: Game configuration #38
See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!7
|
2025-11-24 13:57:55 +00:00 |
|
demenik
|
626e1d568a
|
feat: Game configuration #38
|
2025-11-24 14:52:20 +01:00 |
|
Dominik Bernroider
|
99c918d6d0
|
Merge branch '50-pom-diagonal-movement-bug' into 'dev'
fix: Pom diagonal movement #50
See merge request softwaregrundprojekt/2025-2026/einzelprojekt/tutorium-moritz/bernroider-dominik/bernroider-dominik!6
|
2025-11-24 12:38:13 +00:00 |
|