Commit Graph

43 Commits

Author SHA1 Message Date
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
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
Amaan Shawkath
4d086fd5b9 Added public getter for character sheets 2023-07-08 18:16:13 +01:00
Amaan Shawkath
c4b5d7dac3 Improved logic for character sheets
added a way to retrieve sheets for characters
2023-07-08 18:06:06 +01:00
0e5c432dd5 Add questLog interactable 2023-07-08 18:12:14 +02:00
Amaan Shawkath
3da424b722 Merge pull request #3 from JanGross/character_sheet_setup
Character sheet setup
2023-07-08 17:09:04 +01:00
Amaan Shawkath
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
2023-07-08 17:08:45 +01:00
Amaan Shawkath
92fd23b6f0 setting up character manager 2023-07-08 17:06:32 +01:00
e76854a100 Merge pull request #2 from JanGross/main
Character controller and quest manager
2023-07-08 17:13:04 +02:00
5c674c41a4 Merge branch 'master' into main 2023-07-08 17:12:43 +02:00
3b72c6a01a Serialize Quest 2023-07-08 17:10:06 +02:00
Amaan Shawkath
b592bfcf61 Merge pull request #1 from JanGross/dialogue_system
Dialogue system
2023-07-08 16:05:59 +01:00
17698b4842 Add quest manager and base quest class 2023-07-08 16:01:38 +02:00
Amaan Shawkath
dfe6e4a88d who needs money anyways 2023-07-08 14:36:54 +01:00
Amaan Shawkath
94097c2308 Cleaning up using statements 2023-07-08 14:32:59 +01:00
Amaan Shawkath
5b1085fc65 Added my scene 2023-07-08 14:26:12 +01:00
Amaan Shawkath
293dbbec2c Setup test character and triggered dialogue
This will need adjusting to work with the click/input
2023-07-08 14:26:00 +01:00
Amaan Shawkath
0c2d335bb5 Added money attribute to character 2023-07-08 14:19:31 +01:00
Amaan Shawkath
29e260072d initial setup of dialogue panel and updating some scripts 2023-07-08 13:49:16 +01:00
2f70d6949f Add billboard behaviour component 2023-07-08 14:36:38 +02:00
Amaan Shawkath
e55f5ff18f initial setup of character data and dialogue holder 2023-07-08 13:26:56 +01:00
Amaan Shawkath
dc4261aab3 Added TextMeshPro to project 2023-07-08 13:25:34 +01:00
b620f97892 Add gitattributes content
(cherry picked from commit 721898dd7a)
2023-07-08 13:24:20 +01:00
1eeb3561d9 Add gitattributes content 2023-07-08 14:21:13 +02:00
27341fd1b1 Add playercontroller
with mouse look functionality
2023-07-08 14:19:35 +02:00
721898dd7a Add gitattributes content 2023-07-08 14:19:10 +02:00
8fcef7674b Import empty Unity Project 2023-07-08 13:26:34 +02:00
0a1e16e919 Add gitfiles 2023-07-08 13:13:35 +02:00
266d8a6a18 Initial commit 2023-07-08 13:08:15 +02:00