{"push_id":830226644,"size":7,"distinct_size":2,"ref":"refs/heads/developmentLeo","head":"2401161f78cdaa5d7e34573f257bc8e726837bf3","before":"726b053e037609491c4e878870489c896a6367ea","commits":[{"sha":"41948ee366540bfe380ed8bcc72029118c018d9e","author":{"email":"444956df1eb4eefb51137b059b33ca0f34ca0b6a@gmail.com","name":"ThiagoMorano"},"message":"After-merge changes\n\nChanges in the HUDController and Scene after the merge was done","distinct":false,"url":"https://api.github.com/repos/LOA-SEAD/labteca/commits/41948ee366540bfe380ed8bcc72029118c018d9e"},{"sha":"c4f44355fc77715552b25962044fbd2ecd3badf8","author":{"email":"444956df1eb4eefb51137b059b33ca0f34ca0b6a@gmail.com","name":"ThiagoMorano"},"message":"AddToInventory halfway done\n\nReagentsLiquid.cs\n- ReagentsBaseClass info is ReagentsLiquidClass (Also a cast is done\nwhen LoadReagents is called)\n\nGetReagentState.cs\n- Created ReagentInstantiation method\n-> Prefab variables to be able to instantiate the reagents correctly\n\nInventoryManager.cs\n- Created AddItemToInventory() and RemoveItemFromInventory() so passing\nthe operation string is done internally\n\nReagentUiItemBehavior.cs\n- AddToInventoryMethod is working properly now\n//TODO: Comentario: isso e para suprir a falta do inventario entao tem\nque alterar aqui depois;  -> DONE\n\nScene:\nin States::GetReagents<GetReagentState.cs>\n- Attached @Prefabs\\Objects\\LiquidObject to Liquid Prefab\n- Attached @Prefabs\\Objects\\SolidObject to Solid Prefab","distinct":false,"url":"https://api.github.com/repos/LOA-SEAD/labteca/commits/c4f44355fc77715552b25962044fbd2ecd3badf8"},{"sha":"a50a867885ff6581da44eb3b4bdbf9ff89b7ffb3","author":{"email":"444956df1eb4eefb51137b059b33ca0f34ca0b6a@gmail.com","name":"ThiagoMorano"},"message":"Attach ItemStackableBehaviour.cs to prefabs\n\nIn scene:\nAttached ItemStackableBehavior.cs to the object prefabs (Glassware,\nLiquidObject, SolidObject and OthersObject).\n\n//Starting tests to add Glasswares to inventory","distinct":false,"url":"https://api.github.com/repos/LOA-SEAD/labteca/commits/a50a867885ff6581da44eb3b4bdbf9ff89b7ffb3"},{"sha":"0755821f927a742b3ce44db714e7c61fd69b3685","author":{"email":"444956df1eb4eefb51137b059b33ca0f34ca0b6a@gmail.com","name":"ThiagoMorano"},"message":"Test Glassware\n\nTesting best way to add glassware to inventory","distinct":false,"url":"https://api.github.com/repos/LOA-SEAD/labteca/commits/0755821f927a742b3ce44db714e7c61fd69b3685"},{"sha":"c2727d41104d34e5fa2599e2d43d534b900b9cfb","author":{"email":"444956df1eb4eefb51137b059b33ca0f34ca0b6a@gmail.com","name":"ThiagoMorano"},"message":"Add Glassware to Inventory\n\n//Glassware may now be added to the inventory\n\nGlasswareUiItemBehaviour.cs:\n- Added int glasswareIndex attribute\n- SetGlass() now receives and sets the index\n\n//TODO: Comentario: isso e para suprir a falta do inventario entao tem\nque alterar aqui depois; -> DONE\n\nGetGlasswareState.cs:\n- Added method GlasswareInstantiation()\n\nIn Scene:\n- Deattached the AnyObjectInstantiation from all the prefabs in\nPrefabs\\Glassware","distinct":false,"url":"https://api.github.com/repos/LOA-SEAD/labteca/commits/c2727d41104d34e5fa2599e2d43d534b900b9cfb"},{"sha":"d8b90e936e20b7aabbbf7b24931596ab5ddba3d8","author":{"email":"716b7db90908c88555857a6426e73cd57176cc36@comp.ufscar.br","name":"Leonardo Tavares"},"message":"Setting up Merge","distinct":true,"url":"https://api.github.com/repos/LOA-SEAD/labteca/commits/d8b90e936e20b7aabbbf7b24931596ab5ddba3d8"},{"sha":"2401161f78cdaa5d7e34573f257bc8e726837bf3","author":{"email":"716b7db90908c88555857a6426e73cd57176cc36@comp.ufscar.br","name":"Leonardo Tavares"},"message":"Setting up to Merge²","distinct":true,"url":"https://api.github.com/repos/LOA-SEAD/labteca/commits/2401161f78cdaa5d7e34573f257bc8e726837bf3"}]}