Commit Graph

Select branches

Hide Pull Requests

feat/fullscreen-web

main

Mono Color

• 872786c8e3 Merge branch 'feat/walking-players' into 'main' Haiden Niklas 2026-05-08 12:36:56 +00:00
• 91d02e073b Merge branch 'main' into 'feat/walking-players' Haiden Niklas 2026-05-08 12:35:02 +00:00
• b1aa4fe435 Merge branch 'main' into feat/endscreen Kevin Baumgartner 2026-05-08 14:34:51 +02:00
• 5712715420 feat(endscreen): create structure for endscreen Kevin Baumgartner 2026-05-08 14:34:06 +02:00
• a96dfefa07 feat(actors): implement needed functions for the actors Niklas Haiden 2026-05-08 14:33:05 +02:00
• 39cf7c6a24 Merge branch 'feat/startscreen' into 'main' Haiden Niklas 2026-05-08 12:31:04 +00:00
• a2185273f3 fix: readd missing file Niklas Haiden 2026-05-08 14:30:33 +02:00
• 011cb867b3 Merge branch 'main' into feat/startscreen Kevin Baumgartner 2026-05-08 13:54:57 +02:00
• 8c454edd5b feat(startscreen): change ui texts from german to english and fix button click event Kevin Baumgartner 2026-05-08 13:50:42 +02:00
• 09d72d0206 Merge branch 'feat/hud' into 'main' Haiden Niklas 2026-05-08 08:32:10 +00:00
• cb5f40dbc4 feat: HUD & SETTINGS Berger Lena 2026-05-07 22:22:18 +02:00
• 0194438b38 Merge branch 'main' into feat/startscreen Kevin Baumgartner 2026-05-07 22:21:02 +02:00
• b15c5b5e28 feat(text_input): switch color definitions to settings file Kevin Baumgartner 2026-05-07 22:18:10 +02:00
• 2788d352d0 feature: HUD Berger Lena 2026-05-07 22:14:52 +02:00
• 74139aa63d feat(actor): implement player / actor class Niklas Haiden 2026-05-07 22:07:15 +02:00
• 496c74fed2 feat(text_input): add text input on start screen and temporary test Kevin Baumgartner 2026-05-07 22:00:29 +02:00
• 34cfa3c8c3 Merge branch 'feat/ects' into 'main' Haiden Niklas 2026-05-07 19:25:18 +00:00
• f28356d0ae Merge branch 'main' into feat/startscreen Kevin Baumgartner 2026-05-07 21:24:46 +02:00
• 8bb05de946 feature: ECTS upgrade mechanic Berger Lena 2026-05-07 21:23:56 +02:00
• 4f5f5d0b62 Merge branch 'feat/text_input' into 'main' Haiden Niklas 2026-05-07 19:23:53 +00:00
• ad7e18c024 feature: ects upgrade mechanic Berger Lena 2026-05-07 21:23:27 +02:00
• f0bf7bcff3 Merge branch 'main' into feat/text_input Kevin Baumgartner 2026-05-07 21:22:43 +02:00
• 7a47237e09 Merge branch 'refs/heads/main' into feat/walking-players Niklas Haiden 2026-05-07 21:21:07 +02:00
• 7c576806b2 feature: ECTS generation Berger Lena 2026-05-07 21:19:55 +02:00
• 387a328b1c feat(text_input): add event handler function (mouse and keyboard input) Kevin Baumgartner 2026-05-07 21:19:42 +02:00
• 74b0af92fd add some settings for the sprite assets Niklas Haiden 2026-05-07 21:19:26 +02:00
• 2c58ebce65 Merge branch 'feat/map' into 'main' Haiden Niklas 2026-05-07 19:18:07 +00:00
• db64d956b3 map layout changes Lukas Kammerhofer 2026-05-07 21:17:12 +02:00
• 342c086852 feature: ECTS basic mechanic Berger Lena 2026-05-07 21:12:48 +02:00
• b625acdd60 feat(text_input): add draw function Kevin Baumgartner 2026-05-07 21:12:02 +02:00
• dbbd40b58a feat(text_input): add text input class with initialization Kevin Baumgartner 2026-05-07 20:55:22 +02:00
• da184af639 pygame.init() to display the first map Lukas Kammerhofer 2026-05-07 20:52:34 +02:00
• e262b982e0 Merge branch 'feat/door_basic_mechanic' into 'main' Haiden Niklas 2026-05-07 18:48:54 +00:00
• 9b74401b08 feature: door basic mechanic Berger Lena 2026-05-07 20:47:42 +02:00
• 4207ebc45a wall border and sticky description Lukas Kammerhofer 2026-05-07 20:45:07 +02:00
• e63cf0f639 Merge branch 'main' into feat/startscreen Kevin Baumgartner 2026-05-07 20:43:00 +02:00
• 6d6fbc895b feat(startscreen): add comments Kevin Baumgartner 2026-05-07 20:39:17 +02:00
• dee0abefbc Merge branch 'feat/desk' into 'main' Haiden Niklas 2026-05-07 18:37:12 +00:00
• 9fc7a2cbda feature: desk basic mechanic Haiden Niklas 2026-05-07 18:37:12 +00:00
• 5e7a3197c0 def draw_map to display the map Lukas Kammerhofer 2026-05-07 20:37:08 +02:00
• 9ddfa8ce74 feat(startscreen): add reaction on button events Kevin Baumgartner 2026-05-07 20:30:26 +02:00
• 9cb8bd2d24 Merge branch 'feat/add-niklas-sprites' into 'main' Haiden Niklas 2026-05-07 18:14:30 +00:00
• c45987636e feat(player): add niklas as playable character in sprites folder Niklas Haiden 2026-05-07 20:13:33 +02:00
• af1b44c7be feat(startscreen): add start and quit buttons on startscreen Kevin Baumgartner 2026-05-07 20:11:13 +02:00
• 72684f8e5f Merge remote-tracking branch 'origin/feat/map' into feat/map Lukas Kammerhofer 2026-05-07 20:06:29 +02:00
• 9200b8257f tile accedd control function + tile update Lukas Kammerhofer 2026-05-07 20:02:35 +02:00
• ebce7c3dcd feat(startscreen): implement button draw method Kevin Baumgartner 2026-05-07 19:54:49 +02:00
• febccb1826 Merge branch 'feat/table-asset' into 'main' Haiden Niklas 2026-05-07 17:51:44 +00:00
• 18e8d32f99 feat: add table asset Haiden Niklas 2026-05-07 17:51:44 +00:00
• 7c6d8594d7 function:get_tile - check if in map Lukas Kammerhofer 2026-05-07 19:48:55 +02:00
• 833c735d38 add room description Lukas Kammerhofer 2026-05-07 19:44:40 +02:00
• 83dcf7b51c map basic tile structure Lukas Kammerhofer 2026-05-07 19:33:12 +02:00
• 40ae16e467 Map-Start, safe commit Lukas Kammerhofer 2026-05-07 19:25:05 +02:00
• 75741f18ee defined colors and tile/screen size Lukas Kammerhofer 2026-05-07 19:13:11 +02:00
• 796bb5532f initial commit Lukas Kammerhofer 2026-05-07 19:06:36 +02:00
• f67f349a5e function:get_tile - check if in map Lukas Kammerhofer 2026-05-07 19:48:55 +02:00
• dbd98d4533 feat(startscreen): add button initialization Kevin Baumgartner 2026-05-07 19:47:31 +02:00
• 884cb153e8 add room description Lukas Kammerhofer 2026-05-07 19:44:40 +02:00
• 37c9f2fc59 Merge branch 'feat/better-readme' into 'main' Haiden Niklas 2026-05-07 17:44:15 +00:00
• 0bb5b3b104 chore: update README with coding guidelines, and a short description Haiden Niklas 2026-05-07 17:44:15 +00:00
• 6f3439045c feature: door basic mechanic Berger Lena 2026-05-07 19:39:09 +02:00
• 49c6d485db feat(startscreen): add exit/quit functionality Kevin Baumgartner 2026-05-07 19:38:16 +02:00
• 7723f5b17e Merge remote-tracking branch 'origin/main' Berger Lena 2026-05-07 19:36:41 +02:00
• 80c56ad447 feat(startscreen): add title and welcome message Kevin Baumgartner 2026-05-07 19:35:09 +02:00
• c8430ac7f4 map basic tile structure Lukas Kammerhofer 2026-05-07 19:33:12 +02:00
• cc06400c56 Map-Start, safe commit Lukas Kammerhofer 2026-05-07 19:25:05 +02:00
• bdd633ff85 defined colors and tile/screen size Lukas Kammerhofer 2026-05-07 19:13:11 +02:00
• b2ba681fb5 initial commit Lukas Kammerhofer 2026-05-07 19:06:36 +02:00
• 8f68bf841d feat(startscreen): add class for buttons Kevin Baumgartner 2026-05-07 19:25:16 +02:00
• 0dd5e2946a Merge branch 'feat/add-person-assets' into 'main' Haiden Niklas 2026-05-07 17:18:06 +00:00
• a830ba8565 feature: door basic mechanic Berger Lena 2026-05-07 19:17:09 +02:00
• deff75bda3 add file for startscreen Kevin Baumgartner 2026-05-07 19:05:18 +02:00
• b73c306395 feat(assets-sprite): add sprite assets for walking persons Niklas Haiden 2026-05-07 18:58:57 +02:00
• 8611e22e85 feat: init pygame Niklas Haiden 2026-05-07 18:51:31 +02:00
• a95033d3af init stuff Niklas Haiden 2026-05-07 18:11:41 +02:00
• eb7eb68dbb Initial commit Haiden Niklas 2026-05-07 16:06:41 +00:00