Skip to content
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
wants to merge 139 commits into
base: main
Choose a base branch
from
Open

Migration of dev to master #52

wants to merge 139 commits into from

Conversation

kdavidmitchell
Copy link
Collaborator

No description provided.

endawghae and others added 30 commits April 27, 2023 10:10
* 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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants