{"push_id":659440128,"size":46,"distinct_size":46,"ref":"refs/heads/master","head":"7839fa8b2b25b7577804c97d5f675019c1931eb4","before":"0ed36a177f2bf04ecb657c3ee64098b260b95a61","commits":[{"sha":"8f7bdaa4dac4df41b7bd3ccacfd6bde680a3fa3f","author":{"email":"127a767f1e1464f724f60d58f7a8d182b747c80e@users.noreply.github.com","name":"CTGG"},"message":"Merge pull request #4 from Sissel-Wu/master\n\n整合","distinct":true,"url":"https://api.github.com/repos/junooo/EL-ThreeBody/commits/8f7bdaa4dac4df41b7bd3ccacfd6bde680a3fa3f"},{"sha":"b136f9a7478ba0a313af00eb0242dc9f5161c42d","author":{"email":"cf03e38abbc152f5003936f5b4680669ba694ad3@126.com","name":"Ann"},"message":"Merge pull request #3 from Sissel-Wu/master\n\n整合","distinct":true,"url":"https://api.github.com/repos/junooo/EL-ThreeBody/commits/b136f9a7478ba0a313af00eb0242dc9f5161c42d"},{"sha":"bd4d4d0cdabefc3b578d558ed57a9ecb5e7c3c70","author":{"email":"cf03e38abbc152f5003936f5b4680669ba694ad3@126.com","name":"ShinAnn"},"message":"添加了滚动条（历史记录）","distinct":true,"url":"https://api.github.com/repos/junooo/EL-ThreeBody/commits/bd4d4d0cdabefc3b578d558ed57a9ecb5e7c3c70"},{"sha":"3776a722d9592e6328b57dcbd50594d14c9b360f","author":{"email":"cf03e38abbc152f5003936f5b4680669ba694ad3@126.com","name":"ShinAnn"},"message":"Lobby","distinct":true,"url":"https://api.github.com/repos/junooo/EL-ThreeBody/commits/3776a722d9592e6328b57dcbd50594d14c9b360f"},{"sha":"6644fbb5c003cfc0d237a38d23b128a7e124a56a","author":{"email":"43fec5fac553e987feeb1ff8fdf21757d0a2f6d5@users.noreply.github.com","name":"Sissel-Wu"},"message":"Merge pull request #19 from ShinAnn/master\n\n滚动条的bug","distinct":true,"url":"https://api.github.com/repos/junooo/EL-ThreeBody/commits/6644fbb5c003cfc0d237a38d23b128a7e124a56a"},{"sha":"806edb32bd1e91201debcf4c534979a7a4271b3e","author":{"email":"648dee5b0606036d848d1abded5671ced5fd25f9@163.com","name":"Sissel-Wu"},"message":"Server大约结束，GameControl加了同步线程（没写完）","distinct":true,"url":"https://api.github.com/repos/junooo/EL-ThreeBody/commits/806edb32bd1e91201debcf4c534979a7a4271b3e"},{"sha":"3ffd2be35604a39f09d84d2a4e65e89f4b7df85c","author":{"email":"648dee5b0606036d848d1abded5671ced5fd25f9@163.com","name":"Sissel-Wu"},"message":"Merge branch 'master' of https://github.com/junooo/EL-ThreeBody into junooo-master\n\nConflicts:\n\tThreeBody/src/control/MainControl.java\n\tThreeBody/src/ui/StartMenuPanel.java","distinct":true,"url":"https://api.github.com/repos/junooo/EL-ThreeBody/commits/3ffd2be35604a39f09d84d2a4e65e89f4b7df85c"},{"sha":"ced3ec95163d014141a4e4edb5ebfba37c076f38","author":{"email":"648dee5b0606036d848d1abded5671ced5fd25f9@163.com","name":"Sissel-Wu"},"message":"GameControl一个线程，GameDTO修复","distinct":true,"url":"https://api.github.com/repos/junooo/EL-ThreeBody/commits/ced3ec95163d014141a4e4edb5ebfba37c076f38"},{"sha":"1c2a568d8c2bfe14822f1051b3a7446d7f3a42ea","author":{"email":"cf03e38abbc152f5003936f5b4680669ba694ad3@126.com","name":"ShinAnn"},"message":"智子的弹出框","distinct":true,"url":"https://api.github.com/repos/junooo/EL-ThreeBody/commits/1c2a568d8c2bfe14822f1051b3a7446d7f3a42ea"},{"sha":"764c6c2038d2312cd1b98d0a6884df5263263013","author":{"email":"43fec5fac553e987feeb1ff8fdf21757d0a2f6d5@users.noreply.github.com","name":"Sissel-Wu"},"message":"Merge pull request #22 from ShinAnn/master\n\nMaster","distinct":true,"url":"https://api.github.com/repos/junooo/EL-ThreeBody/commits/764c6c2038d2312cd1b98d0a6884df5263263013"},{"sha":"e43a2b2ec473e60f878891c7ffd55c5648069085","author":{"email":"648dee5b0606036d848d1abded5671ced5fd25f9@163.com","name":"Sissel-Wu"},"message":"Merge branch 'master' of https://github.com/CTGG/EL-ThreeBody into CTGG-master\n\nConflicts:\n\tThreeBody/src/model/Player.java","distinct":true,"url":"https://api.github.com/repos/junooo/EL-ThreeBody/commits/e43a2b2ec473e60f878891c7ffd55c5648069085"},{"sha":"7b6ae43e26672c0b9b127f8b77eb37b33842e730","author":{"email":"648dee5b0606036d848d1abded5671ced5fd25f9@163.com","name":"Sissel-Wu"},"message":"Merge branch 'master' of https://github.com/CTGG/EL-ThreeBody into develop2\n\nConflicts:\n\tThreeBody/src/control/GameControl.java","distinct":true,"url":"https://api.github.com/repos/junooo/EL-ThreeBody/commits/7b6ae43e26672c0b9b127f8b77eb37b33842e730"},{"sha":"76c3ecd40779de27f094e24810bc46df0d30363a","author":{"email":"a6df23e4ef4063d5ee557558f13db784636e8ed8@software.nju.edu.cn","name":"CTGG"},"message":"NoBroadcasting\nTechPotion\nPriviledge_GetRole\nTechChange\nThreeBody\nUnifier","distinct":true,"url":"https://api.github.com/repos/junooo/EL-ThreeBody/commits/76c3ecd40779de27f094e24810bc46df0d30363a"},{"sha":"3e160d61bb5a1711dcf75f2b3d0c9a866f7673b7","author":{"email":"a6df23e4ef4063d5ee557558f13db784636e8ed8@software.nju.edu.cn","name":"CTGG"},"message":"ResourceGambling\nResourcePotion\nNoBroadcasting\nTechPotion\nEarth\nThreeBody\nUnifier","distinct":true,"url":"https://api.github.com/repos/junooo/EL-ThreeBody/commits/3e160d61bb5a1711dcf75f2b3d0c9a866f7673b7"},{"sha":"496d7bbd56f504d4fbfded591dbe93e420448042","author":{"email":"127a767f1e1464f724f60d58f7a8d182b747c80e@users.noreply.github.com","name":"CTGG"},"message":"Merge pull request #5 from Sissel-Wu/develop2\n\nDevelop2","distinct":true,"url":"https://api.github.com/repos/junooo/EL-ThreeBody/commits/496d7bbd56f504d4fbfded591dbe93e420448042"},{"sha":"d9c183bbf18a64756560fd42d440997b6c3b7634","author":{"email":"cf03e38abbc152f5003936f5b4680669ba694ad3@126.com","name":"Ann"},"message":"Merge pull request #4 from Sissel-Wu/develop2\n\n整合2","distinct":true,"url":"https://api.github.com/repos/junooo/EL-ThreeBody/commits/d9c183bbf18a64756560fd42d440997b6c3b7634"},{"sha":"cc2d23a1917a4986a36f65f1e4d19d5285ddfcf2","author":{"email":"cf03e38abbc152f5003936f5b4680669ba694ad3@126.com","name":"ShinAnn"},"message":"不知道更新了啥","distinct":true,"url":"https://api.github.com/repos/junooo/EL-ThreeBody/commits/cc2d23a1917a4986a36f65f1e4d19d5285ddfcf2"},{"sha":"e30ec055cb3c954553a32cd6fb10e91efdfe8c68","author":{"email":"cf03e38abbc152f5003936f5b4680669ba694ad3@126.com","name":"ShinAnn"},"message":"智子和人造智子差不多写完","distinct":true,"url":"https://api.github.com/repos/junooo/EL-ThreeBody/commits/e30ec055cb3c954553a32cd6fb10e91efdfe8c68"},{"sha":"21648ff68f1678ffec33ebc7241646ea0ef75580","author":{"email":"cf03e38abbc152f5003936f5b4680669ba694ad3@126.com","name":"ShinAnn"},"message":"智子和人造智子","distinct":true,"url":"https://api.github.com/repos/junooo/EL-ThreeBody/commits/21648ff68f1678ffec33ebc7241646ea0ef75580"},{"sha":"b952e79e6a3eac17dd0fa9ee5d7a4ed2c758e4ba","author":{"email":"cf03e38abbc152f5003936f5b4680669ba694ad3@126.com","name":"ShinAnn"},"message":"黑域","distinct":true,"url":"https://api.github.com/repos/junooo/EL-ThreeBody/commits/b952e79e6a3eac17dd0fa9ee5d7a4ed2c758e4ba"}]}