Skip to content

inventory system, ui arrow, and refactoring #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 70 commits into
base: develop
Choose a base branch
from

Conversation

arthuroker
Copy link

No description provided.

viamill and others added 30 commits August 26, 2024 09:56
used another canvas, wouldn't work in OG canvas for some reason
…ems with VSCode) and renamed objects in sandbox scene
pushing so i can work on my desktop
item type list must match dialogue list length. npc only gives items on first instance of that dialogue index
viamill and others added 30 commits November 4, 2024 20:02
commit 2f0ac56
Author: PharingWell <pharingwell@gmail.com>
Date:   Tue Nov 5 02:23:33 2024 -0500

    Updated rider plugin and improved render settings

commit 884426f
Author: PharingWell <pharingwell@gmail.com>
Date:   Tue Nov 5 02:23:07 2024 -0500

    USE THIS SANDBOX (and these prefabs)

    Converted NPC and Player to prefab, merged Sandbox painstakingly

commit ad86fd7
Author: PharingWell <pharingwell@gmail.com>
Date:   Tue Nov 5 02:20:18 2024 -0500

    Implemented a potentially working InnerMonologue system

    Using a singleton

commit ea2b6ed
Merge: e314c52 b0101c0
Author: PharingWell <pharingwell@gmail.com>
Date:   Mon Nov 4 23:32:48 2024 -0500

    Merge commit 'b0101c0c21a9c68e4b35059e666a6b31359f1f07' into sebastian-branch

    # Conflicts:
    #	Assets/Scenes/Sandbox.unity
    #	Assets/Scripts/Player.cs

commit e314c52
Author: PharingWell <pharingwell@gmail.com>
Date:   Mon Nov 4 23:27:57 2024 -0500

    Merged scene file part 1

commit af1db74
Merge: 3f0eda7 7dd31ea
Author: PharingWell <pharingwell@gmail.com>
Date:   Mon Nov 4 22:52:30 2024 -0500

    Merge remote-tracking branch 'origin/arthur-branch' into sebastian-branch

    # Conflicts:
    #	Assets/Scenes/Sandbox.unity
    #	Assets/Scripts/Player.cs
    #	UserSettings/Layouts/default-2022.dwlt

commit 7dd31ea
Author: arthuroker <okerarthur@gmail.com>
Date:   Mon Nov 4 21:35:47 2024 -0500

    user settings?

commit 1bc9f01
Author: arthuroker <okerarthur@gmail.com>
Date:   Mon Nov 4 20:25:21 2024 -0500

    scene changes

commit 340acf0
Author: arthuroker <okerarthur@gmail.com>
Date:   Mon Nov 4 20:22:43 2024 -0500

    cleaned up inventory and fininshed implemented text pop up for inventory

commit 2ec9f3e
Author: arthuroker <okerarthur@gmail.com>
Date:   Thu Oct 31 20:24:04 2024 -0400

    scene changes

commit 5f974f5
Author: arthuroker <okerarthur@gmail.com>
Date:   Thu Oct 31 20:23:15 2024 -0400

    basic imeplementation of ui having text descriptions

commit 3f0eda7
Author: viamill <126583359+viamill@users.noreply.github.com>
Date:   Fri Oct 25 23:15:54 2024 -0400

    CC fr this time

commit 4f47cd5
Author: viamill <126583359+viamill@users.noreply.github.com>
Date:   Fri Oct 25 15:14:36 2024 -0400

    Character Creation System

    Arthur Inventory

commit 31e02d9
Merge: 9e01a84 633f2f0
Author: viamill <126583359+viamill@users.noreply.github.com>
Date:   Thu Oct 24 11:52:08 2024 -0400

    Merge pull request #3 from UVASGD/develop

    Merge pull request #2 from UVASGD/via
This reverts commit b04118f, reversing
changes made to 7dd31ea.
Identified and fixed the problem, now InnerMonologue runs, but skips first monologue input
Added a bool isDialogue to monologueStart so that it would display the first piece of dialogue properly
Merging Inventory Changes into Via
Merging in Arthur's Inventory Changes
Slight change to player.cs to make character creator work again
Fixed the code for player.cs to properly load character sprites
Character Creator FR this time (again)
commit 1935332
Author: viamill <126583359+viamill@users.noreply.github.com>
Date:   Mon Nov 11 23:17:36 2024 -0500

    Created DialogueInventory

    Created a static class containing dialogue for NPCs and Dialogue Flags
hardcoded dialgue in player start function remember to take out
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants