Commit Graph

78 Commits

Author SHA1 Message Date
Amaan Shawkath
d00929c814 Fixed
You can click on characters whilst the journal is open
You can click on characters whilst selecting dialog options

Added sfx option to character data
2023-07-09 13:25:47 +01:00
6b5f52a71f Merge pull request #17 from JanGross/level_design
Level design
2023-07-09 13:25:33 +02:00
e9f3edd5fb Add Tables 2023-07-09 13:24:59 +02:00
9352395987 Level blocking 2023-07-09 13:03:32 +02:00
a0fe5e7bf7 Merge pull request #16 from JanGross/gfx
Updated character graphics
2023-07-09 12:30:53 +02:00
1e373edbf1 Updated character graphics 2023-07-09 12:28:10 +02:00
720ce6debe Merge pull request #15 from JanGross/journal_ui_adventuers
Populate adventurer CV
2023-07-09 12:25:34 +02:00
41b28e9efe Populate adventurer CV 2023-07-09 12:25:06 +02:00
a00e4a6e98 Fix quest retry 2023-07-09 12:05:51 +02:00
e9bb26f4d9 Merge branch 'master' into gfx 2023-07-09 12:01:29 +02:00
96007ac7da Merge branch 'master' into gfx 2023-07-09 12:00:24 +02:00
f9f611ab92 Merge pull request #14 from JanGross/gfx
Add Rufus and Adventure Cat graphics
2023-07-09 11:48:37 +02:00
efd7c9448c Add Rufus and Adventure Cat graphics 2023-07-09 11:47:14 +02:00
2c5c58f9ea Remove dupe Derk character material 2023-07-09 11:44:15 +02:00
3a01324d13 Spawn adventurers when fade is at midpoint
Also adds the character prefabs
2023-07-09 11:42:15 +02:00
dbb44e6b6f Merge pull request #13 from JanGross/adventurers
Adventurer prefabs
2023-07-09 11:20:15 +02:00
fde0d28d93 Add Adventurer prefabs 2023-07-09 11:18:24 +02:00
Amaan Shawkath
0e50052e5b Merge pull request #12 from JanGross/dialogue_tweaks
Dialogue tweaks
2023-07-09 10:15:28 +01:00
Amaan Shawkath
35fe3559d6 Adding name revealling once you ask "who are you?" 2023-07-09 10:13:57 +01:00
68fdc026de Get Dialog controller from GM 2023-07-09 11:11:24 +02:00
Amaan Shawkath
d17c7b59e3 Setup "Click to exit" on the dialogue to prevent snapping on end 2023-07-09 10:07:14 +01:00
Amaan Shawkath
d2bea3814a Added close button to character sheet - oooopsies 2023-07-09 10:06:01 +01:00
9114b0a5fa Fix billboardbehaviour being flipped 2023-07-09 11:05:43 +02:00
ee62e86863 Move adventurer graphics into Assets 2023-07-09 10:39:42 +02:00
b8bb233eb0 Merge pull request #11 from JanGross/gfx
Gfx
2023-07-09 10:33:41 +02:00
6121fb7fef Merge branch 'master' of https://github.com/JanGross/gmtk-2023 2023-07-09 10:32:04 +02:00
e8a3919321 Add retry quest option 2023-07-09 10:25:52 +02:00
576a873a02 Add pingpong fade 2023-07-09 10:25:40 +02:00
714222ebea Added multiple character graphics
Adena
Amadeus
2023-07-09 00:12:42 +02:00
2e8918e6c0 Implemet quest completion 2023-07-09 00:11:29 +02:00
a9fbeef0b4 Implemet quest completion 2023-07-09 00:10:43 +02:00
30d9d7f1ec Fix journal opening during dialog 2023-07-08 23:01:49 +02:00
9a62b3ad3d Fix journal UI scaling 2023-07-08 22:46:27 +02:00
Amaan Shawkath
77aaf1e0a7 Merge pull request #7 from JanGross/character_panel_tweaks
Character panel tweaks
2023-07-08 21:37:01 +01:00
Amaan Shawkath
bbcb6861c8 Hiding dialogue once its finished 2023-07-08 21:33:03 +01:00
Amaan Shawkath
6baef62be1 Updated character sheet so it only displays when the dialogue has been completed 2023-07-08 21:32:46 +01:00
Amaan Shawkath
e2e4f55caa Merge pull request #6 from JanGross/start_scene_and_tweak
Start scene and tweak
2023-07-08 21:19:32 +01:00
Amaan Shawkath
18a52946c3 Setting the buttons not interactable once its been asked 2023-07-08 21:16:05 +01:00
Amaan Shawkath
b5d179658b Adding main menu and main scene to build settings 2023-07-08 21:11:53 +01:00
Amaan Shawkath
d9e90cae03 Added simple main menu with start button - needs fleshing out 2023-07-08 21:11:52 +01:00
11d735b813 Fix journal adventurer selection 2023-07-08 22:07:48 +02:00
0dce5e2751 Move character sheet up 2023-07-08 21:19:54 +02:00
fd68064b16 Merge Journal, Quest and Dialog systems 2023-07-08 21:08:01 +02:00
34fb3715f3 Rename QuestlogInteractable 2023-07-08 20:06:04 +02:00
Amaan Shawkath
6b6c3cf49f Merge pull request #4 from JanGross/character_sheet_improvements
Character sheet improvements
2023-07-08 19:01:42 +01:00
Amaan Shawkath
ab1c3d1e26 removing gameobjects folder and moving character manager 2023-07-08 18:54:36 +01:00
Amaan Shawkath
4697a647ef Adding in the characters
Added debug buttons to cycle through the characters
Bug fixes
2023-07-08 18:50:49 +01:00
a783d63d2d Add Derk Graphics 2023-07-08 19:27:14 +02:00
Amaan Shawkath
7ab1e2cf4c Cleaning up using statements 2023-07-08 18:17:07 +01:00
Amaan Shawkath
ae768baaaa Added image attribute to character data 2023-07-08 18:16:28 +01:00