Code

look at my code B+)#4

Code

Open

tangirene wants to merge 104 commits intodevelopUVASGD/student-game-developers-at-uva-spring-2025-student-game-developers-at-uva-fall-2024-ProjectTemplate:developfrom

ireneiscoolUVASGD/spring-2025-adventurer-s-tavern:ireneiscoolCopy head branch name to clipboard

Commits

Commits on Jan 26, 2025

• Update README.md

  phf5kw

  authored
  ae55ae9

  Copy full SHA for ae55ae9

Commits on Jan 27, 2025

• init

  liam-tolbert

  committed
  c1a9c06

  Copy full SHA for c1a9c06

Commits on Feb 4, 2025

• Equipment Scriptable Objects

  Gelila123

  committed
  0d3ee14

  Copy full SHA for 0d3ee14

Commits on Feb 6, 2025

• Player Manager

  Show description for 6760fec
  Jay-Dee-Cee

  committed
  6760fec

  Copy full SHA for 6760fec

• created shop.cs

  tangirene

  committed
  0d42384

  Copy full SHA for 0d42384

• Player Manager Complete

  Jay-Dee-Cee

  committed
  4e0484a

  Copy full SHA for 4e0484a

Commits on Feb 10, 2025

• rearranged station view, deleted extra order manager

  phf5kw

  committed
  49af3fa

  Copy full SHA for 49af3fa

• refactoring slot

  phf5kw

  committed
  8cfbdd6

  Copy full SHA for 8cfbdd6

• testing data button

  phf5kw

  committed
  c811326

  Copy full SHA for c811326

• adjusting data button

  phf5kw

  committed
  db265d3

  Copy full SHA for db265d3

• action button refactored

  phf5kw

  committed
  e2b811e

  Copy full SHA for e2b811e

• refactored action and ingredient buttons

  phf5kw

  committed
  6670de9

  Copy full SHA for 6670de9

Commits on Feb 11, 2025

• added new station swap test scene

  phf5kw

  committed
  fa537a1

  Copy full SHA for fa537a1

• BiomeData v1

  Show description for 49d9ebd
  Jay-Dee-Cee

  committed
  49d9ebd

  Copy full SHA for 49d9ebd

• StationButton Addition

  Rolando03v

  committed
  e1092bf

  Copy full SHA for e1092bf

Commits on Feb 13, 2025

• OnPlayerChangeMoney

  Jay-Dee-Cee

  committed
  ee406c3

  Copy full SHA for ee406c3

• Merge pull request #4 from UVASGD/CollectingMoneyfromCustomers

  Show description for 5102dbe
  liam-tolbert

  authored
  5102dbe

  Copy full SHA for 5102dbe

• Merge pull request #5 from UVASGD/BiomeData

  Show description for 49ab242
  liam-tolbert

  authored
  49ab242

  Copy full SHA for 49ab242

• Fixing renaming issues in customer

  liam-tolbert

  committed
  3a82c8e

  Copy full SHA for 3a82c8e

• small call to switchstation

  Show description for 13c16e9
  liam-tolbert

  committed
  13c16e9

  Copy full SHA for 13c16e9

• Little Comment on a red line, pushing check

  Rolando03v

  committed
  7d8bf6a

  Copy full SHA for 7d8bf6a

Commits on Feb 15, 2025

• rearranging for station switch

  phf5kw

  committed
  e303e6c

  Copy full SHA for e303e6c

Commits on Feb 17, 2025

• station making more sense uhhh it's 4 am...

  phf5kw

  committed
  28c37e7

  Copy full SHA for 28c37e7

• removed extra station param

  phf5kw

  committed
  48c492a

  Copy full SHA for 48c492a

• deleting old uielement classes, renamed button style

  phf5kw

  committed
  6ac54cb

  Copy full SHA for 6ac54cb

• button files moved into ui

  phf5kw

  committed
  149605e

  Copy full SHA for 149605e

• added order/station containers

  phf5kw

  committed
  93eaf36

  Copy full SHA for 93eaf36

• Merge branch 'develop' into station-swap

  phf5kw

  authored
  bccc468

  Copy full SHA for bccc468

• Merge pull request #6 from UVASGD/station-swap

  Show description for 62c4ac7
  phf5kw

  authored
  62c4ac7

  Copy full SHA for 62c4ac7

• small fix in station

  phf5kw

  committed
  9f4c9e0

  Copy full SHA for 9f4c9e0

Commits on Feb 18, 2025

• added price as field

  tangirene

  committed
  1b56afc

  Copy full SHA for 1b56afc

• started a shop ui

  tangirene

  committed
  2a1e1ea

  Copy full SHA for 2a1e1ea

• small name change

  phf5kw

  committed
  5b59b10

  Copy full SHA for 5b59b10

• developed shop logic

  tangirene

  committed
  e0b6719

  Copy full SHA for e0b6719

