{"push_id":806851671,"size":25,"distinct_size":1,"ref":"refs/heads/networking","head":"63938709387e3f2dc13bdf32a0a8557ba62ced7b","before":"49ce68d4248dc3f32b9f252f42c107ed6ff18a18","commits":[{"sha":"63ca6141ba405ca444e56874b46e942707eee64a","author":{"email":"64749cdabdd420c568242e9ca1cea76f518d38a9@gmail.com","name":"Divya"},"message":"Updated game world (code and patch progress methods)","distinct":false,"url":"https://api.github.com/repos/Recursively/redmf/commits/63ca6141ba405ca444e56874b46e942707eee64a"},{"sha":"a40c9d095b1b110dcaeaf4a3813f35753b91f5be","author":{"email":"64749cdabdd420c568242e9ca1cea76f518d38a9@gmail.com","name":"Divya"},"message":"Updated Player (pick and drop item methods)","distinct":false,"url":"https://api.github.com/repos/Recursively/redmf/commits/a40c9d095b1b110dcaeaf4a3813f35753b91f5be"},{"sha":"e7d648729b1139da3e36aca8c76315201d2ad0f4","author":{"email":"64749cdabdd420c568242e9ca1cea76f518d38a9@gmail.com","name":"Divya"},"message":"Added abstract methods in item","distinct":false,"url":"https://api.github.com/repos/Recursively/redmf/commits/e7d648729b1139da3e36aca8c76315201d2ad0f4"},{"sha":"7b279c56dbe781d122320fcb6e35478fb604c8ce","author":{"email":"64749cdabdd420c568242e9ca1cea76f518d38a9@gmail.com","name":"Divya"},"message":"Updated Item subsclasses (added abstract methods)","distinct":false,"url":"https://api.github.com/repos/Recursively/redmf/commits/7b279c56dbe781d122320fcb6e35478fb604c8ce"},{"sha":"2b048e7e01a083fcc7f43893051ce84f6ec0211b","author":{"email":"64749cdabdd420c568242e9ca1cea76f518d38a9@gmail.com","name":"Divya"},"message":"Merge branch 'gameLogic' of https://github.com/Recursively/redmf into\ngameLogic\n\nConflicts:\n\tsrc/model/GameWorld.java","distinct":false,"url":"https://api.github.com/repos/Recursively/redmf/commits/2b048e7e01a083fcc7f43893051ce84f6ec0211b"},{"sha":"b8b8407dadb18026ac77969b22ae6d90491a60df","author":{"email":"64749cdabdd420c568242e9ca1cea76f518d38a9@gmail.com","name":"Divya"},"message":"Merge branch 'development' of https://github.com/Recursively/redmf into gameLogic","distinct":false,"url":"https://api.github.com/repos/Recursively/redmf/commits/b8b8407dadb18026ac77969b22ae6d90491a60df"},{"sha":"f7189d6bc779b25801e55e8845210931a7c4c41a","author":{"email":"64749cdabdd420c568242e9ca1cea76f518d38a9@gmail.com","name":"Divya"},"message":"Updated Inventory Class\n\n- Added 'size' component to inventory so there is a limit to the number\nof items a laptop can store","distinct":false,"url":"https://api.github.com/repos/Recursively/redmf/commits/f7189d6bc779b25801e55e8845210931a7c4c41a"},{"sha":"66281aa9cdb67c7e971140bc1516f0b3198ef293","author":{"email":"64749cdabdd420c568242e9ca1cea76f518d38a9@gmail.com","name":"Divya"},"message":"Updated File and ReadMe\n\n- these two extend 'LaptopItem' now as both have a size component and\nare the only items allowed to be stored in the player's inventory\n(laptop)","distinct":false,"url":"https://api.github.com/repos/Recursively/redmf/commits/66281aa9cdb67c7e971140bc1516f0b3198ef293"},{"sha":"eded7a02ca5f8852c8d340be64c4b19b18fa0ffc","author":{"email":"64749cdabdd420c568242e9ca1cea76f518d38a9@gmail.com","name":"Divya"},"message":"Changed File to FlashDrive","distinct":false,"url":"https://api.github.com/repos/Recursively/redmf/commits/eded7a02ca5f8852c8d340be64c4b19b18fa0ffc"},{"sha":"91a7661820d63678f880b4e430e22adcf7c04ffd","author":{"email":"64749cdabdd420c568242e9ca1cea76f518d38a9@gmail.com","name":"Divya"},"message":"Added gameWorld field to Player class","distinct":false,"url":"https://api.github.com/repos/Recursively/redmf/commits/91a7661820d63678f880b4e430e22adcf7c04ffd"},{"sha":"2088d4832fcbfd7669a6f4a9e155259efcbeeb53","author":{"email":"64749cdabdd420c568242e9ca1cea76f518d38a9@gmail.com","name":"Divya"},"message":"Updated GameWorld\n\n- added findItem method\n- added comments","distinct":false,"url":"https://api.github.com/repos/Recursively/redmf/commits/2088d4832fcbfd7669a6f4a9e155259efcbeeb53"},{"sha":"2c7513ca292f78cd1b16304ceeb6423fb46e1b12","author":{"email":"64749cdabdd420c568242e9ca1cea76f518d38a9@gmail.com","name":"Divya"},"message":"Updated Player class\n\n- added key interactions for picking up, interacting and dropping items","distinct":false,"url":"https://api.github.com/repos/Recursively/redmf/commits/2c7513ca292f78cd1b16304ceeb6423fb46e1b12"},{"sha":"fea1d0eb462cf323cf9df34a42691fc65bd4edd0","author":{"email":"64749cdabdd420c568242e9ca1cea76f518d38a9@gmail.com","name":"Divya"},"message":"Updates Item class (and subclasses)\n\n- added method outlines to each class\n- TODO = fill in method bodies","distinct":false,"url":"https://api.github.com/repos/Recursively/redmf/commits/fea1d0eb462cf323cf9df34a42691fc65bd4edd0"},{"sha":"d42ac5ef0d3ae2caf51e318147a31cfdee0f2da8","author":{"email":"64749cdabdd420c568242e9ca1cea76f518d38a9@gmail.com","name":"Divya"},"message":"Merge branch 'gameLogic' of https://github.com/Recursively/redmf into gameLogic","distinct":false,"url":"https://api.github.com/repos/Recursively/redmf/commits/d42ac5ef0d3ae2caf51e318147a31cfdee0f2da8"},{"sha":"f5a50947fceed6c55de89c5079ee5b42c3cd209b","author":{"email":"64749cdabdd420c568242e9ca1cea76f518d38a9@gmail.com","name":"Divya"},"message":"Merge branch 'development' of https://github.com/Recursively/redmf into gameLogic","distinct":false,"url":"https://api.github.com/repos/Recursively/redmf/commits/f5a50947fceed6c55de89c5079ee5b42c3cd209b"},{"sha":"33ea8b200331bf6d468e711b29f038e8913d72a8","author":{"email":"64749cdabdd420c568242e9ca1cea76f518d38a9@gmail.com","name":"Divya"},"message":"Updated Item class and its subclasses\n\n- changed interact() in Item class to not be abstract anymore\n- added method bodies to commit class\n- added method bodies to flash drive class\n- added helper methods in GameWorld (to aid ith adding items to the\ninventory)\n- asjusted delete method in inventory class to return the item if delete\nwas succesfull","distinct":false,"url":"https://api.github.com/repos/Recursively/redmf/commits/33ea8b200331bf6d468e711b29f038e8913d72a8"},{"sha":"89e997868578a0c220d470b6c5ee49a4e5718387","author":{"email":"64749cdabdd420c568242e9ca1cea76f518d38a9@gmail.com","name":"Divya"},"message":"Refactored LaptopItem/FlashDrive/ReadMe classes\n\n- moved common method bodies in pickUp() and interact() methods to\nLaptopItem class\n- changed it so laptop items are only different in terms of their\nattributes. Interactions with players are carried out the same way.","distinct":false,"url":"https://api.github.com/repos/Recursively/redmf/commits/89e997868578a0c220d470b6c5ee49a4e5718387"},{"sha":"a22284a8e275ffe3bc75bf629accb8af16f93997","author":{"email":"64749cdabdd420c568242e9ca1cea76f518d38a9@gmail.com","name":"Divya"},"message":"Updated SwipeCard class\n\n- filled in method bodies in class\n- added card set and addCard() method to GameWorld to help store swipe\ncards that are picked up by player","distinct":false,"url":"https://api.github.com/repos/Recursively/redmf/commits/a22284a8e275ffe3bc75bf629accb8af16f93997"},{"sha":"dd4592a8a95974b45bfe711eeb148307c13545ac","author":{"email":"64749cdabdd420c568242e9ca1cea76f518d38a9@gmail.com","name":"Divya"},"message":"Added Comments\n\n- to Player and Inventory class","distinct":false,"url":"https://api.github.com/repos/Recursively/redmf/commits/dd4592a8a95974b45bfe711eeb148307c13545ac"},{"sha":"0c7f46c9339f77bbfe462083e2030c735e0e89a3","author":{"email":"64749cdabdd420c568242e9ca1cea76f518d38a9@gmail.com","name":"Divya"},"message":"Updated GameWorld\n\n- added comments\n- completed findItem() method\n- added static helper methods in Entity class for findItem()","distinct":false,"url":"https://api.github.com/repos/Recursively/redmf/commits/0c7f46c9339f77bbfe462083e2030c735e0e89a3"}]}