{"push_id":1014072123,"size":23,"distinct_size":2,"ref":"refs/heads/Andrew_Roberts","head":"a31d114f9ec6a2cde8c5bd9139b8de31c169d26d","before":"dd8c268054b4303a16b6da6054184e5141c1a45b","commits":[{"sha":"0e0cd45f3a12e6c009c86e0073b21ef4c896cb7d","author":{"email":"86f6d9cdc741d9a4b13dd1125d5aeab6c533c8d9@Andrijas-MacBook-Air.local","name":"CroBobi"},"message":"Made a folder\n\nI made a folder and put in test script","distinct":false,"url":"https://api.github.com/repos/justcollins/TWI_Repo/commits/0e0cd45f3a12e6c009c86e0073b21ef4c896cb7d"},{"sha":"8cabeb13a9db3f3f4ca7ca54f2a78f90fed2d7bc","author":{"email":"86f6d9cdc741d9a4b13dd1125d5aeab6c533c8d9@Andrijas-MacBook-Air.local","name":"CroBobi"},"message":"Radar Scrpit\n\nAll of the basic functionality works, next up canvas","distinct":false,"url":"https://api.github.com/repos/justcollins/TWI_Repo/commits/8cabeb13a9db3f3f4ca7ca54f2a78f90fed2d7bc"},{"sha":"99ef0f62eb7237a0439bcd5c118b211fadb568b7","author":{"email":"86f6d9cdc741d9a4b13dd1125d5aeab6c533c8d9@Andrijas-MacBook-Air.local","name":"CroBobi"},"message":"Merge branch 'master' into Andrija\n\n# Conflicts:\n#\tTWI_UnityProject/Assets/TWI_MainAssets/ReadMe_Main.txt.meta","distinct":false,"url":"https://api.github.com/repos/justcollins/TWI_Repo/commits/99ef0f62eb7237a0439bcd5c118b211fadb568b7"},{"sha":"f861309c1aa69270cc93bb4d8510670b2c8b0fdb","author":{"email":"204036a1ef6e7360e536300ea78c6aeb4a9333dd@AI232LAB0210P07.AICASF.EDMC.STU","name":"sarahho713"},"message":"added a bunch of stuff\n\nadded more assets","distinct":false,"url":"https://api.github.com/repos/justcollins/TWI_Repo/commits/f861309c1aa69270cc93bb4d8510670b2c8b0fdb"},{"sha":"0f1e5d230b90343479f25de549ec974ee5781fc2","author":{"email":"204036a1ef6e7360e536300ea78c6aeb4a9333dd@AI232LAB0210P07.AICASF.EDMC.STU","name":"sarahho713"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into Sarah_Ho","distinct":false,"url":"https://api.github.com/repos/justcollins/TWI_Repo/commits/0f1e5d230b90343479f25de549ec974ee5781fc2"},{"sha":"ce8504f9b34f1061cc17a59e8f31cf498d55b7f7","author":{"email":"204036a1ef6e7360e536300ea78c6aeb4a9333dd@AI232LAB0210P07.AICASF.EDMC.STU","name":"sarahho713"},"message":"mat and blinns\n\nthese stuff got added","distinct":false,"url":"https://api.github.com/repos/justcollins/TWI_Repo/commits/ce8504f9b34f1061cc17a59e8f31cf498d55b7f7"},{"sha":"11059f219c489e81c4c3c64db885e791ca4df9d1","author":{"email":"2f2ff23a89133e0f90b144c592bb1aff92607caf@comcast.net","name":"Justin Collins"},"message":"Merge pull request #32 from justcollins/Andrew_Roberts\n\nAndrew roberts","distinct":false,"url":"https://api.github.com/repos/justcollins/TWI_Repo/commits/11059f219c489e81c4c3c64db885e791ca4df9d1"},{"sha":"d09fefd82bda6a72c5931a318bc17a45b4ebf984","author":{"email":"86f6d9cdc741d9a4b13dd1125d5aeab6c533c8d9@Andrijas-MacBook-Air.local","name":"CroBobi"},"message":"Radar\n\nRadar is on canvas and works","distinct":false,"url":"https://api.github.com/repos/justcollins/TWI_Repo/commits/d09fefd82bda6a72c5931a318bc17a45b4ebf984"},{"sha":"0070993b18c1983a9cbfaee7b7069097b3163405","author":{"email":"86f6d9cdc741d9a4b13dd1125d5aeab6c533c8d9@Andrijas-MacBook-Air.local","name":"CroBobi"},"message":"Merge branch 'master' into Andrija","distinct":false,"url":"https://api.github.com/repos/justcollins/TWI_Repo/commits/0070993b18c1983a9cbfaee7b7069097b3163405"},{"sha":"c01f3bb1f8eae8ad4c8ef6e398c9d15f6e15ebeb","author":{"email":"c5c4b1a0d000577f73df8ff2b80cd63a34ac44c5@yahoo.com","name":"sarah"},"message":"Shield Script\n\nmade fixes to the energy script during class","distinct":false,"url":"https://api.github.com/repos/justcollins/TWI_Repo/commits/c01f3bb1f8eae8ad4c8ef6e398c9d15f6e15ebeb"},{"sha":"ce02aa8c680961a5b8a495fc0bcf40adaf601438","author":{"email":"c5c4b1a0d000577f73df8ff2b80cd63a34ac44c5@yahoo.com","name":"sarah"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into Sarah_Ho\n\n# Conflicts:\n\n#\tTWI_UnityProject/Assets/TWI_MainAssets/TWI_PRO_AR/TWI_PRO_AR_Assets/Materials/blinn4.mat\n\n#\tTWI_UnityProject/Assets/TWI_MainAssets/TWI_PRO_AR/TWI_PRO_AR_Assets/Materials/blinn4.mat.meta\n\n#\tTWI_UnityProject/Assets/TWI_MainAssets/TWI_PRO_AR/TWI_PRO_AR_Assets/Materials/blinn5.mat\n\n#\tTWI_UnityProject/Assets/TWI_MainAssets/TWI_PRO_AR/TWI_PRO_AR_Assets/Materials/blinn5.mat.meta","distinct":false,"url":"https://api.github.com/repos/justcollins/TWI_Repo/commits/ce02aa8c680961a5b8a495fc0bcf40adaf601438"},{"sha":"5b5ff34e249c18d4a174a28421fe1bad717146cf","author":{"email":"2f2ff23a89133e0f90b144c592bb1aff92607caf@comcast.net","name":"Justin Collins"},"message":"Merge pull request #33 from justcollins/Andrija\n\nAndrija","distinct":false,"url":"https://api.github.com/repos/justcollins/TWI_Repo/commits/5b5ff34e249c18d4a174a28421fe1bad717146cf"},{"sha":"b0ae5ea9adddafa87bf8c337d3c9bf55ba14e756","author":{"email":"c5c4b1a0d000577f73df8ff2b80cd63a34ac44c5@yahoo.com","name":"sarah"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into Sarah_Ho\n\n# Conflicts:\n#\tTWI_UnityProject/ProjectSettings/ProjectSettings.asset","distinct":false,"url":"https://api.github.com/repos/justcollins/TWI_Repo/commits/b0ae5ea9adddafa87bf8c337d3c9bf55ba14e756"},{"sha":"3affb3ac5ce9ae18a71785eddd51b5acf9b4ef07","author":{"email":"2f2ff23a89133e0f90b144c592bb1aff92607caf@comcast.net","name":"Justin Collins"},"message":"Merge pull request #35 from justcollins/Sarah_Ho\n\nSarah ho","distinct":false,"url":"https://api.github.com/repos/justcollins/TWI_Repo/commits/3affb3ac5ce9ae18a71785eddd51b5acf9b4ef07"},{"sha":"62cc1e7251f5c5887f943a57722b925bb82fb0ed","author":{"email":"86f6d9cdc741d9a4b13dd1125d5aeab6c533c8d9@Andrijas-MacBook-Air.local","name":"CroBobi"},"message":"Merge branch 'master' into Andrija","distinct":false,"url":"https://api.github.com/repos/justcollins/TWI_Repo/commits/62cc1e7251f5c5887f943a57722b925bb82fb0ed"},{"sha":"456f3a8f12745075ac4f4b3c37dd6b35ee600916","author":{"email":"c5c4b1a0d000577f73df8ff2b80cd63a34ac44c5@yahoo.com","name":"sarah"},"message":"INTEGRATION!\n\nWe integrated. =) Test Radar functionality.","distinct":false,"url":"https://api.github.com/repos/justcollins/TWI_Repo/commits/456f3a8f12745075ac4f4b3c37dd6b35ee600916"},{"sha":"7d32bb0c70f9d9d8b308b2f3f5c02f6f21a86ad9","author":{"email":"2f2ff23a89133e0f90b144c592bb1aff92607caf@comcast.net","name":"Justin Collins"},"message":"Merge pull request #36 from justcollins/Sarah_Ho\n\nINTEGRATION","distinct":false,"url":"https://api.github.com/repos/justcollins/TWI_Repo/commits/7d32bb0c70f9d9d8b308b2f3f5c02f6f21a86ad9"},{"sha":"b9d9ba82d57b9f1ea621958344661171e82b50f6","author":{"email":"86f6d9cdc741d9a4b13dd1125d5aeab6c533c8d9@Andrijas-MacBook-Air.local","name":"CroBobi"},"message":"What\n\nSome meta files","distinct":false,"url":"https://api.github.com/repos/justcollins/TWI_Repo/commits/b9d9ba82d57b9f1ea621958344661171e82b50f6"},{"sha":"b8f3474e2fc002f6d874d0b7264671532da471e3","author":{"email":"86f6d9cdc741d9a4b13dd1125d5aeab6c533c8d9@Andrijas-MacBook-Air.local","name":"CroBobi"},"message":"Merge branch 'master' into Andrija\n\n# Conflicts:\n#\nTWI_UnityProject/Assets/TWI_MainAssets/TWI_PRO_AR/TWI_PRO_AR_Assets/Mate\nrials.meta~refs_remotes_origin_master.meta\n#\nTWI_UnityProject/Assets/TWI_MainAssets/TWI_PRO_SH/scenes/weaponShield3.u\nnity.meta","distinct":false,"url":"https://api.github.com/repos/justcollins/TWI_Repo/commits/b8f3474e2fc002f6d874d0b7264671532da471e3"},{"sha":"f9f26b856ba005c7efd5075cf6444d005dcbafff","author":{"email":"86f6d9cdc741d9a4b13dd1125d5aeab6c533c8d9@Andrijas-MacBook-Air.local","name":"CroBobi"},"message":"Overheat\n\nadded some overheat functionality, NOT YET COMPLETE, but works","distinct":false,"url":"https://api.github.com/repos/justcollins/TWI_Repo/commits/f9f26b856ba005c7efd5075cf6444d005dcbafff"}]}