search

UVASGD / spring-2017-the-big-dungeon

spring-2017-the-big-dungeon created by GitHub Classroom
Other
1 stars 1 forks source link

Fixed Shop Bugs #64

Closed willwill96 closed 7 years ago

willwill96 commented 7 years ago

Fixed majority of shop bugs on github. Still left to be implemented: Inventory updates on pulling up from pause menu - could be pretty similar to the sell/buy code for updating items.

ReidBix commented 7 years ago

@willwill96, there were some merge conflicts with the master branch's Main_Scene. The annoying thing is that Unity makes for resolving conflicts in a scene really hard so I had to default to the master branch. If there are any required changes that need to be made to the Main_Scene you'll have to add them after the pull request. For the future, make sure to Update from Master before syncing and pull requesting.