{"push_id":622686724,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"fdfb88edda89c294f5c2818f3d1fdd47655be08f","before":"1c2fa828e7de8b80f70b635fb6c266f55d94765b","commits":[{"sha":"fdfb88edda89c294f5c2818f3d1fdd47655be08f","author":{"email":"72515bec67e88b2994a93c11ffd0a2fc97693428@outlook.com","name":"ZexonPrime"},"message":"duh walk fixed\n\nMerge branch 'master' of https://github.com/projectPJA/the-correct-one\n\nRevert \"Merge remote-tracking branch 'origin/master'\"\n\nThis reverts\ncommit 682092e2dc7d5c2fd196313b72c978af098f9892.\n\nRevert \"fixed walk sound\"\n\nThis reverts commit\ncfe3d38dea5bfc29c600ab2193a401747c46e690.\n\nConflicts:\n\tProject\nBabel/Project Babel.sdf\n\tProject Babel/Project Babel.v12.suo\n\tProject\nBabel/Project Babel/Debug/Project Babel.log\n\tProject Babel/ipch/project\nbabel-b8de057d/project babel-38d3f719.ipch\n\nMerge remote-tracking branch 'origin/master'\n\nConflicts:\n\tProject\nBabel/Debug/Project Babel.exe\n\tProject Babel/Debug/Project\nBabel.pdb\n\tProject Babel/Project Babel.sdf\n\tProject Babel/Project\nBabel.v12.suo\n\tProject Babel/Project Babel/Debug/2d.obj\n\tProject\nBabel/Project Babel/Debug/2d_math.obj\n\tProject Babel/Project\nBabel/Debug/Combat.obj\n\tProject Babel/Project Babel/Debug/Project\nBabel.log\n\tProject Babel/Project Babel/Debug/Project Babel.pch\n\tProject\nBabel/Project Babel/Debug/Project Babel.tlog/CL.write.1.tlog\n\tProject\nBabel/Project Babel/Debug/TextObject.obj\n\tProject Babel/Project\nBabel/Debug/UI_handler.obj\n\tProject Babel/Project\nBabel/Debug/UI_render.obj\n\tProject Babel/Project\nBabel/Debug/animation.obj\n\tProject Babel/Project\nBabel/Debug/application.obj\n\tProject Babel/Project\nBabel/Debug/auto_path.obj\n\tProject Babel/Project\nBabel/Debug/character_panel_state.obj\n\tProject Babel/Project\nBabel/Debug/collision_map.obj\n\tProject Babel/Project\nBabel/Debug/common.obj\n\tProject Babel/Project\nBabel/Debug/controls.obj\n\tProject Babel/Project\nBabel/Debug/dice.obj\n\tProject Babel/Project\nBabel/Debug/effects_handler.obj\n\tProject Babel/Project\nBabel/Debug/enemy.obj\n\tProject Babel/Project\nBabel/Debug/enemy_loader.obj\n\tProject Babel/Project\nBabel/Debug/enemy_manager.obj\n\tProject Babel/Project\nBabel/Debug/event_handler.obj\n\tProject Babel/Project\nBabel/Debug/floating_text.obj\n\tProject Babel/Project\nBabel/Debug/fog_of_war.obj\n\tProject Babel/Project\nBabel/Debug/font_manager.obj\n\tProject Babel/Project\nBabel/Debug/game_object.obj\n\tProject Babel/Project\nBabel/Debug/game_render.obj\n\tProject Babel/Project\nBabel/Debug/graph.obj\n\tProject Babel/Project Babel/Debug/hp.obj\n\tProject\nBabel/Project Babel/Debug/inventory.obj\n\tProject Babel/Project\nBabel/Debug/inventory_state.obj\n\tProject Babel/Project\nBabel/Debug/item.obj\n\tProject Babel/Project\nBabel/Debug/item_list.obj\n\tProject Babel/Project\nBabel/Debug/item_types.obj\n\tProject Babel/Project\nBabel/Debug/main.obj\n\tProject Babel/Project Babel/Debug/map.obj\n\tProject\nBabel/Project Babel/Debug/map_helper1.obj\n\tProject Babel/Project\nBabel/Debug/map_helper2.obj\n\tProject Babel/Project\nBabel/Debug/map_helper3.obj\n\tProject Babel/Project\nBabel/Debug/media_player.obj\n\tProject Babel/Project\nBabel/Debug/menu_item.obj\n\tProject Babel/Project\nBabel/Debug/menu_render.obj\n\tProject Babel/Project\nBabel/Debug/menu_state.obj\n\tProject Babel/Project\nBabel/Debug/miscellaneous.obj\n\tProject Babel/Project\nBabel/Debug/movement.obj\n\tProject Babel/Project\nBabel/Debug/one_direction.obj\n\tProject Babel/Project\nBabel/Debug/panel_render.obj\n\tProject Babel/Project\nBabel/Debug/panel_state.obj\n\tProject Babel/Project\nBabel/Debug/pathfinder.obj\n\tProject Babel/Project\nBabel/Debug/physical_attributes.obj\n\tProject Babel/Project\nBabel/Debug/player.obj\n\tProject Babel/Project\nBabel/Debug/room.obj\n\tProject Babel/Project\nBabel/Debug/scroller.obj\n\tProject Babel/Project\nBabel/Debug/shader.obj\n\tProject Babel/Project\nBabel/Debug/sound_manager.obj\n\tProject Babel/Project\nBabel/Debug/splash_screen.obj\n\tProject Babel/Project\nBabel/Debug/sprite.obj\n\tProject Babel/Project\nBabel/Debug/sprite_manager.obj\n\tProject Babel/Project\nBabel/Debug/stats.obj\n\tProject Babel/Project\nBabel/Debug/story_render.obj\n\tProject Babel/Project\nBabel/Debug/story_state.obj\n\tProject Babel/Project\nBabel/Debug/text2D.obj\n\tProject Babel/Project\nBabel/Debug/text_render.obj\n\tProject Babel/Project\nBabel/Debug/texture.obj\n\tProject Babel/Project\nBabel/Debug/tile_map.obj\n\tProject Babel/Project\nBabel/Debug/turn.obj\n\tProject Babel/Project\nBabel/Debug/ui_helper.obj\n\tProject Babel/Project\nBabel/Debug/ui_intersect.obj\n\tProject Babel/Project\nBabel/Debug/ui_mover.obj\n\tProject Babel/Project\nBabel/Debug/ui_state.obj\n\tProject Babel/Project\nBabel/Debug/uniform_2d.obj\n\tProject Babel/Project\nBabel/Debug/vc120.idb\n\tProject Babel/Project\nBabel/Debug/vc120.pdb\n\tProject Babel/Project Babel/Debug/xp.obj\n\nMerge remote-tracking branch 'origin/master'\n\nConflicts:\n\tProject\nBabel/Debug/Project Babel.exe\n\tProject Babel/Debug/Project\nBabel.pdb\n\tProject Babel/Project Babel.sdf\n\tProject Babel/Project\nBabel.v12.suo\n\tProject Babel/Project Babel/Debug/2d.obj\n\tProject\nBabel/Project Babel/Debug/2d_math.obj\n\tProject Babel/Project\nBabel/Debug/Combat.obj\n\tProject Babel/Project Babel/Debug/Project\nBabel.log\n\tProject Babel/Project Babel/Debug/Project Babel.pch\n\tProject\nBabel/Project Babel/Debug/Project Babel.tlog/CL.write.1.tlog\n\tProject\nBabel/Project Babel/Debug/TextObject.obj\n\tProject Babel/Project\nBabel/Debug/UI_handler.obj\n\tProject Babel/Project\nBabel/Debug/UI_render.obj\n\tProject Babel/Project\nBabel/Debug/animation.obj\n\tProject Babel/Project\nBabel/Debug/application.obj\n\tProject Babel/Project\nBabel/Debug/auto_path.obj\n\tProject Babel/Project\nBabel/Debug/character_panel_state.obj\n\tProject Babel/Project\nBabel/Debug/collision_map.obj\n\tProject Babel/Project\nBabel/Debug/common.obj\n\tProject Babel/Project\nBabel/Debug/controls.obj\n\tProject Babel/Project\nBabel/Debug/dice.obj\n\tProject Babel/Project\nBabel/Debug/effects_handler.obj\n\tProject Babel/Project\nBabel/Debug/enemy.obj\n\tProject Babel/Project\nBabel/Debug/enemy_loader.obj\n\tProject Babel/Project\nBabel/Debug/enemy_manager.obj\n\tProject Babel/Project\nBabel/Debug/event_handler.obj\n\tProject Babel/Project\nBabel/Debug/floating_text.obj\n\tProject Babel/Project\nBabel/Debug/fog_of_war.obj\n\tProject Babel/Project\nBabel/Debug/font_manager.obj\n\tProject Babel/Project\nBabel/Debug/game_object.obj\n\tProject Babel/Project\nBabel/Debug/game_render.obj\n\tProject Babel/Project\nBabel/Debug/graph.obj\n\tProject Babel/Project Babel/Debug/hp.obj\n\tProject\nBabel/Project Babel/Debug/inventory.obj\n\tProject Babel/Project\nBabel/Debug/inventory_state.obj\n\tProject Babel/Project\nBabel/Debug/item.obj\n\tProject Babel/Project\nBabel/Debug/item_list.obj\n\tProject Babel/Project\nBabel/Debug/item_types.obj\n\tProject Babel/Project\nBabel/Debug/main.obj\n\tProject Babel/Project Babel/Debug/map.obj\n\tProject\nBabel/Project Babel/Debug/map_helper1.obj\n\tProject Babel/Project\nBabel/Debug/map_helper2.obj\n\tProject Babel/Project\nBabel/Debug/map_helper3.obj\n\tProject Babel/Project\nBabel/Debug/media_player.obj\n\tProject Babel/Project\nBabel/Debug/menu_item.obj\n\tProject Babel/Project\nBabel/Debug/menu_render.obj\n\tProject Babel/Project\nBabel/Debug/menu_state.obj\n\tProject Babel/Project\nBabel/Debug/miscellaneous.obj\n\tProject Babel/Project\nBabel/Debug/movement.obj\n\tProject Babel/Project\nBabel/Debug/one_direction.obj\n\tProject Babel/Project\nBabel/Debug/panel_render.obj\n\tProject Babel/Project\nBabel/Debug/panel_state.obj\n\tProject Babel/Project\nBabel/Debug/pathfinder.obj\n\tProject Babel/Project\nBabel/Debug/physical_attributes.obj\n\tProject Babel/Project\nBabel/Debug/player.obj\n\tProject Babel/Project\nBabel/Debug/room.obj\n\tProject Babel/Project\nBabel/Debug/scroller.obj\n\tProject Babel/Project\nBabel/Debug/shader.obj\n\tProject Babel/Project\nBabel/Debug/sound_manager.obj\n\tProject Babel/Project\nBabel/Debug/splash_screen.obj\n\tProject Babel/Project\nBabel/Debug/sprite.obj\n\tProject Babel/Project\nBabel/Debug/sprite_manager.obj\n\tProject Babel/Project\nBabel/Debug/stats.obj\n\tProject Babel/Project\nBabel/Debug/story_render.obj\n\tProject Babel/Project\nBabel/Debug/story_state.obj\n\tProject Babel/Project\nBabel/Debug/text2D.obj\n\tProject Babel/Project\nBabel/Debug/text_render.obj\n\tProject Babel/Project\nBabel/Debug/texture.obj\n\tProject Babel/Project\nBabel/Debug/tile_map.obj\n\tProject Babel/Project\nBabel/Debug/turn.obj\n\tProject Babel/Project\nBabel/Debug/ui_helper.obj\n\tProject Babel/Project\nBabel/Debug/ui_intersect.obj\n\tProject Babel/Project\nBabel/Debug/ui_mover.obj\n\tProject Babel/Project\nBabel/Debug/ui_state.obj\n\tProject Babel/Project\nBabel/Debug/uniform_2d.obj\n\tProject Babel/Project\nBabel/Debug/vc120.idb\n\tProject Babel/Project\nBabel/Debug/vc120.pdb\n\tProject Babel/Project Babel/Debug/xp.obj\n\nfixed walk sound","distinct":true,"url":"https://api.github.com/repos/projectPJA/the-correct-one/commits/fdfb88edda89c294f5c2818f3d1fdd47655be08f"}]}