KeCh - Working on player script
Merge branch 'master' of https://github.com/henryj41043/gmap377

Conflicts:
	MainProject/Assembly-UnityScript-vs.unityproj
	MainProject/Assembly-UnityScript.unityproj
	MainProject/Assets/CircularGravity Package/Material/Black.mat
	MainProject/Assets/CircularGravity Package/Material/Blue.mat
	MainProject/Assets/CircularGravity Package/Material/Green.mat
	MainProject/Assets/CircularGravity Package/Material/Light Blue.mat
	MainProject/Assets/CircularGravity Package/Material/Red.mat
	MainProject/Assets/CircularGravity Package/Prefabs/Bullet.prefab
	MainProject/Assets/CircularGravity Package/Prefabs/Bullet_Force.prefab
	MainProject/Assets/CircularGravity Package/Prefabs/Cannon.prefab
	MainProject/Assets/CircularGravity Package/Prefabs/Wall.prefab
	MainProject/Assets/CircularGravity Package/Scenes/CircularGravity 01 - Black Ball.unity
	MainProject/Assets/CircularGravity Package/Scenes/CircularGravity 02 - Marble.unity
	MainProject/Assets/CircularGravity Package/Scenes/CircularGravity 03 - Cannon.unity
	MainProject/Assets/CircularGravity Package/Scenes/CircularGravity 04 - Planets.unity
	MainProject/Assets/CircularGravity Package/Scenes/CircularGravity 05 - Tutorial.unity
	MainProject/Assets/CircularGravity Package/Scenes/CircularGravity 06 - Tutorial Tag Filter.unity
	MainProject/Assets/CircularGravity Package/Scripts/CircularGravity.cs
	MainProject/Assets/CircularGravity Package/Scripts/CircularGravityVisualizer.cs
	MainProject/Assets/CircularGravity Package/Scripts/LookAtObject.cs
	MainProject/Assets/CircularGravity Package/Scripts/MoveCannon.cs
	MainProject/Assets/CircularGravity Package/Scripts/RollControls.cs
	MainProject/Assets/CircularGravity Package/Scripts/RotateAround.cs
	MainProject/Assets/CircularGravity Package/Scripts/Shoot.cs
	MainProject/Assets/CircularGravity Package/Scripts/ShowHelpInfo.cs
	MainProject/Assets/CircularGravity Package/Scripts/WorldGravity.cs
	MainProject/Assets/Image/Thumbs.db
	MainProject/Assets/Materials/Brown.mat
	MainProject/Assets/Materials/Green.mat
	MainProject/Assets/Materials/Yellow.mat
	MainProject/Assets/MyScripts/BasicAttack.js
	MainProject/Assets/MyScripts/CandyDrop.js
	MainProject/Assets/MyScripts/CollectItems.js
	MainProject/Assets/MyScripts/Dodge.js
	MainProject/Assets/MyScripts/DontGoThroughThings.js
	MainProject/Assets/MyScripts/LockCursor.js
	MainProject/Assets/MyScripts/MeleeEnemy.js
	MainProject/Assets/MyScripts/OnStartGame.js
	MainProject/Assets/MyScripts/PauseMenu.js
	MainProject/Assets/MyScripts/PlayerHealth.js
	MainProject/Assets/MyScripts/ReceiveDamage.js
	MainProject/Assets/MyScripts/Restart.js
	MainProject/Assets/MyScripts/SpecialAttackManager.js
	MainProject/Assets/Prefabs/ChocolateCandy.prefab
	MainProject/Assets/Prefabs/GummyCandy.prefab
	MainProject/Assets/Prefabs/Heart.prefab
	MainProject/Assets/Prefabs/LollipopCandy.prefab
	MainProject/Assets/Prefabs/chocolateEnemy.prefab
	MainProject/Assets/Prefabs/gummyEnemy.prefab
	MainProject/Assets/Prefabs/lollipopEnemy.prefab
	MainProject/Assets/Special Attacks/111/111.js
	MainProject/Assets/Special Attacks/111/111.mb
	MainProject/Assets/Special Attacks/111/111Effect.js
	MainProject/Assets/Special Attacks/111/111Prefab.prefab
	MainProject/Assets/Special Attacks/112/112.js
	MainProject/Assets/Special Attacks/112/112.mb
	MainProject/Assets/Special Attacks/112/112LandingZone.js
	MainProject/Assets/Special Attacks/112/112LandingZonePrefab.prefab
	MainProject/Assets/Special Attacks/112/112PrimaryEffect.js
	MainProject/Assets/Special Attacks/112/112PrimaryEffectPrefab.prefab
	MainProject/Assets/Special Attacks/112/112SecondaryEffect.js
	MainProject/Assets/Special Attacks/112/112SecondaryEffect.prefab
	MainProject/Assets/Special Attacks/113/113.js
	MainProject/Assets/Special Attacks/113/113Effect.js
	MainProject/Assets/Special Attacks/113/113Explosion.js
	MainProject/Assets/Special Attacks/113/113ExplosionPrefab.prefab
	MainProject/Assets/Special Attacks/113/113LandingZone.js
	MainProject/Assets/Special Attacks/113/113LandingZonePrefab.prefab
	MainProject/Assets/Special Attacks/113/113Prefab.prefab
	MainProject/Assets/Special Attacks/122/122.js
	MainProject/Assets/Special Attacks/123/123.js
	MainProject/Assets/Special Attacks/222/222.js
	MainProject/Assets/Special Attacks/223/223.js
	MainProject/Assets/Special Attacks/331/331.js
	MainProject/Assets/Special Attacks/331/331Explosion.js
	MainProject/Assets/Special Attacks/331/331ExplosionPrefab.prefab
	MainProject/Assets/Special Attacks/331/331PrimaryEffect.js
	MainProject/Assets/Special Attacks/331/331PrimaryEffectPrefab.prefab
	MainProject/Assets/Special Attacks/331/331SecondaryEffect.js
	MainProject/Assets/Special Attacks/331/331SecondaryEffectPrefab.prefab
	MainProject/Assets/Special Attacks/332/332.js
	MainProject/Assets/Special Attacks/333/333.js
	MainProject/Assets/Special Attacks/Materials/lambert1.mat
	MainProject/Assets/Special Attacks/Materials/lambert2.mat
	MainProject/Builds/Builds.html
	MainProject/Builds/Builds.unity3d
	MainProject/Builds/Builds.zip
	MainProject/Library/ProjectSettings.asset
	MainProject/Library/ScriptAssemblies/Assembly-CSharp.dll
	MainProject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	MainProject/Library/ScriptAssemblies/Assembly-UnityScript.dll
	MainProject/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	MainProject/Library/ScriptMapper
	MainProject/Library/assetDatabase3
	MainProject/Library/expandedItems
	MainProject/Library/guidmapper
	MainProject/Library/metadata/00/00000000000000002000000000000000
	MainProject/Library/metadata/00/00000000000000003000000000000000
	MainProject/Library/metadata/00/00000000000000004100000000000000
	MainProject/Library/metadata/00/00000000000000005000000000000000
	MainProject/Library/metadata/00/00000000000000006000000000000000
	MainProject/Library/metadata/00/00000000000000007000000000000000
	MainProject/Library/metadata/00/00000000000000008000000000000000
	MainProject/Library/metadata/00/00000000000000009000000000000000
	MainProject/Library/metadata/00/0000000000000000a000000000000000
	MainProject/Library/metadata/00/0000000000000000b000000000000000
	MainProject/Library/metadata/00/0000000000000000c000000000000000
	MainProject/Library/metadata/01/0178f7d76a6d24f51ab08e85bd79b96e
	MainProject/Library/metadata/05/0523080034555c14796f7cbb2e512aa8
	MainProject/Library/metadata/05/054a31a99d11e49d110086ba44295342
	MainProject/Library/metadata/08/080d7c103ac300540b3d149cf7fb1598
	MainProject/Library/metadata/0a/0ab79d7f243824f5d9826bd83522c8df
	MainProject/Library/metadata/0c/0cb12a8fad027d249a956c8625ef030c
	MainProject/Library/metadata/12/12cb36dca939194499a144a3e3d40484
	MainProject/Library/metadata/14/143288b3d018bf54482ce86b40f254d9
	MainProject/Library/metadata/15/15b808c1b9de39f41acab0f0293449bb
	MainProject/Library/metadata/1d/1d51ed7769e7585409ce51efae8d02f5
	MainProject/Library/metadata/1d/1de58dd9c7b533b4d9a84a9c1d003d52
	MainProject/Library/metadata/20/209411e272700914095ffd55b3fc78d4
	MainProject/Library/metadata/21/215977489d11178d11005b9844295342
	MainProject/Library/metadata/24/24c4c761dc3fa4bb18f0b91d5a13b9ac
	MainProject/Library/metadata/24/24d20bccbd625b74ba1faf9d2cd0be38
	MainProject/Library/metadata/25/259e1848216914040b9956a0280b67d4
	MainProject/Library/metadata/2a/2a11ce84dbfbd9446860fbe07da26afb
	MainProject/Library/metadata/2a/2a97b8925705a7e4ebbf136cbeae6c12
	MainProject/Library/metadata/2a/2a9bf2a6100304388801ca5973eca2e6
	MainProject/Library/metadata/2d/2d6f46fa8f3b72d45b6679b4ff5ae41e
	MainProject/Library/metadata/39/39d74277103271d45a931b98b8cd6980
	MainProject/Library/metadata/3c/3cd3563e9529e3f49a21b3901b35adcb
	MainProject/Library/metadata/3d/3da0882d7f2b0eb48830a9cc36da5e98
	MainProject/Library/metadata/3d/3dc6f943c1d17114b92a7a83ba890ef5
	MainProject/Library/metadata/3d/3de103c12bd533e4999167ca2c9366ed
	MainProject/Library/metadata/46/464a77f64e844cf46ba7bb8e9be4510a
	MainProject/Library/metadata/4e/4e3f69415a4a573458af36f4ba9f483c
	MainProject/Library/metadata/4e/4ed7e2abe8e5cec45af058ed981755d0
	MainProject/Library/metadata/50/5006e4be56c30444e93cec7dd303371b
	MainProject/Library/metadata/52/5204083ecf1048c4186f608ce5d97866
	MainProject/Library/metadata/57/574f4af289f4dbb4094f9a44b77c2877
	MainProject/Library/metadata/57/57be33b333bbc9d4ab5e4870ef5921c4
	MainProject/Library/metadata/5d/5d554b1f20d4c2b4bbafc34e731ac1d5
	MainProject/Library/metadata/5d/5d69df9d9d11e49d110086ba44295342
	MainProject/Library/metadata/5d/5db8267176a4e1d48b169ff57db5f204
	MainProject/Library/metadata/5f/5f74eaa5927fb3b4bba213993df50e24
	MainProject/Library/metadata/60/60bca8f58a0b8478e946e6e86658cb29
	MainProject/Library/metadata/65/65b9cfd56c48614469174950148f1159
	MainProject/Library/metadata/66/6675e8baee37e03418d6c4a9c6966900
	MainProject/Library/metadata/68/68ec2fe99d1108b9d0006a298d76c639
	MainProject/Library/metadata/69/693b5f216e1c5244682ed5a969356ef3
	MainProject/Library/metadata/69/697582d6651463c45a1e0d587a37d3a3
	MainProject/Library/metadata/6b/6b642fc574632e9468fa0bd3adc515d8
	MainProject/Library/metadata/70/704b29571558f004aaecfd85fc7b7431
	MainProject/Library/metadata/72/728c18668f9b9d645a65469609fd2901
	MainProject/Library/metadata/77/776360534db4b2e42991fc3a3d041bd3
	MainProject/Library/metadata/78/78d8f88b85566e74792d524f8da77c12
	MainProject/Library/metadata/7a/7a1c79b99e9882d4aadf3d29c23df59f
	MainProject/Library/metadata/7f/7fe35f257bc744473952a44594e87969
	MainProject/Library/metadata/80/804d836ff1a829f41b3ef2099b230ba7
	MainProject/Library/metadata/81/81c8710af1841e14f9ebe5024fe85de5
	MainProject/Library/metadata/82/82ea40c785f2e9746adb2135accc5e65
	MainProject/Library/metadata/83/831b8514152ae4ff0ade58d0c15346a2
	MainProject/Library/metadata/84/84b9e1d19d11078d11005b9844295342
	MainProject/Library/metadata/86/86df3acdab49aed429dd17bb29b59da3
	MainProject/Library/metadata/87/87e23dfe0c713314e8a28c649255b3f6
	MainProject/Library/metadata/88/885b1972ad11a921d000d37b8d76c639
	MainProject/Library/metadata/89/891ea9039b6dbd24db888830832e3d6d
	MainProject/Library/metadata/8c/8cfdfc2183e254fc799069370fbb5ddd
	MainProject/Library/metadata/91/911e500639c76c949902f4b75532011f
	MainProject/Library/metadata/92/923331be5f2ba44028df421e0614d294
	MainProject/Library/metadata/92/92a1d031bb409e4489ce7fb9667fb36a
	MainProject/Library/metadata/94/94870c7beffd149d2a910d18b9a49c6a
	MainProject/Library/metadata/96/96f8012627298cf4ca11a379ec8e1db2
	MainProject/Library/metadata/98/983e2c072ca10ab4a9b33ddac35f769f
	MainProject/Library/metadata/98/98485442a0474c34a986a03371e614d3
	MainProject/Library/metadata/98/98dee016ba58848448051dd4a71e1fd9
	MainProject/Library/metadata/99/994dbedf64279ac4181f4ef6dddccc65
	MainProject/Library/metadata/9a/9af4e6445c1814b4c80c779665007c19
	MainProject/Library/metadata/9d/9dd6f2685f1d5904f9644f615a760607
	MainProject/Library/metadata/a0/a0f53398c58fa48de9f74ed9c9f1d013
	MainProject/Library/metadata/a6/a6ffea536ab69044abb986d1c8764805
	MainProject/Library/metadata/ac/acc0b70bea9b44b44a2f3d3afbfdf412
	MainProject/Library/metadata/b0/b02b75bd5ae233748bff4b8d8ff04d98
	MainProject/Library/metadata/b0/b0b1ef9f1fcb4475a982b35ae99e324b
	MainProject/Library/metadata/b1/b19ee21eb27147d45ba745c3cdaba68b
	MainProject/Library/metadata/b5/b5671e9e262984d468cdf678fd7d5914
	MainProject/Library/metadata/bb/bb0ab6436d1f5fe4a93e9fb795597918
	MainProject/Library/metadata/be/be63143d0d38ade48a1905aa1b6ee0e9
	MainProject/Library/metadata/c0/c0254a1f6c93e4a4796de34520db6f02
	MainProject/Library/metadata/c2/c254a7bdba0227e41836e33fcf300686
	MainProject/Library/metadata/c2/c2e241a12d390f042afeee4da05f4d63
	MainProject/Library/metadata/c3/c325ae476d265de478dcc65f53a441b4
	MainProject/Library/metadata/c8/c82d7f943d295ad4fa9763cf0c73fcac
	MainProject/Library/metadata/c9/c9e6294c9d11cb8d11006bf944295342
	MainProject/Library/metadata/ca/ca8fbbfcc2f85144497a5e49831ccd0f
	MainProject/Library/metadata/ca/cabfa2c1087d98a489ba98f8b4aa3a56
	MainProject/Library/metadata/cc/cc0999544db37ff4a99208c073639417
	MainProject/Library/metadata/cc/cc2717499b40a574d90ff6be0b607e1d
	MainProject/Library/metadata/cf/cfc302fd1faba6a40b710062270444b3
	MainProject/Library/metadata/d0/d078dd8f58b2f8e45968942408c4d7ee
	MainProject/Library/metadata/d3/d3c6ec4cdc54a164d91b41b2df74247f
	MainProject/Library/metadata/d4/d4d6e0c51394a6d49b1010282bfe76a8
	MainProject/Library/metadata/d5/d5ab763b5fcc7034f9f834a5adb19778
	MainProject/Library/metadata/db/dba05f5a5f0500a4f909785ecfee1093
	MainProject/Library/metadata/dc/dc9be1275ba714936aecfdd693f9c5a5
	MainProject/Library/metadata/de/debc6c847168f1c4e81110146ebe137d
	MainProject/Library/metadata/e0/e030301f6c1bf42438eb59a580cd6251
	MainProject/Library/metadata/e5/e532bd3489c649d46b7ae279fcf1bf62
	MainProject/Library/metadata/e5/e5f11c1dd9d63e5479fb6d0706ee6c27
	MainProject/Library/metadata/e7/e7333bfacfac043168fea4c503e8b67b
	MainProject/Library/metadata/e7/e7c4b544534deca42a9b69b1ee9f2f2c
	MainProject/Library/metadata/e8/e82c476d19f1eb04d8dc9a9271baee11
	MainProject/Library/metadata/e8/e8d3e3dd00e6f45408ce465eeaceb689
	MainProject/Library/metadata/ea/ea0f817522bd340738ff489538970165
	MainProject/Library/metadata/ed/ed4daa0b3e6ab481ca4ca2a799931304
	MainProject/Library/metadata/ef/efdde6748c37a2f499bf4083da9fd65c
	MainProject/Library/metadata/f0/f002be14480021b47866bf3d69735310
	MainProject/Library/metadata/f0/f01e9b7281416834698f3b69a107a322
	MainProject/Library/metadata/f0/f090ef7c90b5b2441a99b2eb246c367b
	MainProject/Library/metadata/f4/f40c56fde152d4d4eb7836b096597d94
	MainProject/Library/metadata/f7/f7353c1c1fd7c46c48aca29d559578d8
	MainProject/Library/metadata/f8/f8d65502e718fc847a7a74a3f01935eb
	MainProject/Library/metadata/f9/f9eb97a37401e554ea15fddcc0c5f1d0
	MainProject/Library/metadata/fa/fa9d3bf3efd7a415bb05e5534bd744c3
	MainProject/Library/metadata/fb/fbb715e9064ba6c4686f861a69f2e73b
	MainProject/Library/metadata/fe/fe279b8714d490a418277c626bfba79e
	MainProject/Library/metadata/ff/ffe11f1ecfff884489369e62384e4211
	MainProject/images/tmp/Soldier.png
	MainProject/workspace.mel
	SystemDesign.txt