Primeiro teste no mapa
Merge pull request #3 from MagosStrifer/master

Primeiro teste no mapa
Deixei o mapa por cima da parada
integração do menu

adicionado menu.
Um bocado de coisa nova
Merge pull request #4 from MagosStrifer/master

Novas coisas do Dudu
Substituídos os "Tetos Ondulados"
Terminei o teto!
Merge branch 'master' into pr/3

Conflicts:
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/Prefabs/Arthur2d.prefab
	Assets/Prefabs/Arthur3d.prefab
	Assets/Prefabs/Barrel.prefab
	Assets/Prefabs/Checkpoint/Checkpoint.controller
	Assets/Prefabs/Checkpoint/Checkpoint.prefab
	Assets/Prefabs/Checkpoint/Checkpoint_Enable.anim
	Assets/Prefabs/Checkpoint/Checkpoint_Flag.anim
	Assets/Prefabs/Checkpoint/Start Checkpoint.prefab
	Assets/Prefabs/CubeCharacter.prefab
	Assets/Prefabs/Dragon/Dragon Blue.prefab
	Assets/Prefabs/Dragon/Dragon Red Test.anim
	Assets/Prefabs/Dragon/Dragon Red.prefab
	Assets/Prefabs/Dragon/Dragon White.prefab
	Assets/Prefabs/Enemy.prefab
	Assets/Prefabs/Fire.prefab
	Assets/Prefabs/GUI Camera.prefab
	Assets/Prefabs/GUI Weapon.prefab
	Assets/Prefabs/Game Controller.prefab
	Assets/Prefabs/GenericCounter.prefab
	Assets/Prefabs/GoldCoin.prefab
	Assets/Prefabs/Ice.prefab
	Assets/Prefabs/Icicle.prefab
	Assets/Prefabs/Map2d.prefab
	Assets/Prefabs/Map3d.prefab
	Assets/Prefabs/MovingPlatform.prefab
	Assets/Prefabs/PatrolCheckpoint.prefab
	Assets/Prefabs/PlatformWeightable.prefab
	Assets/Prefabs/Spike.prefab
	Assets/Prefabs/TimerUntil0.prefab
	Assets/Resources/Character/Arthur/Arthur15.controller
	Assets/Resources/Character/Arthur/Arthur_Attack.anim
	Assets/Resources/Character/Arthur/Arthur_Attack2.anim
	Assets/Resources/Character/Arthur/Arthur_Attack3.anim
	Assets/Resources/Character/Arthur/Arthur_Attack4.anim
	Assets/Resources/Character/Arthur/Arthur_Idle.anim
	Assets/Resources/Character/Arthur/Arthur_Jump.anim
	Assets/Resources/Character/Arthur/Arthur_JumpAttack.anim
	Assets/Resources/Character/Arthur/Arthur_JumpEnd.anim
	Assets/Resources/Character/Arthur/Arthur_Jump_1.anim
	Assets/Resources/Character/Arthur/Arthur_Walk.anim
	Assets/Resources/Character/Character.controller
	Assets/Resources/Character/Character_Idle.anim
	Assets/Resources/Character/Character_Jump.anim
	Assets/Resources/Objects/GoldCoin_Rotate.anim
	Assets/Scenes/Scene1.unity
	Assets/Standard Assets/Character Controllers/3rd Person Controller.prefab
	Assets/Standard Assets/Character Controllers/First Person Controller.prefab
	Assets/Standard Assets/Particles/Dust/Dust Storm.prefab
	Assets/Standard Assets/Particles/Fire/Fire1.prefab
	Assets/Standard Assets/Particles/Fire/Flame.prefab
	Assets/Standard Assets/Particles/Legacy Particles/Small explosion.prefab
	Assets/Standard Assets/Particles/Legacy Particles/Sparks.prefab
	Assets/Standard Assets/Particles/Legacy Particles/explosion.prefab
	Assets/Standard Assets/Particles/Legacy Particles/large flames.prefab
	Assets/Standard Assets/Particles/Legacy Particles/small flames.prefab
	Assets/Standard Assets/Particles/Misc/Fireworks.prefab
	Assets/Standard Assets/Particles/Misc/Light Snow.prefab
	Assets/Standard Assets/Particles/Misc/Soap Bubbles.prefab
	Assets/Standard Assets/Particles/Misc/Sparks.prefab
	Assets/Standard Assets/Particles/Smoke/Detailed Smoke.prefab
	Assets/Standard Assets/Particles/Smoke/Fluffy Smoke Large.prefab
	Assets/Standard Assets/Particles/Smoke/Fluffy Smoke.prefab
	Assets/Standard Assets/Particles/Smoke/Smoke Trail.prefab
	Assets/Standard Assets/Particles/Sources/Animations/Light explosion.anim
	Assets/Standard Assets/Particles/Sources/Animations/Stop Emitting ,5 sec.anim
	Assets/Standard Assets/Particles/Sources/Animations/Stop Emitting 1 sec.anim
	Assets/Standard Assets/Particles/Sources/Animations/Stop Emitting 2 sec.anim
	Assets/Standard Assets/Particles/Sources/Materials/Fire Smoke.mat
	Assets/Standard Assets/Particles/Sources/Materials/FlameB.mat
	Assets/Standard Assets/Particles/Sources/Materials/FlameC.mat
	Assets/Standard Assets/Particles/Sources/Materials/Smoke1.mat
	Assets/Standard Assets/Particles/Sparkles/Sparkle Rising.prefab
	Assets/Standard Assets/Particles/Water/Water Fountain.prefab
	Assets/Standard Assets/Particles/Water/Water Surface Splash.prefab
	Assets/Standard Assets/Particles/Water/WaterFall.prefab
	Assets/Standard Assets/Projectors/Blob Light Projector.prefab
	Assets/Standard Assets/Projectors/Blob Shadow Projector.prefab
	Assets/Standard Assets/Projectors/Grid Projector.prefab
	Assets/Standard Assets/Toon Shading/Toony-Basic.mat
	Assets/Standard Assets/Toon Shading/Toony-BasicOutline.mat
	Assets/Standard Assets/Toon Shading/Toony-Lighted Outline.mat
	Assets/Standard Assets/Toon Shading/Toony-Lighted.mat
	Assets/Standard Assets/Toon Shading/_ToonShadingSample.unity
	ProjectSettings/EditorBuildSettings.asset
	ProjectSettings/Physics2DSettings.asset
	ProjectSettings/ProjectSettings.asset
	ProjectSettings/TagManager.asset
Merge branch 'menu_wanderson'
Merge pull request #4 from jeffque/master

Menu do Wanderson