Workflow update

Github/Workflow update:

After attempting to fix our 4 Git Branches and resolve some merge conflicts because of stupid config file errors, we decided that moving forward, it would be best to work on a single master repo, and just be conscientious and communicative of who is pushing/pulling to the master branch at any given time. Should we have merge conflicts, we'll deal with them on a case by case basis. The important thing is that we're all going to finally be working on a single build of the game so we can actually make some forward progress. Luckily, we've all worked on our various portions of this separately on our own branches/systems, so we made progress.

What we've accomplished as of today:

• basic Ghost asset created and imported into Unity, fixed temporary shader
• coffee + plate Assets + Textures imported to Unity
• wrote a script to control the x/y movement of the player object
• basic movement+ collision through walls (still in progress)
• basic customer movement scripts (customers move to spawned objects)

What we did during the work day today:

Today, we continued to work on CoffeeGhost and worked to merge all of our separate changes onto a single build (finally!). We currently have a basic customer script that deals with tables, a basic ghost asset with a coffee, a movement script, and a basic map with basic collision. We also did a lot of planning in terms of the scope of how the collisions, customer logic, and coffee logic will work. (Seperate scripts still need to be written)

Where we're headed:

--Big Tasks for next time:

• Add tables to the layout so Hai can put her scripts- Jake
• Make basic customer assets - Jake
• Build the rest of the assets, add textures and shaders - Jake
• Build a script to pick up, put down, and DROP the coffee - Jake
• Custom shader for the ghost to modify color - Jake (yes, I know it's a lot, but I have some time this weekend to finish all the assets! And a lot of these are pretty easy to make!)
• Figure out how to control the ghost with a controller, fix player movement script - Colin
• Make the script work with multiple customers, and have them walk up to the counter, recieve an order, and then walk to a table - Hai
• Grind Beans, Boil water scripts, more kitchen mechanics - Ethan
• As a stretch goal, I'd like to have some UI/text bubble elements for orders completed soon as well. This will make scripting the customers and dealing with orders much easier.

Over the break:

We plan on staying in touch and working on our various tasks throughout the days. We will keep each other updated on when/who is pushing/pulling to the Master branch so we don't worry about merge conflicts. We will also meet up (over Discord screenshare) at some point over the break if we need to. This will probably important for scoping/planning how certain scripts/pieces are going to fit together.

We'll keep updating this repo as we make changes. Stay tuned!!