Commit Graph
30 Commits
Author SHA1 Message Date
Haiden Niklas e72ec2426f Merge branch 'feat/endscreen' into 'main'
feat: implement endscreen finally

See merge request swd25-bootcamp/silent-fh!25
2026-05-08 16:21:10 +00:00
Haiden Niklas ade975e74d Merge branch 'feat/tower' into 'main'
feat: implement tower with book functionality

See merge request swd25-bootcamp/silent-fh!24
2026-05-08 16:13:41 +00:00
Haiden Niklas 81174eb793 Merge branch 'feat/startscreen' into 'main'
feat: implement highscore display in startscreen

See merge request swd25-bootcamp/silent-fh!23
2026-05-08 15:40:20 +00:00
Haiden Niklas b3923719fd Merge branch 'feat/shop-system' into 'main'
feat: implement a basic shop system

See merge request swd25-bootcamp/silent-fh!22
2026-05-08 15:29:35 +00:00
Haiden Niklas f5a789842c Merge branch 'feat/map' into 'main'
feat: implement towers

See merge request swd25-bootcamp/silent-fh!21
2026-05-08 15:14:52 +00:00
Haiden Niklas 85df16408e Merge branch 'feat/highscore' into 'main'
feat: implement highscore screen

See merge request swd25-bootcamp/silent-fh!20
2026-05-08 15:00:09 +00:00
Haiden Niklas 6463d3d215 Merge branch 'feat/items' into 'main'
feat: item

See merge request swd25-bootcamp/silent-fh!19
2026-05-08 14:24:02 +00:00
Haiden Niklas 613dfb88ee Merge branch 'feat/assets-for-gameplay' into 'main'
feat(assets): add some more assets for items and tower who throws items

See merge request swd25-bootcamp/silent-fh!18
2026-05-08 14:02:46 +00:00
Haiden Niklas 26d71ef633 feat(assets): add some more assets for items and tower who throws items 2026-05-08 14:02:46 +00:00
Haiden Niklas be38a927dc Merge branch 'feat/endscreen' into 'main'
feat: implement endscreen

See merge request swd25-bootcamp/silent-fh!16
2026-05-08 13:50:53 +00:00
Haiden Niklas 91ea521d12 Merge branch 'feat/game_loop' into 'main'
feat: implement a basic gameloop

See merge request swd25-bootcamp/silent-fh!17
2026-05-08 13:35:05 +00:00
Haiden Niklas acd1593ec2 Merge branch 'main' into 'feat/game_loop' 2026-05-08 13:34:15 +00:00
Haiden Niklas 19f048c650 Merge branch 'feat/hud' into 'main'
feat: HUD

See merge request swd25-bootcamp/silent-fh!15
2026-05-08 13:18:28 +00:00
Haiden Niklas 872786c8e3 Merge branch 'feat/walking-players' into 'main'
feat: walking players implementation

See merge request swd25-bootcamp/silent-fh!13
2026-05-08 12:36:56 +00:00
Haiden Niklas 91d02e073b Merge branch 'main' into 'feat/walking-players' 2026-05-08 12:35:02 +00:00
Haiden Niklas 39cf7c6a24 Merge branch 'feat/startscreen' into 'main'
feat: implement startscreen

See merge request swd25-bootcamp/silent-fh!6
2026-05-08 12:31:04 +00:00
Haiden Niklas 09d72d0206 Merge branch 'feat/hud' into 'main'
feature: HUD

See merge request swd25-bootcamp/silent-fh!12
2026-05-08 08:32:10 +00:00
Haiden Niklas 34cfa3c8c3 Merge branch 'feat/ects' into 'main'
feature: ECTS basic mechanic

See merge request swd25-bootcamp/silent-fh!11
2026-05-07 19:25:18 +00:00
Haiden Niklas 4f5f5d0b62 Merge branch 'feat/text_input' into 'main'
feat: implement text input

See merge request swd25-bootcamp/silent-fh!10
2026-05-07 19:23:53 +00:00
Haiden Niklas 2c58ebce65 Merge branch 'feat/map' into 'main'
feat: implement basic map structure

See merge request swd25-bootcamp/silent-fh!4
2026-05-07 19:18:07 +00:00
Haiden Niklas e262b982e0 Merge branch 'feat/door_basic_mechanic' into 'main'
feature: door basic mechanic

See merge request swd25-bootcamp/silent-fh!9
2026-05-07 18:48:54 +00:00
Haiden Niklas dee0abefbc Merge branch 'feat/desk' into 'main'
feature: desk basic mechanic

See merge request swd25-bootcamp/silent-fh!7
2026-05-07 18:37:12 +00:00
Haiden Niklas 9fc7a2cbda feature: desk basic mechanic 2026-05-07 18:37:12 +00:00
Haiden Niklas 9cb8bd2d24 Merge branch 'feat/add-niklas-sprites' into 'main'
feat(player): add niklas as playable character in sprites folder

See merge request swd25-bootcamp/silent-fh!8
2026-05-07 18:14:30 +00:00
Haiden Niklas febccb1826 Merge branch 'feat/table-asset' into 'main'
feat: add table asset

See merge request swd25-bootcamp/silent-fh!5
2026-05-07 17:51:44 +00:00
Haiden Niklas 18e8d32f99 feat: add table asset 2026-05-07 17:51:44 +00:00
Haiden Niklas 37c9f2fc59 Merge branch 'feat/better-readme' into 'main'
chore: update README with coding guidelines, and a short description

See merge request swd25-bootcamp/silent-fh!2
2026-05-07 17:44:15 +00:00
Haiden Niklas 0bb5b3b104 chore: update README with coding guidelines, and a short description 2026-05-07 17:44:15 +00:00
Haiden Niklas 0dd5e2946a Merge branch 'feat/add-person-assets' into 'main'
feat(assets-sprite): add sprite assets for walking persons

See merge request swd25-bootcamp/silent-fh!1
2026-05-07 17:18:06 +00:00
Haiden Niklas eb7eb68dbb Initial commit 2026-05-07 16:06:41 +00:00