-
Notifications
You must be signed in to change notification settings - Fork 0
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
Migration of dev to master #52
Open
kdavidmitchell
wants to merge
139
commits into
main
Choose a base branch
from
dev
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* level update pt.1 yeah had to seperate these in order to push * level update pt.2 * level update pt3 * leve update pt.4 * Level update pt.5 village sample merged with working branch. TavernManager script is used currently so walkthrough to see visual elements is possible. * Terrain Modified for Town Sample * Village Updates * TownEviroUpdate * More Props added to village * fixing broken packages --------- Co-authored-by: BlotofInk <[email protected]>
* Combat Queue WIP * Combat queue timeline UI * Combat Log * Shop WIP * Store WIP * Shop and Inventory WIP * WIP inventory system works between scene changes now * Inventory UI Interactions WIP * Inventory Crafting WIP * Inventory Crafting WIP * Unique inventory item fix --------- Co-authored-by: kdavidmitchell <[email protected]>
* Updates to Enviroment * Cliff and Trees update * Influence + Combat UI update Virtuoso Bar moved and shrunk to fit into upper right corner. Now can only influence allies and not the player character. * Doors Added to Village * update * Influence disabled update Influence is disabled when there is only one ally character in the party laive. * Code Cleanup * Added Townspeople --------- Co-authored-by: kdavidmitchell <[email protected]>
* Updates to Enviroment * Cliff and Trees update * Influence + Combat UI update Virtuoso Bar moved and shrunk to fit into upper right corner. Now can only influence allies and not the player character. * Doors Added to Village * update * Influence disabled update Influence is disabled when there is only one ally character in the party laive. * Code Cleanup * Added Townspeople * Townspeople and window update Added glow to some windows and added in more npcs. Also tried to diversify the npc models with different textures. * Update EditorUserSettings.asset * minor update * village managers + dialogue Added in manager scripts and some dialogue to the village. * UI Now Can run in Village * The Herbalist can now say things * Basic Dialogue Model Added for Town --------- Co-authored-by: kdavidmitchell <[email protected]>
1. Add Action Gossip 2. Add a new WME - CalDistanceWME 3. Add a self-defined structure ArrayHolder 4. Modify GameAgent
1. Add a position tracker that keeps updating NPC's position in NPC movement script 2. Add locations in BasePlayer class
Todo: PositionTrackers only tracks NPC that has been recruited, but the system are supposed to track every NPC. We need to create an NPC manager that tracks all NPCs that use WanderNPCAI.cs
* Updates to Enviroment * Cliff and Trees update * Influence + Combat UI update Virtuoso Bar moved and shrunk to fit into upper right corner. Now can only influence allies and not the player character. * Doors Added to Village * update * Influence disabled update Influence is disabled when there is only one ally character in the party laive. * Code Cleanup * Added Townspeople * Townspeople and window update Added glow to some windows and added in more npcs. Also tried to diversify the npc models with different textures. * Update EditorUserSettings.asset * minor update * village managers + dialogue Added in manager scripts and some dialogue to the village. * UI Now Can run in Village * The Herbalist can now say things * Basic Dialogue Model Added for Town * DialogueModelUpdates * Minor update to fix ui bug in tavern * Small Fix * Update default-2021.dwlt --------- Co-authored-by: kdavidmitchell <[email protected]> Co-authored-by: kdavidmitchell <[email protected]>
* Can now travel between new Village scene and Tavern scene, added a merchant in the Village * Base implementation for combat animations, particles, and sounds. * Combat Anims WIP * Attack animations and SFX for combat * Remaining changes * more animations, semi sorta bandaid fix for UI overlap --------- Co-authored-by: kdavidmitchell <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.