{"push_id":602854613,"size":5,"distinct_size":1,"ref":"refs/heads/master","head":"664c8241b40ac9b480436ff417fe6486cd27cc8c","before":"1dfe56cba4101f196c498880c870c36646c06290","commits":[{"sha":"d1c4635c18dd3bfdda2fac885c861c8fa8989342","author":{"email":"b127f3d005e74ae605278325ae51881981ff20c1@eagles.ewu.edu","name":"jeffclarkk"},"message":"updated uml for battle","distinct":false,"url":"https://api.github.com/repos/cossquaredplussinsquared/designPatternsGame/commits/d1c4635c18dd3bfdda2fac885c861c8fa8989342"},{"sha":"42dfc59d69cd0cdc86e0963783d954b076fdd0e8","author":{"email":"b127f3d005e74ae605278325ae51881981ff20c1@eagles.ewu.edu","name":"jeffclarkk"},"message":"Merge branch 'jeffworkspace' of https://github.com/cossquaredplussinsquared/designPatternsGame into jeffworkspace\n\nConflicts:\n\tProject Loyal/bin/.gitignore","distinct":false,"url":"https://api.github.com/repos/cossquaredplussinsquared/designPatternsGame/commits/42dfc59d69cd0cdc86e0963783d954b076fdd0e8"},{"sha":"2d12efe13951441217ad1ae9499bbef5b3016b8b","author":{"email":"b127f3d005e74ae605278325ae51881981ff20c1@eagles.ewu.edu","name":"jeffclarkk"},"message":"updated battlemenu and battleai to be updated","distinct":false,"url":"https://api.github.com/repos/cossquaredplussinsquared/designPatternsGame/commits/2d12efe13951441217ad1ae9499bbef5b3016b8b"},{"sha":"6d622cd69746d38b361fb01a695b02e7b2cd45bb","author":{"email":"b127f3d005e74ae605278325ae51881981ff20c1@eagles.ewu.edu","name":"jeffclarkk"},"message":"here's the shit","distinct":false,"url":"https://api.github.com/repos/cossquaredplussinsquared/designPatternsGame/commits/6d622cd69746d38b361fb01a695b02e7b2cd45bb"},{"sha":"664c8241b40ac9b480436ff417fe6486cd27cc8c","author":{"email":"6885f3e57cc3d08635f4a0b49b4d737cd19a1e65@gmail.com","name":"nocturnhabeo"},"message":"Merge branch 'jeffworkspace'\n\nConflicts:\n\tProject Loyal/bin/ProjectLoyalOverview.uxf\n\tProject Loyal/bin/loyal/Battle/Actions/Tester.class\n\tProject Loyal/bin/loyal/Battle/Battle.class\n\tProject Loyal/bin/loyal/Battle/BattleAI.class\n\tProject Loyal/bin/loyal/Battle/BattleController.class\n\tProject Loyal/bin/loyal/Battle/BattleMenu.class\n\tProject Loyal/bin/loyal/LevelInitializer.class\n\tProject Loyal/bin/loyal/entities/BattleCharacters.class\n\tProject Loyal/bin/loyal/entities/MenuItems.class\n\tProject Loyal/bin/loyal/entities/Pointer.class\n\tProject Loyal/bin/loyal/level/BattleLevel.class\n\tProject Loyal/bin/loyal/level/Decision.class\n\tProject Loyal/bin/loyal/level/DecisionFactory.class\n\tProject Loyal/bin/loyal/level/EdgesCollisionDecision.class\n\tProject Loyal/bin/loyal/level/EnterBattle.class\n\tProject Loyal/src/loyal/Battle/BattleAI.java\n\tProject Loyal/src/loyal/Battle/BattleMenu.java","distinct":true,"url":"https://api.github.com/repos/cossquaredplussinsquared/designPatternsGame/commits/664c8241b40ac9b480436ff417fe6486cd27cc8c"}]}