Merge branch 'master' of https://bitbucket.org/JoshuaReason/ggj-2019

Assets/AmplifyShaderEditor/Examples/HD SRP Samples.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: d1c0b77896049554fa4b635531caf741
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/AmplifyShaderEditor/Examples/LW SRP Samples.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 6ecbfd0a046659943a69328c98ff0442
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain/Custom RT Samples.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 88dfe89a073bdf748bf05396f5285cdd
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain/ApplyGrassWindToTerrain.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 11f44bcb01ea56742bb7177b439b1a4f
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/AmplifyShaderEditor/Examples/Official/Substance/LegacySubstanceExample.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 490e8164148c52c468b633dcc1c12d57
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/AmplifyShaderEditor/Examples/Official/Substance2018/Substance2018.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: af7de8b91a27c254fa1bd24c01ae6e8e
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 191365b4aece81443875ae2bb7243b55
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates (Legacy).unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 4dc1afbcc68875c4780502f5e6b80158
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 9a5e61a8b3421b944863d0946e32da0a
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates (Legacy).unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: b53d2f3b156ff104f90d4d7693d769c8
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 4c816894a3147d343891060451241bfe
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scipts/Recipe.cs

@@ -93,7 +93,6 @@ public class Recipe : MonoBehaviour {
 
     IEnumerator ItemLookup(string VeggieName, int change)
     {
-        Debug.Log("Veggie" + VeggieName + " " + change);
         for (int i = 0; i < Veggies.Length; i++)
         {
             if(Veggies[i].Name == VeggieName)

Assets/Scipts/UI/LobbyUIController.cs

@@ -7,5 +7,6 @@ public class LobbyUIController : MonoBehaviour {
 	public void OnClickStartGame()
     {
         Multiplayer.ClientManager.Instance.SendMessage(Multiplayer.PlayerMsgID.GameStart, new Multiplayer.PlayerMsg(Multiplayer.ClientManager.Instance.ID));
+        Multiplayer.PlayersManager.Instance.LocalPlayer.GetComponent<LocalPlayer>().heldVeggie = null;
     }
 }