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

Preston shaders #48

Open
wants to merge 97 commits into
base: main
Choose a base branch
from
Open

Preston shaders #48

wants to merge 97 commits into from

Conversation

ReinKameryu
Copy link

please discuss with me before we merge my final work, sorry it isnt much but it was a great experience playing around with Unity's VFX options

kdavidmitchell and others added 30 commits June 2, 2022 15:43
* Adding builds (#15)

* adding base game layer scripts

* specced out combat loop with comments

* adding rough UI for demo and logic

* adding comments to the csm

* adding combatqueueable interface and inheritable classes

* adding scene changes

* making ui elements responsive

* refactoring combat logic

* beginnings of an event system

* adding methods for DemoManager to check queue on event

* changes to combat scene UI and adding player input capability

* adding targeting system and PlayerAction queueables

* adding enemy ai behavior

* adding capability to check health of combatants, and win/loss

* scene changes

* fixing ui issues w/ resetting combat queue

* adding win/loss scenes -- basic loop complete

* experimental unity upgrade

* added new interior assets and created gig background scene

* refining scene

* adding character model packages to project; models added to combat scene

* scene changes

* adding portraits as stand-ins; combat scene UI hooked up and running without crash

* combat ui changes

* adding custom UI assets and updating combat scene

* continued combat UI clean up

* fixed disappearing health and flourish bars

* adding temp abl code

* live changes

* live changes

* Adding implementation for 2-way communication between ABL and Unity (#6)

* adding temp abl code

* live changes

* modified game agent and added AllyWME data class

* adding partymanager

* adding support for cif specific data

* working on AllyWME class

* finished allywme class on unity side for now

* finished allywme class on unity side for now

* adding partymanager object to scene

* adding abl src and new allyWME java class

* changes to agent

* adding changes

* adding tcp server as testing mechanism to unity and abl projects

* work on sending AllyWME to ABL

* passing and creating full WMEs from Unity to ABL server

* changes to gameagent and server

* adding actions from ABL to unity

* adding utility wrapper for map structure and adding to abl agent

* continued changes to unity and abl code

* protect action now working in game logic for combat scenario

* adding title and character creation screen

* fixing indexing for model viewer

* continued work on character creation screen

* cleaning up json errors

* finished character creation and created a whole bunch of new errors

* fixing all the errors

* working data serialization/persistence for player object

* adding tavern work from cam

* linking character creation to tavern demo scene

* lighting changes from meeting

* adding player controller and camera follow scripts

* player spawn in tavern now working with camera and collisions

* adding animations and controllers for player and npcs

* adding dialogue data structures and json file

* dialogue system in place, need to clean up

* cleaned up dialogue, transition to combat scene

* adding reward screen and loop back to tavern

* adding new music for tavern scene

* removing unnecessary func

* fixing bugs before merging tavern work

* fixing lighting

* adding rough cut of quest system for gameplay experience help, cleaning up gig scene

* adding ability to create help messages and adding navmesh movement script

* adding party ui

* working party screen

* cleaning up combat

* adding noncombat abl behaviors

* adding context specific quip system

* adding resolution to the fight

* cleaning up null references

* fixing floating quest marker not following npc bug

* fixing quinton resolution bug

* fixing downed NPCs trying to protect allies bug

* fix warning

* adding new portraits and title screen art

* more menu fixes

* adding player default portrait, and making portraits appear in combat

* removing visual combat queue for now

* adding animator overrides for injured/happy quinton

* final touches to demo

* adding executables for abl and game

* modifying .gitignore to accept build, adding build

* redoing deletions

* Update README.md

* Update README.md

* Update README.md

* adding img for readme

* Update README.md

* modifying gitignore

* removing unnecessary build file

* modifying abl folder gitignore

* deleting unnecessary abl files

* cleaning up

* adding build for macOS

* undoing changes to build

* making running game only easier

* adding necessary abl project files

* adding renewed agent

* rebuilding for release

* updating readme

* Update README.md

* Back Button IMPL

* Back button + text Ui highlight change

* Ui Overlapping/Size Issue Fix

* Camera + cursor updates and changes

* UI Updates

* Social circle + inventory updates

* UI Inventory Updates

* inventory updates + model viewing established in inventory screen

* Cinemachine added update

---------

Co-authored-by: BlotofInk <[email protected]>
Back button hidden + Cinemachine cameras time reduced
* UI Modularization Update

Initial Modularization attempt of combat UI. Old UI code still remains in form of comments.

* Cleanup Update

Got rid of some unnecessary old code post modularization

* Update added back button

Added in a functional back button for the combat ui.

* Update to tooltips + removal of useless script

* Moved cursor + valuebar logic

moved to UI manager from Combat manager

* fixing conflicts

---------

Co-authored-by: kdavidmitchell <[email protected]>
* Dialogue Animations

* changing reference to gamemanager toggleplayercontrols

---------

Co-authored-by: kdavidmitchell <[email protected]>
sorry for the wait and delay
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