{"push_id":2498994266,"size":19,"distinct_size":2,"ref":"refs/heads/eirik/connection","head":"4289fefdfe3fa640dd0a03a64df9d5dd18e14650","before":"e6efddb342fd73ea2fb4ae90bd70b90f33b54c48","commits":[{"sha":"30824f5e319240411c5425157fce2956f9f7bcad","author":{"name":"Hermann Villanger","email":"09f16883a9c0f794717747a6d5734f7b320dfa9d@gmail.com"},"message":"Scaling of vehicles in RunEffectsView","distinct":false,"url":"https://api.github.com/repos/EirikOsnes/panic/commits/30824f5e319240411c5425157fce2956f9f7bcad"},{"sha":"ca0324805a0c74e290fb42d3d8af9ffa8dd7cc35","author":{"name":"Hermann Villanger","email":"09f16883a9c0f794717747a6d5734f7b320dfa9d@gmail.com"},"message":"Added scale factor of button width and height to global constants","distinct":false,"url":"https://api.github.com/repos/EirikOsnes/panic/commits/ca0324805a0c74e290fb42d3d8af9ffa8dd7cc35"},{"sha":"c8e47f1b692d1e07e56763fde465b03b324240eb","author":{"name":"Hermann Villanger","email":"09f16883a9c0f794717747a6d5734f7b320dfa9d@gmail.com"},"message":"Added button to leave game in PlayCardView when the player is dead\nChanged some gsm.push to gsm.set","distinct":false,"url":"https://api.github.com/repos/EirikOsnes/panic/commits/c8e47f1b692d1e07e56763fde465b03b324240eb"},{"sha":"867f0f2a430f327553f582556177867cd55cabd8","author":{"name":"choffa","email":"a2739822617340c0d2c7cdf23df254358fc65e51@gmail.com"},"message":"Added MissileAction","distinct":false,"url":"https://api.github.com/repos/EirikOsnes/panic/commits/867f0f2a430f327553f582556177867cd55cabd8"},{"sha":"82b630ffa38aae32ffcc5c6d830f3b84e242ecef","author":{"name":"choffa","email":"a2739822617340c0d2c7cdf23df254358fc65e51@gmail.com"},"message":"Resolved conflict","distinct":false,"url":"https://api.github.com/repos/EirikOsnes/panic/commits/82b630ffa38aae32ffcc5c6d830f3b84e242ecef"},{"sha":"0861119ea21042b7119134f97e9d96b5529ba0bf","author":{"name":"choffa","email":"a2739822617340c0d2c7cdf23df254358fc65e51@gmail.com"},"message":"Merge branch 'dev' of github.com:EirikOsnes/panic into choffa/states_views","distinct":false,"url":"https://api.github.com/repos/EirikOsnes/panic/commits/0861119ea21042b7119134f97e9d96b5529ba0bf"},{"sha":"cdec84c878071a61e2931dd35083b76dff2507d6","author":{"name":"choffa","email":"a2739822617340c0d2c7cdf23df254358fc65e51@gmail.com"},"message":"Removed sysout","distinct":false,"url":"https://api.github.com/repos/EirikOsnes/panic/commits/cdec84c878071a61e2931dd35083b76dff2507d6"},{"sha":"dffcb40eb71e52ef66b943d868714374f83ea6d2","author":{"name":"choffa","email":"a2739822617340c0d2c7cdf23df254358fc65e51@gmail.com"},"message":"Merge branch 'eirik/connection' of github.com:EirikOsnes/panic into choffa/states_views","distinct":false,"url":"https://api.github.com/repos/EirikOsnes/panic/commits/dffcb40eb71e52ef66b943d868714374f83ea6d2"},{"sha":"f60afdc057fc3d196e4608e460833ff8fba67679","author":{"name":"Hermann Villanger","email":"09f16883a9c0f794717747a6d5734f7b320dfa9d@gmail.com"},"message":"Added button to leave game in RunEffectsView when the player is dead\nAdded methods for knowing if player is alive","distinct":false,"url":"https://api.github.com/repos/EirikOsnes/panic/commits/f60afdc057fc3d196e4608e460833ff8fba67679"},{"sha":"e1d913a2bc3cdfba1ce8da65a52a4d0d89c75079","author":{"name":"Hermann Villanger","email":"09f16883a9c0f794717747a6d5734f7b320dfa9d@gmail.com"},"message":"Merge remote-tracking branch 'origin/dev' into hermann/views\n\n# Conflicts:\n#\tcore/src/com/panic/tdt4240/states/PlayCardState.java\n#\tcore/src/com/panic/tdt4240/view/ViewClasses/MenuView.java\n#\tcore/src/com/panic/tdt4240/view/ViewClasses/RunEffectsView.java","distinct":false,"url":"https://api.github.com/repos/EirikOsnes/panic/commits/e1d913a2bc3cdfba1ce8da65a52a4d0d89c75079"},{"sha":"572be287f9eae699a1bc28d0fc8a83ecad2aa9c4","author":{"name":"Magnleik","email":"2662b8ac2653012bb2f1ca5de0ec6dc7ea38eb9a@stud.ntnu.no"},"message":"Merge pull request #74 from EirikOsnes/eirik/connection\n\nEirik/connection","distinct":false,"url":"https://api.github.com/repos/EirikOsnes/panic/commits/572be287f9eae699a1bc28d0fc8a83ecad2aa9c4"},{"sha":"79da54ecb5043d3d2f8961f838e679f26c80f691","author":{"name":"Hermann Villanger","email":"09f16883a9c0f794717747a6d5734f7b320dfa9d@gmail.com"},"message":"Fixed merge conflicts","distinct":false,"url":"https://api.github.com/repos/EirikOsnes/panic/commits/79da54ecb5043d3d2f8961f838e679f26c80f691"},{"sha":"2e83424054914acd96c462e2cb9c3315405737fa","author":{"name":"hermannvillanger","email":"09f16883a9c0f794717747a6d5734f7b320dfa9d@gmail.com"},"message":"Merge branch 'dev' into hermann/views","distinct":false,"url":"https://api.github.com/repos/EirikOsnes/panic/commits/2e83424054914acd96c462e2cb9c3315405737fa"},{"sha":"98abecbfe7cdb917fcfd4d99ecefa367231734ef","author":{"name":"EirikOsnes","email":"2c63a4158f2a3ab58a710d5e701011bfb68c1db3@gmail.com"},"message":"Merge pull request #75 from EirikOsnes/hermann/views\n\nHermann/views","distinct":false,"url":"https://api.github.com/repos/EirikOsnes/panic/commits/98abecbfe7cdb917fcfd4d99ecefa367231734ef"},{"sha":"5964ca0bc0a790d99892ed7fb1044a741fb2c193","author":{"name":"choffa","email":"a2739822617340c0d2c7cdf23df254358fc65e51@gmail.com"},"message":"Animations are better now","distinct":false,"url":"https://api.github.com/repos/EirikOsnes/panic/commits/5964ca0bc0a790d99892ed7fb1044a741fb2c193"},{"sha":"5e0894350475c425231d44781a59d99f883dfb68","author":{"name":"choffa","email":"e9bba156202c24ce35eb9e7906d9b054708c95a6@gmail.com"},"message":"Merge branch 'dev' into choffa/states_views","distinct":false,"url":"https://api.github.com/repos/EirikOsnes/panic/commits/5e0894350475c425231d44781a59d99f883dfb68"},{"sha":"6615aa03cedd42cdf24d807d0899749a2f97a319","author":{"name":"Magnleik","email":"2662b8ac2653012bb2f1ca5de0ec6dc7ea38eb9a@stud.ntnu.no"},"message":"Merge pull request #76 from EirikOsnes/choffa/states_views\n\nChoffa/states views","distinct":false,"url":"https://api.github.com/repos/EirikOsnes/panic/commits/6615aa03cedd42cdf24d807d0899749a2f97a319"},{"sha":"29f1232afcf40fbf46e2d1d66a0438f54ee82326","author":{"name":"EirikOsnes","email":"2c63a4158f2a3ab58a710d5e701011bfb68c1db3@gmail.com"},"message":"Merge branches 'dev' and 'eirik/connection' of https://github.com/EirikOsnes/panic into eirik/connection","distinct":true,"url":"https://api.github.com/repos/EirikOsnes/panic/commits/29f1232afcf40fbf46e2d1d66a0438f54ee82326"},{"sha":"4289fefdfe3fa640dd0a03a64df9d5dd18e14650","author":{"name":"EirikOsnes","email":"2c63a4158f2a3ab58a710d5e701011bfb68c1db3@gmail.com"},"message":"Fixed a RunEffects dispose error","distinct":true,"url":"https://api.github.com/repos/EirikOsnes/panic/commits/4289fefdfe3fa640dd0a03a64df9d5dd18e14650"}]}
{"actor":{"display_login":"EirikOsnes"}}