• property to data changes

  Rolando03v

  committed
  4d381ab

  Copy full SHA for 4d381ab

• added data changes over property Merge branch 'develop' of https://github.com/UVASGD/spring-2025-adventurer-s-tavern into develop

  Rolando03v

  committed
  4d8c08f

  Copy full SHA for 4d8c08f

• new scripobj ShopItem

  tangirene

  committed
  3704a9c

  Copy full SHA for 3704a9c

• shop menu scene

  tangirene

  committed
  328edaf

  Copy full SHA for 328edaf

• enum ItemType

  tangirene

  committed
  bdf43f1

  Copy full SHA for bdf43f1

• scripobj Shop

  tangirene

  committed
  b5e90f0

  Copy full SHA for b5e90f0

Commits on Feb 20, 2025

• Menu manager

  Show description for d5da66e
  Jay-Dee-Cee

  committed
  d5da66e

  Copy full SHA for d5da66e

• data grabbing

  Rolando03v

  committed
  2d8173f

  Copy full SHA for 2d8173f

• OrderButton UI Toolkit and Script

  Rolando03v

  committed
  ef3b8b8

  Copy full SHA for ef3b8b8

Commits on Feb 23, 2025

• Merge conflict fix?

  liam-tolbert

  committed
  6bbcba6

  Copy full SHA for 6bbcba6

• Merge branch 'develop' into ireneiscool

  liam-tolbert

  authored
  caccf47

  Copy full SHA for caccf47

• Merge pull request #7 from UVASGD/ireneiscool

  Show description for 80a8a91
  liam-tolbert

  authored
  80a8a91

  Copy full SHA for 80a8a91

Commits on Feb 24, 2025

• Merge pull request #8 from UVASGD/MenuBackend

  Show description for 5a9a74f
  liam-tolbert

  authored
  5a9a74f

  Copy full SHA for 5a9a74f

• Customer order fixes, recipe scriptableobject fixes

  liam-tolbert

  committed
  961a039

  Copy full SHA for 961a039

• main menu, test, other things

  liam-tolbert

  committed
  1808ea9

  Copy full SHA for 1808ea9

• consolidating station logic

  phf5kw

  committed
  468edb2

  Copy full SHA for 468edb2

• Merge pull request #9 from UVASGD/OrderButton

  Show description for b50b586
  liam-tolbert

  authored
  b50b586

  Copy full SHA for b50b586

• Rearranging Station logic out of stationcontroller

  liam-tolbert

  committed
  c3c008a

  Copy full SHA for c3c008a

• Order button UI

  phf5kw

  committed
  f4d4578

  Copy full SHA for f4d4578

• reimported assets, showing customer orders

  liam-tolbert

  committed
  057568e

  Copy full SHA for 057568e

• fixed bugs in shopitem

  tangirene

  committed
  1a5aa43

  Copy full SHA for 1a5aa43

• Merge branch 'develop' into ireneiscool

  liam-tolbert

  authored
  484f4b6

  Copy full SHA for 484f4b6

• fixed name conflict

  tangirene

  committed
  bb487fe

  Copy full SHA for bb487fe

• Merge branch 'ireneiscool' of https://github.com/UVASGD/spring-2025-adventurer-s-tavern into ireneiscool

  tangirene

  committed
  af88c75

  Copy full SHA for af88c75

• Merge pull request #10 from UVASGD/ireneiscool

  Show description for debeafa
  liam-tolbert

  authored
  debeafa

  Copy full SHA for debeafa

• blah blah

  tangirene

  committed
  82fd5ec

  Copy full SHA for 82fd5ec

• very small syntax fix

  liam-tolbert

  committed
  a5b89f7

  Copy full SHA for a5b89f7

• default purchased to false?

  tangirene

  committed
  fe2dad9

  Copy full SHA for fe2dad9

• very basic buy item logic

  tangirene

  committed
  b40e948

  Copy full SHA for b40e948

Commits on Feb 25, 2025

• more shopppp

  tangirene

  committed
  a28b82c

  Copy full SHA for a28b82c

Commits on Feb 26, 2025

• make money public

  tangirene

  committed
  8dff1ca

  Copy full SHA for 8dff1ca

Commits on Feb 27, 2025

• fixed bugs

  tangirene

  committed
  e02c52a

  Copy full SHA for e02c52a

Commits on Mar 2, 2025

• progress bar ui base

  phf5kw

  committed
  10b7bda

  Copy full SHA for 10b7bda

• Refactor OrderManager and StationView: streamline coroutine handling and update ingredient data

  phf5kw

  committed
  6f55bd7

  Copy full SHA for 6f55bd7

• temp changes

  liam-tolbert

  committed
  b586796

  Copy full SHA for b586796

• Updated StationView UI: add new containers for bar and side panel, update order button structure and styles

  phf5kw

  committed
  87cb4f8

  Copy full SHA for 87cb4f8

