{"push_id":927785864,"size":3,"distinct_size":1,"ref":"refs/heads/master","head":"fa2b0183d74bacacf32fb8274f9b5405233e03ab","before":"d8109115b01c869f3bcf09f49bcbc557ed6b5227","commits":[{"sha":"6713776003d45c9595f823efd5a63e8e47aad136","author":{"email":"4bf8ce9a40a4e024f7e550ef0f6a49ddfe06db52@ie.u-ryukyu.ac.jp","name":"e145717"},"message":"commit branch test","distinct":false,"url":"https://api.github.com/repos/ie-ModelingAndDesign/2015-K/commits/6713776003d45c9595f823efd5a63e8e47aad136"},{"sha":"a8c283b54b21fa797d86020d545477fb390000a7","author":{"email":"4bf8ce9a40a4e024f7e550ef0f6a49ddfe06db52@ie.u-ryukyu.ac.jp","name":"e145717"},"message":"地下（仮）","distinct":false,"url":"https://api.github.com/repos/ie-ModelingAndDesign/2015-K/commits/a8c283b54b21fa797d86020d545477fb390000a7"},{"sha":"fa2b0183d74bacacf32fb8274f9b5405233e03ab","author":{"email":"4bf8ce9a40a4e024f7e550ef0f6a49ddfe06db52@ie.u-ryukyu.ac.jp","name":"e145717"},"message":"Merge remote-tracking branch 'origin/e145717'\n\nConflicts:\n\t.gitignore\n\tAssets/Animations/PlayerAnime.meta\n\tAssets/Animations/PlayerAnime/PlayerE.meta\n\tAssets/Animations/PlayerAnime/PlayerE/model_allE.anim\n\tAssets/Animations/PlayerAnime/PlayerE/model_allE.anim.meta\n\tAssets/Animations/PlayerAnime/PlayerE/model_allE.controller\n\tAssets/Animations/PlayerAnime/PlayerE/model_allE.controller.meta\n\tAssets/Animations/PlayerAnime/PlayerN.meta\n\tAssets/Animations/PlayerAnime/PlayerN/model_allN.anim\n\tAssets/Animations/PlayerAnime/PlayerN/model_allN.anim.meta\n\tAssets/Animations/PlayerAnime/PlayerN/model_allN.controller\n\tAssets/Animations/PlayerAnime/PlayerN/model_allN.controller.meta\n\tAssets/Animations/PlayerAnime/PlayerNEWS.meta\n\tAssets/Animations/PlayerAnime/PlayerNEWS/anim.controller\n\tAssets/Animations/PlayerAnime/PlayerNEWS/anim.controller.meta\n\tAssets/Animations/PlayerAnime/PlayerS.meta\n\tAssets/Animations/PlayerAnime/PlayerS/model_allS.anim\n\tAssets/Animations/PlayerAnime/PlayerS/model_allS.anim.meta\n\tAssets/Animations/PlayerAnime/PlayerS/model_allS.controller\n\tAssets/Animations/PlayerAnime/PlayerS/model_allS.controller.meta\n\tAssets/Animations/PlayerAnime/PlayerW.meta\n\tAssets/Animations/PlayerAnime/PlayerW/model_allW.anim\n\tAssets/Animations/PlayerAnime/PlayerW/model_allW.anim.meta\n\tAssets/Animations/PlayerAnime/PlayerW/model_allW.controller\n\tAssets/Animations/PlayerAnime/PlayerW/model_allW.controller.meta\n\tAssets/Editor.meta\n\tAssets/OtherAssets.meta\n\tAssets/OtherAssets/FlagManager.meta\n\tAssets/OtherAssets/FlagManager/FlagManager.cs\n\tAssets/OtherAssets/FlagManager/FlagManager.cs.meta\n\tAssets/OtherAssets/FlagManager/FlagManager.prefab\n\tAssets/OtherAssets/FlagManager/FlagManager.prefab.meta\n\tAssets/OtherAssets/Standard Assets.meta\n\tAssets/OtherAssets/Standard Assets/CrossPlatformInput/Prefabs/MobileSingleStickControl.prefab\n\tAssets/Resources.meta\n\tAssets/Resources/text.meta\n\tAssets/Resources/text/textestest.txt\n\tAssets/Resources/text/textestest.txt.meta\n\tAssets/Scenes/Stage.unity\n\tAssets/Scenes/Stage.unity.meta\n\tAssets/Scenes/title.unity\n\tAssets/Scenes/title.unity.meta\n\tAssets/Scripts/Button.cs\n\tAssets/Scripts/Button.cs.meta\n\tAssets/Scripts/C_Door.cs\n\tAssets/Scripts/C_Door.cs.meta\n\tAssets/Scripts/C_Shelf.cs\n\tAssets/Scripts/C_Shelf.cs.meta\n\tAssets/Scripts/C_StudyDesk.cs\n\tAssets/Scripts/C_StudyDesk.cs.meta\n\tAssets/Scripts/C_bed.cs\n\tAssets/Scripts/C_bed.cs.meta\n\tAssets/Scripts/Camera.cs\n\tAssets/Scripts/Camera.cs.meta\n\tAssets/Scripts/PlayerAnime.cs\n\tAssets/Scripts/PlayerAnime.cs.meta\n\tAssets/Scripts/PlayerMove.cs\n\tAssets/Scripts/PlayerMove.cs.meta\n\tAssets/Scripts/Text_Bed.cs\n\tAssets/Scripts/Text_Bed.cs.meta\n\tAssets/Scripts/Text_Door.cs\n\tAssets/Scripts/Text_Door.cs.meta\n\tAssets/Scripts/Text_Shelf.cs\n\tAssets/Scripts/Text_Shelf.cs.meta\n\tAssets/Scripts/Text_StudyDesk.cs\n\tAssets/Scripts/Text_StudyDesk.cs.meta\n\tAssets/Scripts/title.cs\n\tAssets/Scripts/title.cs.meta\n\tAssets/Sounds/n105.mp3\n\tAssets/Sounds/n105.mp3.meta\n\tAssets/Sounds/n60.mp3\n\tAssets/Sounds/n60.mp3.meta\n\tAssets/Sprites/BP.meta\n\tAssets/Sprites/BP/hakkou2.png\n\tAssets/Sprites/BP/hakkou2.png.meta\n\tAssets/Sprites/BP/iti.png\n\tAssets/Sprites/BP/iti.png.meta\n\tAssets/Sprites/BP/key2.png\n\tAssets/Sprites/BP/key2.png.meta\n\tAssets/Sprites/BP/point.png\n\tAssets/Sprites/BP/point.png.meta\n\tAssets/Sprites/Objects.meta\n\tAssets/Sprites/Objects/AAAA.png\n\tAssets/Sprites/Objects/AAAA.png.meta\n\tAssets/Sprites/Objects/AAAA1.png\n\tAssets/Sprites/Objects/AAAA1.png.meta\n\tAssets/Sprites/Objects/bed.png\n\tAssets/Sprites/Objects/bed.png.meta\n\tAssets/Sprites/Objects/book1.png\n\tAssets/Sprites/Objects/book1.png.meta\n\tAssets/Sprites/Objects/book2.png\n\tAssets/Sprites/Objects/book2.png.meta\n\tAssets/Sprites/Objects/books.png\n\tAssets/Sprites/Objects/books.png.meta\n\tAssets/Sprites/Objects/carpet.png\n\tAssets/Sprites/Objects/carpet.png.meta\n\tAssets/Sprites/Objects/chair1.png\n\tAssets/Sprites/Objects/chair1.png.meta\n\tAssets/Sprites/Objects/chair2.png\n\tAssets/Sprites/Objects/chair2.png.meta\n\tAssets/Sprites/Objects/desk1.png\n\tAssets/Sprites/Objects/desk1.png.meta\n\tAssets/Sprites/Objects/desk2.png\n\tAssets/Sprites/Objects/desk2.png.meta\n\tAssets/Sprites/Objects/door.png\n\tAssets/Sprites/Objects/door.png.meta\n\tAssets/Sprites/Objects/dust.png\n\tAssets/Sprites/Objects/dust.png.meta\n\tAssets/Sprites/Objects/dustbox.png\n\tAssets/Sprites/Objects/dustbox.png.meta\n\tAssets/Sprites/Objects/picture.png\n\tAssets/Sprites/Objects/picture.png.meta\n\tAssets/Sprites/Player.meta\n\tAssets/Sprites/Player/model_all1.png\n\tAssets/Sprites/Player/model_all1.png.meta\n\tAssets/Sprites/Player/model_all10.png\n\tAssets/Sprites/Player/model_all10.png.meta\n\tAssets/Sprites/Player/model_all11.png\n\tAssets/Sprites/Player/model_all11.png.meta\n\tAssets/Sprites/Player/model_all12.png\n\tAssets/Sprites/Player/model_all12.png.meta\n\tAssets/Sprites/Player/model_all13.png\n\tAssets/Sprites/Player/model_all13.png.meta\n\tAssets/Sprites/Player/model_all14.png\n\tAssets/Sprites/Player/model_all14.png.meta\n\tAssets/Sprites/Player/model_all15.png\n\tAssets/Sprites/Player/model_all15.png.meta\n\tAssets/Sprites/Player/model_all16.png\n\tAssets/Sprites/Player/model_all16.png.meta\n\tAssets/Sprites/Player/model_all2.png\n\tAssets/Sprites/Player/model_all2.png.meta\n\tAssets/Sprites/Player/model_all3.png\n\tAssets/Sprites/Player/model_all3.png.meta\n\tAssets/Sprites/Player/model_all4.png\n\tAssets/Sprites/Player/model_all4.png.meta\n\tAssets/Sprites/Player/model_all5.png\n\tAssets/Sprites/Player/model_all5.png.meta\n\tAssets/Sprites/Player/model_all6.png\n\tAssets/Sprites/Player/model_all6.png.meta\n\tAssets/Sprites/Player/model_all7.png\n\tAssets/Sprites/Player/model_all7.png.meta\n\tAssets/Sprites/Player/model_all8.png\n\tAssets/Sprites/Player/model_all8.png.meta\n\tAssets/Sprites/Player/model_all9.png\n\tAssets/Sprites/Player/model_all9.png.meta\n\tAssets/Sprites/background.meta\n\tAssets/Sprites/background/backgroundA.png\n\tAssets/Sprites/background/backgroundA.png.meta\n\tAssets/Sprites/background/title.jpg\n\tAssets/Sprites/background/title.jpg.meta\n\tAssets/Sprites/background/wall.png\n\tAssets/Sprites/background/wall.png.meta\n\tAssets/Sprites/background/wall2.png\n\tAssets/Sprites/background/wall2.png.meta\n\tAssets/Sprites/background/wall3.png\n\tAssets/Sprites/background/wall3.png.meta\n\tProjectSettings/NavMeshLayers.asset.meta\n\tProjectSettings/ProjectVersion.txt\n\tUntitled.app/Contents/Data/Managed/etc/mono/1.0/DefaultWsdlHelpGenerator.aspx\n\tUntitled.app/Contents/Data/Managed/etc/mono/1.0/machine.config\n\tUntitled.app/Contents/Data/Managed/etc/mono/2.0/Browsers/Compat.browser\n\tUntitled.app/Contents/Data/Managed/etc/mono/2.0/DefaultWsdlHelpGenerator.aspx\n\tUntitled.app/Contents/Data/Managed/etc/mono/2.0/machine.config\n\tUntitled.app/Contents/Data/Managed/etc/mono/2.0/settings.map\n\tUntitled.app/Contents/Data/Managed/etc/mono/2.0/web.config\n\tUntitled.app/Contents/Data/Managed/etc/mono/browscap.ini\n\tUntitled.app/Contents/Data/Managed/etc/mono/config\n\tUntitled.app/Contents/Data/Managed/etc/mono/mconfig/config.xml\n\tUntitled.app/Contents/Info.plist\n\tUntitled.app/Contents/Resources/Ageia.tif\n\tUntitled.app/Contents/Resources/Data/Managed/UnityEngine.xml\n\tUntitled.app/Contents/Resources/Data/Resources/unity_builtin_extra\n\tUntitled.app/Contents/Resources/Data/level0\n\tUntitled.app/Contents/Resources/Data/mainData\n\tUntitled.app/Contents/Resources/Data/resources.assets\n\tUntitled.app/Contents/Resources/Data/sharedassets0.assets\n\tUntitled.app/Contents/Resources/Data/sharedassets1.assets\n\tUntitled.app/Contents/Resources/KeyConfig.nib/classes.nib\n\tUntitled.app/Contents/Resources/KeyConfig.nib/info.nib\n\tUntitled.app/Contents/Resources/KeyConfig.nib/keyedobjects.nib\n\tUntitled.app/Contents/Resources/MainMenu.nib/classes.nib\n\tUntitled.app/Contents/Resources/MainMenu.nib/info.nib\n\tUntitled.app/Contents/Resources/MainMenu.nib/keyedobjects.nib\n\tUntitled.app/Contents/Resources/Mono.tif\n\tUntitled.app/Contents/Resources/ScreenSelector.nib/classes.nib\n\tUntitled.app/Contents/Resources/ScreenSelector.nib/info.nib\n\tUntitled.app/Contents/Resources/ScreenSelector.nib/keyedobjects.nib\n\tUntitled.app/Contents/Resources/UnityPlayerIcon.png\n\tUntitled.app/Contents/Resources/unity default resources\n\tfile/145717K/Screen Shot 2015-12-24 at 6.05.32.png\n\tfile/145738B/dot-grandma.png\n\tfile/145738B/dot-move.png\n\tfile/145738B/dot-plot1.png\n\tfile/145738B/dot-plot2.png\n\tfile/145738B/dot_letter.png\n\tfile/145762E/20151217030130modeling2.lip\n\tfile/145762E/modeling-2.zip\n\tfile/145762E/modeling2-demo.jpg\n\tfile/e145752","distinct":true,"url":"https://api.github.com/repos/ie-ModelingAndDesign/2015-K/commits/fa2b0183d74bacacf32fb8274f9b5405233e03ab"}]}