GitHub PushEvent at 2014-10-27 08:00:58
Repository: 141017_MarioCart2D
Actor: munkhbat1900
Payload: {"shas":[["f7bf7bdb1cf023835f8772213d2a31f18a779d2d","9564d29b8085ef4d2594c6cd5b1816a99e360388@cyberagent.co.jp","joystick","武村　浩太郎",false],["d1b519062b6f4eee9ea09b7c6f48028b015ac182","d633244d38caf59f334b58e78e279dc158bb4ba6@cyberagent.co.jp","haha","Avirmed Munkhbat",true],["cadc2f848fa1f0820deed730e5a5b2e42a6abefc","d633244d38caf59f334b58e78e279dc158bb4ba6@cyberagent.co.jp","Merge branch 'develop' into feature/course_collider\n\nConflicts:\n\tAssets/Resources/Maps/DesertTile.png.meta\n\tAssets/Resources/Maps/MapTile.png.meta\n\tAssets/Resources/Maps/black.png.meta\n\tAssets/Resources/Sprites/Background/map_full_rite.png\n\tAssets/Resources/Sprites/Background/map_full_rite.png.meta\n\tAssets/Resources/Sprites/Background/stage_1.png\n\tAssets/Resources/Sprites/Background/stage_1.png.meta\n\tAssets/Resources/Sprites/Cart/Cart_2.png\n\tAssets/Resources/Sprites/Cart/Cart_2.png.meta\n\tAssets/Resources/Sprites/Cart_2.png.meta\n\tAssets/Resources/Sprites/map_full_rite.png.meta\n\tAssets/Resources/Sprites/stage_1.png.meta\n\tAssets/Scripts/gameItems/Cart.cs\n\tAssets/Scripts/gameItems/Player.cs","Avirmed Munkhbat",true]],"size":3,"ref":"refs/heads/feature/course_collider","head":"cadc2f848fa1f0820deed730e5a5b2e42a6abefc"}