• add order selection functionality and created event handling for order buttons -- menus appear

  phf5kw

  committed
  bd4c4a5

  Copy full SHA for bd4c4a5

• Renaming OnOpenOrder to OnCreateOrder to be less confusing

  liam-tolbert

  committed
  38d59e6

  Copy full SHA for 38d59e6

• Add IDE configuration and metadata files to project

  Show description for 792c23d
  liam-tolbert

  committed
  792c23d

  Copy full SHA for 792c23d

Commits on Mar 3, 2025

• Update Stirfry recipe to include mushroom and modify order handling to pass cooking UI event channel

  phf5kw

  committed
  13a0115

  Copy full SHA for 13a0115

• Merge branch 'develop' of https://github.com/UVASGD/spring-2025-adventurer-s-tavern into develop

  phf5kw

  committed
  82c12a6

  Copy full SHA for 82c12a6

• Refactor station change methods for clarity and consistency; update ingredient button label handling

  phf5kw

  committed
  d70e995

  Copy full SHA for d70e995

• Refactor cooking UI event handling to improve clarity; rename refresh methods and add ingredients panel refresh

  phf5kw

  committed
  5456226

  Copy full SHA for 5456226

• Add order instructions visualization in station view

  Show description for 37f1ccd
  liam-tolbert

  committed
  37f1ccd

  Copy full SHA for 37f1ccd

• WORKING STATION SWITCH INSTANCE ORDER SELECT INSTANCE

  phf5kw

  committed
  cc6b88c

  Copy full SHA for cc6b88c

• started serving station

  phf5kw

  committed
  a7e7cd9

  Copy full SHA for a7e7cd9

• More detailed order instructions

  liam-tolbert

  committed
  54d508e

  Copy full SHA for 54d508e

• Refactor order generation to align with recipe requirements.

  Show description for 4a06e69
  liam-tolbert

  committed
  4a06e69

  Copy full SHA for 4a06e69

• Refactor order submission logic and update event channel for customer removal

  phf5kw

  committed
  5b68308

  Copy full SHA for 5b68308

• stirfry small changes

  phf5kw

  committed
  985b7d9

  Copy full SHA for 985b7d9

• added character, saved unity game

  phf5kw

  committed
  4a4c4ac

  Copy full SHA for 4a4c4ac

• Refactor customer removal to use indices instead of objects

  Show description for 46e1914
  liam-tolbert

  committed
  46e1914

  Copy full SHA for 46e1914

• Implement order deselection functionality and update order button placement based on customer index

  phf5kw

  committed
  fbe7327

  Copy full SHA for fbe7327

• Add delete order button functionality and update event channel

  phf5kw

  committed
  b7a2344

  Copy full SHA for b7a2344

• Add order deselection and deletion functionality

  Show description for 5b7f2d4
  liam-tolbert

  committed
  5b7f2d4

  Copy full SHA for 5b7f2d4

• close station panels after order submission

  phf5kw

  committed
  6aad499

  Copy full SHA for 6aad499

• working temp character sprite rotation

  phf5kw

  committed
  2f5d5ca

  Copy full SHA for 2f5d5ca

• replace dem images, small change for determinate rotating sprites

  phf5kw

  committed
  9d05440

  Copy full SHA for 9d05440

Commits on Mar 6, 2025

• ABC

  Jay-Dee-Cee

  committed
  c9b887e

  Copy full SHA for c9b887e

Commits on Mar 14, 2025

• All customers spawn now

  liam-tolbert

  committed
  a82731a

  Copy full SHA for a82731a

Commits on Mar 17, 2025

• pause game menu

  Gelila123

  committed
  2f5f32a

  Copy full SHA for 2f5f32a

• maybe finished shop idk

  tangirene

  committed
  dd068b8

  Copy full SHA for dd068b8

• biome manager

  tangirene

  committed
  6a8f6f0

  Copy full SHA for 6a8f6f0

• Merge branch 'develop' into ireneiscool

  liam-tolbert

  authored
  90f6a5b

  Copy full SHA for 90f6a5b

Commits on Mar 18, 2025

• biome manager

  tangirene

  committed
  3aed413

  Copy full SHA for 3aed413

• shop ui

  tangirene

  committed
  54d9031

  Copy full SHA for 54d9031

• Merge branch 'ireneiscool' of https://github.com/UVASGD/spring-2025-adventurer-s-tavern into ireneiscool

  tangirene

  committed
  c4fa19b

  Copy full SHA for c4fa19b

• shpop ui

  tangirene

  committed
  92e3da4

  Copy full SHA for 92e3da4

Commits on Mar 25, 2025

• Update ShopUI.uxml

  tangirene

  committed
  a5b3b75

  Copy full SHA for a5b3b75

• Update ShopMenuScene.unity

  tangirene

  committed
  1634c70

  Copy full SHA for 1634c70