Commit Graph

  • 64e56af504 Refactor Journal Script refactor Minz 2023-07-16 23:09:17 +02:00
  • 1f57632e84 Fixed typos master Minz 2023-07-09 18:17:10 +02:00
  • de85096631 Add icon Minz 2023-07-09 18:06:53 +02:00
  • 4b3ccb6139 Polishing Minz 2023-07-09 18:00:40 +02:00
  • 7533ac13a5 Improved win/loss scene Minz 2023-07-09 17:34:41 +02:00
  • 379d44e5b4 Change exit dialog icon Minz 2023-07-09 17:27:00 +02:00
  • e103b23b4a Merge Journal audio into main Minz 2023-07-09 17:24:10 +02:00
  • 243fddc069 Merge pull request #24 from JanGross/ui_graphics Minz 2023-07-09 17:17:58 +02:00
  • 642aded8bd Merge branch 'master' into ui_graphics Minz 2023-07-09 17:17:29 +02:00
  • fa11bd0584 Add Journal Audio Minz 2023-07-09 17:15:58 +02:00
  • 71a14c5bb6 Merge pull request #23 from JanGross/character_sheet_fix Amaan Shawkath 2023-07-09 16:06:18 +01:00
  • 25c404abc4 unblocking mouse on character sheet close character_sheet_fix Amaan Shawkath 2023-07-09 16:06:00 +01:00
  • 56c6c5489b Merge pull request #22 from JanGross/sfx_and_camera_fixes Amaan Shawkath 2023-07-09 15:58:34 +01:00
  • d023634369 - changed camera so it only moves on a right click - added sfx to characters talking - added character sprite to dialogue panel sfx_and_camera_fixes Amaan Shawkath 2023-07-09 15:57:31 +01:00
  • 5cc04c2a15 Merge pull request #21 from JanGross/ui_graphics Minz 2023-07-09 16:50:11 +02:00
  • e15d9f610e Add custom cursors Minz 2023-07-09 16:49:21 +02:00
  • 8343609794 Merge branch 'master' of https://github.com/JanGross/gmtk-2023 Minz 2023-07-09 16:16:02 +02:00
  • ce3384c82d DIsable camera lock Minz 2023-07-09 16:15:48 +02:00
  • 7c7e0705cd Merge pull request #20 from JanGross/bugfix_win_state Minz 2023-07-09 16:05:34 +02:00
  • 33d88a7dec Fix win scne not reachable bugfix_win_state Minz 2023-07-09 16:04:26 +02:00
  • 67b2813b88 Merge pull request #19 from JanGross/ui_graphics Minz 2023-07-09 15:54:47 +02:00
  • c52c9f5a72 Fixed text spacing Minz 2023-07-09 15:53:42 +02:00
  • e6ba085a1c Add avatars and fix journal layout Minz 2023-07-09 15:29:26 +02:00
  • 82baf3db3c Add UI Images Minz 2023-07-09 15:07:23 +02:00
  • 2233a2f17b Setup UI Manager Minz 2023-07-09 14:31:24 +02:00
  • b971d81e0f Merge pull request #18 from JanGross/bug_fixes Amaan Shawkath 2023-07-09 13:26:37 +01:00
  • d00929c814 Fixed You can click on characters whilst the journal is open You can click on characters whilst selecting dialog options bug_fixes Amaan Shawkath 2023-07-09 13:25:47 +01:00
  • b71111ed12 Implement win/loss states Minz 2023-07-09 14:18:19 +02:00
  • 6b5f52a71f Merge pull request #17 from JanGross/level_design Minz 2023-07-09 13:25:33 +02:00
  • e9f3edd5fb Add Tables level_design Minz 2023-07-09 13:24:59 +02:00
  • 9352395987 Level blocking Minz 2023-07-09 13:03:32 +02:00
  • a0fe5e7bf7 Merge pull request #16 from JanGross/gfx Minz 2023-07-09 12:30:53 +02:00
  • 1e373edbf1 Updated character graphics gfx Minzkraut 2023-07-09 12:28:10 +02:00
  • 720ce6debe Merge pull request #15 from JanGross/journal_ui_adventuers Minz 2023-07-09 12:25:34 +02:00
  • 41b28e9efe Populate adventurer CV journal_ui_adventuers Minz 2023-07-09 12:25:06 +02:00
  • 4cc6d4fc39 Merge branch 'master' into journal_ui journal_ui Minz 2023-07-09 12:08:58 +02:00
  • a00e4a6e98 Fix quest retry Minz 2023-07-09 12:05:51 +02:00
  • e9bb26f4d9 Merge branch 'master' into gfx Minzkraut 2023-07-09 12:01:29 +02:00
  • 96007ac7da Merge branch 'master' into gfx Minzkraut 2023-07-09 12:00:24 +02:00
  • f9f611ab92 Merge pull request #14 from JanGross/gfx Minz 2023-07-09 11:48:37 +02:00
  • efd7c9448c Add Rufus and Adventure Cat graphics Minzkraut 2023-07-09 11:47:14 +02:00
  • 2c5c58f9ea Remove dupe Derk character material Minz 2023-07-09 11:44:15 +02:00
  • 3a01324d13 Spawn adventurers when fade is at midpoint Minz 2023-07-09 11:42:15 +02:00
  • dbb44e6b6f Merge pull request #13 from JanGross/adventurers Minz 2023-07-09 11:20:15 +02:00
  • fde0d28d93 Add Adventurer prefabs adventurers Minz 2023-07-09 11:18:24 +02:00
  • 0e50052e5b Merge pull request #12 from JanGross/dialogue_tweaks Amaan Shawkath 2023-07-09 10:15:28 +01:00
  • 35fe3559d6 Adding name revealling once you ask "who are you?" dialogue_tweaks Amaan Shawkath 2023-07-09 10:13:57 +01:00
  • 68fdc026de Get Dialog controller from GM Minz 2023-07-09 11:11:24 +02:00
  • d17c7b59e3 Setup "Click to exit" on the dialogue to prevent snapping on end Amaan Shawkath 2023-07-09 10:07:14 +01:00
  • d2bea3814a Added close button to character sheet - oooopsies Amaan Shawkath 2023-07-09 10:06:01 +01:00
  • 9114b0a5fa Fix billboardbehaviour being flipped Minz 2023-07-09 11:05:43 +02:00
  • ee62e86863 Move adventurer graphics into Assets Minz 2023-07-09 10:39:42 +02:00
  • b8bb233eb0 Merge pull request #11 from JanGross/gfx Minz 2023-07-09 10:33:41 +02:00
  • 6121fb7fef Merge branch 'master' of https://github.com/JanGross/gmtk-2023 Minz 2023-07-09 10:32:04 +02:00
  • e8a3919321 Add retry quest option questing_logic Minz 2023-07-09 10:25:52 +02:00
  • 576a873a02 Add pingpong fade Minz 2023-07-09 10:25:40 +02:00
  • 714222ebea Added multiple character graphics Adena Amadeus Minzkraut 2023-07-09 00:12:42 +02:00
  • 2e8918e6c0 Implemet quest completion Minz 2023-07-09 00:10:43 +02:00
  • a9fbeef0b4 Implemet quest completion Minz 2023-07-09 00:10:43 +02:00
  • 30d9d7f1ec Fix journal opening during dialog Minz 2023-07-08 23:01:49 +02:00
  • 9a62b3ad3d Fix journal UI scaling Minzkraut 2023-07-08 22:38:35 +02:00
  • 6bbadefa3e Fix journal UI scaling Minzkraut 2023-07-08 22:38:35 +02:00
  • 77aaf1e0a7 Merge pull request #7 from JanGross/character_panel_tweaks Amaan Shawkath 2023-07-08 21:37:01 +01:00
  • bbcb6861c8 Hiding dialogue once its finished character_panel_tweaks Amaan Shawkath 2023-07-08 21:33:03 +01:00
  • 6baef62be1 Updated character sheet so it only displays when the dialogue has been completed Amaan Shawkath 2023-07-08 21:32:46 +01:00
  • e2e4f55caa Merge pull request #6 from JanGross/start_scene_and_tweak Amaan Shawkath 2023-07-08 21:19:32 +01:00
  • 18a52946c3 Setting the buttons not interactable once its been asked start_scene_and_tweak Amaan Shawkath 2023-07-08 21:16:05 +01:00
  • b5d179658b Adding main menu and main scene to build settings Amaan Shawkath 2023-07-08 21:11:37 +01:00
  • d9e90cae03 Added simple main menu with start button - needs fleshing out Amaan Shawkath 2023-07-08 21:07:08 +01:00
  • 11d735b813 Fix journal adventurer selection Minzkraut 2023-07-08 21:59:37 +02:00
  • 532d3c167a Fix journal adventurer selection managers Minzkraut 2023-07-08 21:59:37 +02:00
  • f81ff1b192 Move character sheet up Minzkraut 2023-07-08 21:19:54 +02:00
  • 8210ef30ac Merge Journal, Quest and Dialog systems Minzkraut 2023-07-08 21:08:01 +02:00
  • 8ed8fcd04f Rename QuestlogInteractable Minzkraut 2023-07-08 20:03:21 +02:00
  • 2bb5024dfb removing gameobjects folder and moving character manager Amaan Shawkath 2023-07-08 18:54:36 +01:00
  • c55f67606d Adding in the characters Added debug buttons to cycle through the characters Bug fixes Amaan Shawkath 2023-07-08 18:50:49 +01:00
  • 988621b810 Cleaning up using statements Amaan Shawkath 2023-07-08 18:17:07 +01:00
  • f04a485434 Added image attribute to character data Amaan Shawkath 2023-07-08 18:16:28 +01:00
  • 37d0c66887 Added public getter for character sheets Amaan Shawkath 2023-07-08 18:16:13 +01:00
  • afe6a6592a Improved logic for character sheets added a way to retrieve sheets for characters Amaan Shawkath 2023-07-08 18:06:06 +01:00
  • ba34c89c8b basic setup of a character sheet - needs some more work Wiring up character interviewed Added property for bulletized text - ready to add when we have some Amaan Shawkath 2023-07-08 17:08:45 +01:00
  • 430118d0f8 setting up character manager Amaan Shawkath 2023-07-08 17:06:32 +01:00
  • 0dce5e2751 Move character sheet up Minzkraut 2023-07-08 21:19:54 +02:00
  • fd68064b16 Merge Journal, Quest and Dialog systems Minzkraut 2023-07-08 21:08:01 +02:00
  • 34fb3715f3 Rename QuestlogInteractable Minzkraut 2023-07-08 20:03:21 +02:00
  • 6b6c3cf49f Merge pull request #4 from JanGross/character_sheet_improvements Amaan Shawkath 2023-07-08 19:01:42 +01:00
  • ab1c3d1e26 removing gameobjects folder and moving character manager character_sheet_improvements Amaan Shawkath 2023-07-08 18:54:36 +01:00
  • 4697a647ef Adding in the characters Added debug buttons to cycle through the characters Bug fixes Amaan Shawkath 2023-07-08 18:50:49 +01:00
  • a783d63d2d Add Derk Graphics Minzkraut 2023-07-08 19:27:14 +02:00
  • 7ab1e2cf4c Cleaning up using statements Amaan Shawkath 2023-07-08 18:17:07 +01:00
  • ae768baaaa Added image attribute to character data Amaan Shawkath 2023-07-08 18:16:28 +01:00
  • 4d086fd5b9 Added public getter for character sheets Amaan Shawkath 2023-07-08 18:16:13 +01:00
  • c4b5d7dac3 Improved logic for character sheets added a way to retrieve sheets for characters Amaan Shawkath 2023-07-08 18:06:06 +01:00
  • 0e5c432dd5 Add questLog interactable Minzkraut 2023-07-08 18:08:18 +02:00
  • 3da424b722 Merge pull request #3 from JanGross/character_sheet_setup Amaan Shawkath 2023-07-08 17:09:04 +01:00
  • be5e2556c6 basic setup of a character sheet - needs some more work Wiring up character interviewed Added property for bulletized text - ready to add when we have some character_sheet_setup Amaan Shawkath 2023-07-08 17:08:45 +01:00
  • fab8aa77d7 Add questLog interactable Minzkraut 2023-07-08 18:08:18 +02:00
  • 92fd23b6f0 setting up character manager Amaan Shawkath 2023-07-08 17:06:32 +01:00
  • e76854a100 Merge pull request #2 from JanGross/main Minz 2023-07-08 17:13:04 +02:00
  • 5c674c41a4 Merge branch 'master' into main main Minz 2023-07-08 17:12:43 +02:00