Basic Minimap added.
Merge branch 'master' of https://github.com/bakashinji/jungle_fever
fixed some bugs

Conflicts:
	RollABall/Assembly-CSharp-firstpass-vs.csproj
	RollABall/Assembly-CSharp-firstpass.csproj
	RollABall/Assembly-CSharp-vs.csproj
	RollABall/Assembly-CSharp.csproj
	RollABall/Assembly-UnityScript-Editor-vs.unityproj
	RollABall/Assembly-UnityScript-Editor.unityproj
	RollABall/Assembly-UnityScript-firstpass-vs.unityproj
	RollABall/Assembly-UnityScript-firstpass.unityproj
	RollABall/Assembly-UnityScript-vs.unityproj
	RollABall/Assembly-UnityScript.unityproj
	RollABall/Assets/Meshes/Bushes/Bush 01/Meshes/Bush 01.obj
	RollABall/Assets/Meshes/Bushes/Bush 02/Meshes/Bush 02.obj
	RollABall/Assets/Meshes/Bushes/Bush 03/Meshes/Bush 03.obj
	RollABall/Assets/Meshes/Bushes/Bush 04/Meshes/Bush 04.obj
	RollABall/Assets/Meshes/Bushes/Bush 05/Meshes/Bush 05.obj
	RollABall/Assets/Palace of Orinthalian/Standard Assets/Image Effects (Pro Only)/_Sources/Shaders/_BloomAndFlares/BlurAndFlares.shader
	RollABall/Assets/Palace of Orinthalian/Standard Assets/Image Effects (Pro Only)/_Sources/Shaders/_BloomAndFlares/MultiPassHollywoodFlares.shader
	RollABall/Assets/_Scenes/minigame.unity
	RollABall/RollABall-csharp.sln
	RollABall/RollABall.sln
	RollABall/RollABall.userprefs
fixed some bugs
minimap: enemy, pickup, base inserted
max distance for enemies
pickup base, stick to border if out of range
added some game mechanics
Merge branch 'master' of https://github.com/bakashinji/jungle_fever
Merge branch 'master' of https://github.com/bakashinji/jungle_fever

Conflicts:
	RollABall/Assets/Scripts/PlayerController.cs
	RollABall/Assets/_Scenes/minigame.unity
Added new meta files and new icons
Added more adwanced move scripts
Merge branch 'master' of https://github.com/bakashinji/jungle_fever
Added weapon scripts
Merge branch 'master' of https://github.com/bakashinji/jungle_fever

Conflicts:
	RollABall/Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Constructor.FBX.meta
	RollABall/Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Textures/constructor_diffuse.png.meta
	RollABall/Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Textures/constructor_normals.png.meta
added 2 sicknesses and some mechanics to sickness progression
Added standard character
Merged
slight changes to sickness progression + herb-mechanics
added sickness progression mechanics
Merge branch 'master' of https://github.com/bakashinji/jungle_fever
tried merge remote-tracking branch 'origin/master' into RecipeGUI

Conflicts:
	RollABall/Assembly-CSharp-vs.csproj
	RollABall/Assembly-CSharp.csproj
	RollABall/Assets/Scripts/Inventory.cs
	RollABall/Assets/Scripts/Recipe.cs
	RollABall/Assets/Scripts/Recipe.cs.meta
	RollABall/Assets/_Scenes/minigame.unity
	RollABall/RollABall-csharp.sln
	RollABall/RollABall.sln
	RollABall/RollABall.userprefs