{"push_id":1390088970,"size":58,"distinct_size":1,"ref":"refs/heads/DanT","head":"a808efa8769c429355d60021768471113098c00f","before":"ef40f6bb75d44aac32351cc37442d8a1b53220fe","commits":[{"sha":"3e0860d1b8b82c346cee5faa99fbb599c1aadcbb","author":{"name":"bmoore6","email":"8e447887464a0187a5468f2837562e9916b2878f@uccs.edu"},"message":"buttons\n\nbuttons","distinct":false,"url":"https://api.github.com/repos/Mmoravec1118/The-Tribes/commits/3e0860d1b8b82c346cee5faa99fbb599c1aadcbb"},{"sha":"8f695629b5a1ef248c3ecce1275f09f1418e8bf3","author":{"name":"Zer0Ph34r","email":"f68b96dfba52d78fd7d292366e2263db26af9045@yahoo.com"},"message":"Fixed merge errors","distinct":false,"url":"https://api.github.com/repos/Mmoravec1118/The-Tribes/commits/8f695629b5a1ef248c3ecce1275f09f1418e8bf3"},{"sha":"71dee3cb44f6c36f836adec6f0ba60ca56647092","author":{"name":"Zer0Ph34r","email":"f68b96dfba52d78fd7d292366e2263db26af9045@yahoo.com"},"message":"Added player display","distinct":false,"url":"https://api.github.com/repos/Mmoravec1118/The-Tribes/commits/71dee3cb44f6c36f836adec6f0ba60ca56647092"},{"sha":"c57f57767df070919ad821431b8b9486892b0b43","author":{"name":"Mmoravec1118","email":"17046d121c931b8c9ec7c646dbc06665e33e5766@gmail.com"},"message":"badassery\n\nAdded card deck and fixed the scene","distinct":false,"url":"https://api.github.com/repos/Mmoravec1118/The-Tribes/commits/c57f57767df070919ad821431b8b9486892b0b43"},{"sha":"ff401afa64a8a8e9d159b7cc5b1028214d371532","author":{"name":"Mmoravec1118","email":"17046d121c931b8c9ec7c646dbc06665e33e5766@gmail.com"},"message":"Merge pull request #20 from Mmoravec1118/Marty\n\nMarty","distinct":false,"url":"https://api.github.com/repos/Mmoravec1118/The-Tribes/commits/ff401afa64a8a8e9d159b7cc5b1028214d371532"},{"sha":"212d1c8b02a6872958536e0d413416554705ca0b","author":{"name":"Mmoravec1118","email":"17046d121c931b8c9ec7c646dbc06665e33e5766@gmail.com"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into Jordan's_Branch","distinct":false,"url":"https://api.github.com/repos/Mmoravec1118/The-Tribes/commits/212d1c8b02a6872958536e0d413416554705ca0b"},{"sha":"3557cdc28f152bac52c21d1220a27ef85a45a52b","author":{"name":"Mmoravec1118","email":"17046d121c931b8c9ec7c646dbc06665e33e5766@gmail.com"},"message":"Merge pull request #19 from Mmoravec1118/Jordan's_Branch\n\nJordan's branch","distinct":false,"url":"https://api.github.com/repos/Mmoravec1118/The-Tribes/commits/3557cdc28f152bac52c21d1220a27ef85a45a52b"},{"sha":"12bdd6a590e45cfbf70ea8bbfbac8a93dc2fdc53","author":{"name":"Mmoravec1118","email":"17046d121c931b8c9ec7c646dbc06665e33e5766@gmail.com"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into Marty","distinct":false,"url":"https://api.github.com/repos/Mmoravec1118/The-Tribes/commits/12bdd6a590e45cfbf70ea8bbfbac8a93dc2fdc53"},{"sha":"d3b08d32b79ea400a6f8982b996756115a824c5e","author":{"name":"Mmoravec1118","email":"17046d121c931b8c9ec7c646dbc06665e33e5766@gmail.com"},"message":"Fixed everything.\n\nFixed emrge conflicts","distinct":false,"url":"https://api.github.com/repos/Mmoravec1118/The-Tribes/commits/d3b08d32b79ea400a6f8982b996756115a824c5e"},{"sha":"6309246c58a039216d6730835c9fb0b6ecfe0b68","author":{"name":"Zer0Ph34r","email":"f68b96dfba52d78fd7d292366e2263db26af9045@yahoo.com"},"message":"Fixed mainscene size to allow for propper text sizing","distinct":false,"url":"https://api.github.com/repos/Mmoravec1118/The-Tribes/commits/6309246c58a039216d6730835c9fb0b6ecfe0b68"},{"sha":"a7a93ffb4570b221883354c5c59af6d59bcdceaf","author":{"name":"Zer0Ph34r","email":"f68b96dfba52d78fd7d292366e2263db26af9045@yahoo.com"},"message":"Merge pull request #21 from Mmoravec1118/Jordan's_Branch\n\nFixed mainscene size to allow for propper text sizing","distinct":false,"url":"https://api.github.com/repos/Mmoravec1118/The-Tribes/commits/a7a93ffb4570b221883354c5c59af6d59bcdceaf"},{"sha":"8709331476e36ee010f8d89d7ea1000dbcc54ee0","author":{"name":"Zer0Ph34r","email":"f68b96dfba52d78fd7d292366e2263db26af9045@yahoo.com"},"message":"Created a Global Variables Script\nPut all enumeration into global script and fixed all errors related to it","distinct":false,"url":"https://api.github.com/repos/Mmoravec1118/The-Tribes/commits/8709331476e36ee010f8d89d7ea1000dbcc54ee0"},{"sha":"e63761d251d5cda33631ba3bda95fd116cc19a73","author":{"name":"Zer0Ph34r","email":"f68b96dfba52d78fd7d292366e2263db26af9045@yahoo.com"},"message":"Merge pull request #22 from Mmoravec1118/Jordan's_Branch\n\nCreated a Global Variables Script","distinct":false,"url":"https://api.github.com/repos/Mmoravec1118/The-Tribes/commits/e63761d251d5cda33631ba3bda95fd116cc19a73"},{"sha":"f212d9f22695d05fefb04622f1ebd351fe1194a6","author":{"name":"Zer0Ph34r","email":"f68b96dfba52d78fd7d292366e2263db26af9045@yahoo.com"},"message":"Added content to global script, not yet persistent","distinct":false,"url":"https://api.github.com/repos/Mmoravec1118/The-Tribes/commits/f212d9f22695d05fefb04622f1ebd351fe1194a6"},{"sha":"2096546bc22709eaff48bb110a73329bdd1d6faa","author":{"name":"Zer0Ph34r","email":"f68b96dfba52d78fd7d292366e2263db26af9045@yahoo.com"},"message":"Merge pull request #23 from Mmoravec1118/Jordan's_Branch\n\nAdded content to global script, not yet persistent","distinct":false,"url":"https://api.github.com/repos/Mmoravec1118/The-Tribes/commits/2096546bc22709eaff48bb110a73329bdd1d6faa"},{"sha":"c25799ce55118a2bf98daee9041930a7c6c279d8","author":{"name":"bmoore6","email":"8e447887464a0187a5468f2837562e9916b2878f@uccs.edu"},"message":"Merge remote-tracking branch 'origin/master'\n\n# Conflicts:\n#\tAssets/Scenes/Gameplay.unity","distinct":false,"url":"https://api.github.com/repos/Mmoravec1118/The-Tribes/commits/c25799ce55118a2bf98daee9041930a7c6c279d8"},{"sha":"cd61dc37ac8369f4d50064581eea175e7e2bdd88","author":{"name":"bmoore6","email":"8e447887464a0187a5468f2837562e9916b2878f@uccs.edu"},"message":"Merge remote-tracking branch 'origin/master'\n\n# Conflicts:\n#\tAssets/Scenes/Gameplay.unity","distinct":false,"url":"https://api.github.com/repos/Mmoravec1118/The-Tribes/commits/cd61dc37ac8369f4d50064581eea175e7e2bdd88"},{"sha":"7e24bb51ae559c2879869d4f4797fddbd439940c","author":{"name":"bmoore6","email":"8e447887464a0187a5468f2837562e9916b2878f@uccs.edu"},"message":"Adding pop ups\n\nhere is the best way I think to add the pop up windows for the UI. still\nneeds some work","distinct":false,"url":"https://api.github.com/repos/Mmoravec1118/The-Tribes/commits/7e24bb51ae559c2879869d4f4797fddbd439940c"},{"sha":"ccbf99f6929d8b03ef32a4cc7d722e4985832149","author":{"name":"Doug Jacob","email":"72ac40a5ea3384a045cb9ebacbc03f27aed8eaad@gmail.com"},"message":"Made a few minor changes to improve UI, committing so that I can pull in master","distinct":false,"url":"https://api.github.com/repos/Mmoravec1118/The-Tribes/commits/ccbf99f6929d8b03ef32a4cc7d722e4985832149"},{"sha":"b48d50df5fad7a090df697ae3fdf991f89c2364a","author":{"name":"Doug Jacob","email":"72ac40a5ea3384a045cb9ebacbc03f27aed8eaad@gmail.com"},"message":"Merging in master - NOTE: using own Project Version and own ButtonBehaviorScript","distinct":false,"url":"https://api.github.com/repos/Mmoravec1118/The-Tribes/commits/b48d50df5fad7a090df697ae3fdf991f89c2364a"}]}
{"actor":{"display_login":"dansyron"}}