{"push_id":646205781,"size":13,"distinct_size":13,"ref":"refs/heads/master","head":"072145cbd7633df42c1b65a614d720fb967c4fbc","before":"f5a1e42732ec7d933faebf62f90ea4bd47d0ae4c","commits":[{"sha":"c7ef702d359d8449a111bd01bf1177464aafcab9","author":{"email":"d12423338774fc8412ea4f327e34837d804fef7f@york.ac.uk","name":"Thomas Gatenby"},"message":"Title screen working","distinct":true,"url":"https://api.github.com/repos/vldaglis/XYG-4/commits/c7ef702d359d8449a111bd01bf1177464aafcab9"},{"sha":"8fefafbe57d01717a548ad5226288325bc61f2b7","author":{"email":"d12423338774fc8412ea4f327e34837d804fef7f@york.ac.uk","name":"Thomas Gatenby"},"message":"Merge remote-tracking branch 'origin/master'","distinct":true,"url":"https://api.github.com/repos/vldaglis/XYG-4/commits/8fefafbe57d01717a548ad5226288325bc61f2b7"},{"sha":"3612e6a641750100b029c1b4b8c567554fff7061","author":{"email":"d12423338774fc8412ea4f327e34837d804fef7f@york.ac.uk","name":"Thomas Gatenby"},"message":"Added World values and viewports so we can change the map ,\nthis also allows resizing and fullscreen","distinct":true,"url":"https://api.github.com/repos/vldaglis/XYG-4/commits/3612e6a641750100b029c1b4b8c567554fff7061"},{"sha":"84c8212eaec8fc168ec232af981733752bb7f4f6","author":{"email":"d12423338774fc8412ea4f327e34837d804fef7f@york.ac.uk","name":"Thomas Gatenby"},"message":"Added new map and scroll - next is change city locations","distinct":true,"url":"https://api.github.com/repos/vldaglis/XYG-4/commits/84c8212eaec8fc168ec232af981733752bb7f4f6"},{"sha":"0197a5ab318b1d244271e356cdf37bd6a68f69ff","author":{"email":"d12423338774fc8412ea4f327e34837d804fef7f@york.ac.uk","name":"Thomas Gatenby"},"message":"Merge remote-tracking branch 'origin/master'","distinct":true,"url":"https://api.github.com/repos/vldaglis/XYG-4/commits/0197a5ab318b1d244271e356cdf37bd6a68f69ff"},{"sha":"fb457d5f116488bff107dcd2bbfeff6bd9027c6f","author":{"email":"d12423338774fc8412ea4f327e34837d804fef7f@york.ac.uk","name":"Thomas Gatenby"},"message":"city location script fixed can now add locations","distinct":true,"url":"https://api.github.com/repos/vldaglis/XYG-4/commits/fb457d5f116488bff107dcd2bbfeff6bd9027c6f"},{"sha":"b7c76a27d61c0bf44e4c17ae8eee9e3fffcbc40f","author":{"email":"d12423338774fc8412ea4f327e34837d804fef7f@york.ac.uk","name":"Thomas Gatenby"},"message":"cities in correct location, next junctions!","distinct":true,"url":"https://api.github.com/repos/vldaglis/XYG-4/commits/b7c76a27d61c0bf44e4c17ae8eee9e3fffcbc40f"},{"sha":"af74346efabf33952a30942871753f5593d72b85","author":{"email":"d12423338774fc8412ea4f327e34837d804fef7f@york.ac.uk","name":"Thomas Gatenby"},"message":"outside ring of junctions done","distinct":true,"url":"https://api.github.com/repos/vldaglis/XYG-4/commits/af74346efabf33952a30942871753f5593d72b85"},{"sha":"4975058c2724262267735286dc22a64d5947eb34","author":{"email":"d12423338774fc8412ea4f327e34837d804fef7f@york.ac.uk","name":"Thomas Gatenby"},"message":"Merge remote-tracking branch 'origin/master'\n\nConflicts:\n\tcore/src/taxe/controller/ConnectionController.java\n\tcore/src/taxe/controller/ResourceController.java","distinct":true,"url":"https://api.github.com/repos/vldaglis/XYG-4/commits/4975058c2724262267735286dc22a64d5947eb34"},{"sha":"25d1f9e0545c8a388c93b981d264cbe3cf1f3275","author":{"email":"d12423338774fc8412ea4f327e34837d804fef7f@york.ac.uk","name":"Thomas Gatenby"},"message":"changed HEIGHT to WORLD_HEIGHT in connection and resource controller","distinct":true,"url":"https://api.github.com/repos/vldaglis/XYG-4/commits/25d1f9e0545c8a388c93b981d264cbe3cf1f3275"},{"sha":"9d0f5898548bc728bddda3ddff8a6219a5ebfbb8","author":{"email":"d12423338774fc8412ea4f327e34837d804fef7f@york.ac.uk","name":"Thomas Gatenby"},"message":"All junctions positioned","distinct":true,"url":"https://api.github.com/repos/vldaglis/XYG-4/commits/9d0f5898548bc728bddda3ddff8a6219a5ebfbb8"},{"sha":"930c2a8ea170970383146ce6f0733ec2ec434588","author":{"email":"d12423338774fc8412ea4f327e34837d804fef7f@york.ac.uk","name":"Thomas Gatenby"},"message":"Connections done","distinct":true,"url":"https://api.github.com/repos/vldaglis/XYG-4/commits/930c2a8ea170970383146ce6f0733ec2ec434588"},{"sha":"072145cbd7633df42c1b65a614d720fb967c4fbc","author":{"email":"d12423338774fc8412ea4f327e34837d804fef7f@york.ac.uk","name":"Thomas Gatenby"},"message":"Pushing all changes after checking for update","distinct":true,"url":"https://api.github.com/repos/vldaglis/XYG-4/commits/072145cbd7633df42c1b65a614d720fb967c4fbc"}]}