Merge branch 'master' of github.com:Logicon211/LAMER

THE MERGE THAT FIXED MY LIFE
Conflicts:
	SuperSmashBots.project.gmx
	background/MapBackground.background.gmx
	fonts/InventoryHeader.font.gmx
	objects/BackMPButton.object.gmx
	objects/BaseButton3.object.gmx
	objects/BaseMultiplayerButton.object.gmx
	objects/CampaignButton.object.gmx
	objects/GameController.object.gmx
	objects/HeadMPButton.object.gmx
	objects/InventoryController.object.gmx
	objects/InventoryUIItem.object.gmx
	objects/InventoryUINameP2.object.gmx
	objects/InventoryUINameP3.object.gmx
	objects/InventoryUINameP4.object.gmx
	objects/LArmMPButton.object.gmx
	objects/LegsMPButton.object.gmx
	objects/MapNode1.object.gmx
	objects/MapNode2.object.gmx
	objects/MapNode3.object.gmx
	objects/MapNode4.object.gmx
	objects/MapNode5.object.gmx
	objects/MapNode6.object.gmx
	objects/MultiplayerButton.object.gmx
	objects/PlayerMarker.object.gmx
	objects/ProtoGunObjectItem.object.gmx
	objects/RArmMPButton.object.gmx
	objects/RadioController.object.gmx
	objects/TestButton.object.gmx
	objects/TorsoMPButton.object.gmx
	objects/hue_2_o.object.gmx
	objects/hue_glow_o.object.gmx
	objects/hue_prime_o.object.gmx
	objects/sat_2_o.object.gmx
	objects/sat_glow_o.object.gmx
	objects/sat_prime_o.object.gmx
	objects/val_2_o.object.gmx
	objects/val_glow_o.object.gmx
	objects/val_prime_o.object.gmx
	rooms/InventoryRoom.room.gmx
	rooms/MenuRoom.room.gmx
	rooms/MultiplayerLoadoutRoom.room.gmx
	rooms/OverMap.room.gmx
	scripts/attack1_check.gml
	scripts/attack1_check_pressed.gml
	scripts/createPlayer.gml
	scripts/shield_check.gml
	scripts/shield_check_released.gml
	sprites/BackMPButtonSprite.sprite.gmx
	sprites/EnergyColorButtonSprite.sprite.gmx
	sprites/HeadButtonSprite.sprite.gmx
	sprites/LArmButtonSprite.sprite.gmx
	sprites/LegsButtonSprite.sprite.gmx
	sprites/NextMPButtonSprite.sprite.gmx
	sprites/PrimaryColorButtonSprite.sprite.gmx
	sprites/RArmButtonSprite.sprite.gmx
	sprites/SecondaryColorButtonSprite.sprite.gmx
	sprites/TorsoButtonSprite.sprite.gmx
	sprites/images/BackMPButtonSprite_0.png
	sprites/images/BackMPButtonSprite_1.png
	sprites/images/BackMPButtonSprite_2.png
	sprites/images/NextMPButtonSprite_0.png
	sprites/images/NextMPButtonSprite_1.png
	sprites/images/NextMPButtonSprite_2.png
	sprites/images/NumPlayers2ButtonSprite_3.png
	sprites/images/NumPlayers3ButtonSprite_3.png
	sprites/images/NumPlayers4ButtonSprite_3.png
Successful testing of multi-controller inputs.

Loads of attack animations.
playerColors[a,b] made standard.
	a = player number
	b = hsv color identifier
	EXAMPLE
	--------------------------
	 playerColors[2,0] = 20;
	--------------------------
	this will set player 3 primary hue to 20 (orange)
Merge branch 'master' of github.com:Logicon211/LAMER

Conflicts:
	SuperSmashBots.project.gmx
	SuperSmashBots.project.gmx.orig
	background/MapBackground.background.gmx.orig
	fonts/InventoryHeader.font.gmx.orig
	objects/BaseButton3.object.gmx
	objects/CampaignButton.object.gmx
	objects/GameController.object.gmx
	objects/InventoryController.object.gmx
	objects/InventoryUIItem.object.gmx
	objects/MapNode1.object.gmx
	objects/MapNode2.object.gmx
	objects/MapNode3.object.gmx
	objects/MapNode4.object.gmx
	objects/MapNode5.object.gmx
	objects/MapNode6.object.gmx
	objects/MultiplayerButton.object.gmx
	objects/MultiplayerInventoryController.object.gmx
	objects/NextMPButton.object.gmx
	objects/PlayerMarker.object.gmx
	objects/ProtoGunObjectItem.object.gmx
	objects/RadioController.object.gmx
	objects/TestButton.object.gmx
	objects/hue_2_o.object.gmx
	objects/hue_glow_o.object.gmx
	objects/hue_prime_o.object.gmx
	objects/sat_2_o.object.gmx
	objects/sat_glow_o.object.gmx
	objects/sat_prime_o.object.gmx
	objects/val_2_o.object.gmx
	objects/val_glow_o.object.gmx
	objects/val_prime_o.object.gmx
	rooms/InventoryRoom.room.gmx
	rooms/MenuRoom.room.gmx
	rooms/OverMap.room.gmx
	scripts/attack1_check.gml
	scripts/attack1_check_pressed.gml
	scripts/createPlayer.gml
	scripts/jump_check.gml
	scripts/shield_check.gml
	scripts/shield_check_released.gml
	sprites/EnergyColorButtonSprite.sprite.gmx
	sprites/HeadButtonSprite.sprite.gmx
	sprites/LArmButtonSprite.sprite.gmx
	sprites/LegsButtonSprite.sprite.gmx
	sprites/PrimaryColorButtonSprite.sprite.gmx
	sprites/RArmButtonSprite.sprite.gmx
	sprites/SecondaryColorButtonSprite.sprite.gmx
	sprites/TorsoButtonSprite.sprite.gmx
	sprites/images/NumPlayers2ButtonSprite_3.png
	sprites/images/NumPlayers3ButtonSprite_3.png
	sprites/images/NumPlayers4ButtonSprite_3.png
Changed controller input scripts.

EXAMPLE

-----------------------------
jump_check_pressed();
*****************************
returns true for controller index 0 jump button
returns true for keyboard
-----------------------------
*no input will assume argument is 0
-----------------------------
jump_check_pressed(2);
*****************************
returns true for controller index 2 jump button
returns true for keyboard
-----------------------------
*input of true will reference controller index 2
	which will control player 2 (player 0,1,*2*,3)
Merge branch 'master' of github.com:Logicon211/LAMER