加速度ジャンプ
Merge branch 'develop' into feature/Acceleration_interface

Conflicts:
	Assets/Resources/Prefabs/Child/Cart.prefab
	Assets/Scripts/gameItems/Cart.cs
アイテム放出, UI途中
Merge branch 'feature/Acceleration_interface' into develop
image
meta
fix
fix
orientation triggers
Merge branch 'develop' into feature/course_direction

Conflicts:
	Assets/Resources/Sprites/weapon.meta
	Assets/Resources/Sprites/weapon/weapon01.meta
	Assets/Resources/Sprites/weapon/weapon01/bullet.png.meta
	Assets/Resources/Sprites/weapon/weapon01/explosionLeft01.png.meta
	Assets/Resources/Sprites/weapon/weapon01/explosionLeft02.png.meta
	Assets/Resources/Sprites/weapon/weapon01/explosionLeft03.png.meta
	Assets/Resources/Sprites/weapon/weapon01/explosionRight01.png.meta
	Assets/Resources/Sprites/weapon/weapon01/explosionRight02.png.meta
	Assets/Resources/Sprites/weapon/weapon01/explosionRight03.png.meta
	Assets/Resources/Sprites/weapon/weapon01/weapon01.png.meta
	Assets/Resources/Sprites/weapon/weapon01/モーションイメージ.gif.meta
	Assets/Resources/Sprites/weapon/weapon01/表示イメージ.png.meta
	Assets/Resources/Sprites/weapon/weapon02.meta
	Assets/Resources/Sprites/weapon/weapon02/bullet02.png.meta
	Assets/Resources/Sprites/weapon/weapon02/bullet03.png.meta
	Assets/Resources/Sprites/weapon/weapon02/weapon02.png.meta
	Assets/Resources/Sprites/weapon/weapon02/モーションイメージ.gif.meta
	Assets/Resources/Sprites/weapon/weapon02/表示イメージ.png.meta
	Assets/Resources/Sprites/weapon/weapon03.meta
	Assets/Resources/Sprites/weapon/weapon03/boost01.png.meta
	Assets/Resources/Sprites/weapon/weapon03/boost02.png.meta
	Assets/Resources/Sprites/weapon/weapon03/boost03.png.meta
	Assets/Resources/Sprites/weapon/weapon03/weapon03.png.meta
	Assets/Resources/Sprites/weapon/weapon03/モーションイメージ.gif.meta
	Assets/Resources/Sprites/weapon/weapon03/表示イメージ.png.meta
	Assets/Resources/Sprites/weapon/weapon04.meta
	Assets/Resources/Sprites/weapon/weapon04/weapon04.png.meta
	Assets/Scenes/GameScene.unity
	Assets/Scripts/gameItems/Cart.cs
	Assets/Scripts/gameItems/Player.cs
Merge branch 'feature/course_direction' into develop
inteerface部分途中コミット
fix
Merge branch 'develop' into feature/UI
fix
fix conflicted meta file
fix merge.
fix
Merge branch 'develop' of https://github.com/TakemuraKotaro/141017_MarioCart2D into develop
add navigation line segments