Make the signer better and 2017 rcc testing

Author: harryzawg

RCCService2017/RCCService.exe

@@ -133,6 +133,7 @@ local function createMap()
 	end
 
 	function this:Get(key)
+		if not key then return end
 		if not this.data[key] then
 			this.data[key] = createCharacterChats()
 			local emptiedCon = nil
@@ -334,7 +335,7 @@ local function createChatOutput()
 	end
 
 	function this:CreateBillboardGuiHelper(instance, onlyCharacter)
-		if not this.CharacterSortedMsg:Get(instance)["BillboardGui"] then
+		if instance and not this.CharacterSortedMsg:Get(instance)["BillboardGui"] then
 			if not onlyCharacter then
 				if instance:IsA("Part") then
 					-- Create a new billboardGui object attached to this player
@@ -516,43 +517,47 @@ local function createChatOutput()
 	end
 
 	function this:CreateChatLineRender(instance, line, onlyCharacter, fifo)
+		if not instance then return end
+
 		if not this.CharacterSortedMsg:Get(instance)["BillboardGui"] then
 			this:CreateBillboardGuiHelper(instance, onlyCharacter)
 		end
 
 		local billboardGui = this.CharacterSortedMsg:Get(instance)["BillboardGui"]
-		local chatBubbleRender = this.ChatBubbleWithTail[line.BubbleColor]:Clone()
-		chatBubbleRender.Visible = false
-		local bubbleText = this:CreateBubbleText(line.Message)
+		if billboardGui then
+			local chatBubbleRender = this.ChatBubbleWithTail[line.BubbleColor]:Clone()
+			chatBubbleRender.Visible = false
+			local bubbleText = this:CreateBubbleText(line.Message)
 
-		bubbleText.Parent = chatBubbleRender
-		chatBubbleRender.Parent = billboardGui.BillboardFrame
+			bubbleText.Parent = chatBubbleRender
+			chatBubbleRender.Parent = billboardGui.BillboardFrame
 
-		line.RenderBubble = chatBubbleRender
+			line.RenderBubble = chatBubbleRender
 
-		local currentTextBounds = TextService:GetTextSize(bubbleText.Text, CHAT_BUBBLE_FONT_SIZE_INT, CHAT_BUBBLE_FONT, 
-															Vector2.new(BILLBOARD_MAX_WIDTH, BILLBOARD_MAX_HEIGHT))
-		local bubbleWidthScale = math.max((currentTextBounds.x + CHAT_BUBBLE_WIDTH_PADDING)/BILLBOARD_MAX_WIDTH, 0.1)
-		local numOflines = (currentTextBounds.y/CHAT_BUBBLE_FONT_SIZE_INT)
+			local currentTextBounds = TextService:GetTextSize(bubbleText.Text, CHAT_BUBBLE_FONT_SIZE_INT, CHAT_BUBBLE_FONT, 
+																Vector2.new(BILLBOARD_MAX_WIDTH, BILLBOARD_MAX_HEIGHT))
+			local bubbleWidthScale = math.max((currentTextBounds.x + CHAT_BUBBLE_WIDTH_PADDING)/BILLBOARD_MAX_WIDTH, 0.1)
+			local numOflines = (currentTextBounds.y/CHAT_BUBBLE_FONT_SIZE_INT)
 
-		-- prep chat bubble for tween
-		chatBubbleRender.Size = UDim2.new(0,0,0,0)
-		chatBubbleRender.Position = UDim2.new(0.5,0,1,0)
+			-- prep chat bubble for tween
+			chatBubbleRender.Size = UDim2.new(0,0,0,0)
+			chatBubbleRender.Position = UDim2.new(0.5,0,1,0)
 
-		local newChatBubbleOffsetSizeY = numOflines * CHAT_BUBBLE_LINE_HEIGHT
+			local newChatBubbleOffsetSizeY = numOflines * CHAT_BUBBLE_LINE_HEIGHT
 
-		chatBubbleRender:TweenSizeAndPosition(UDim2.new(bubbleWidthScale, 0, 0, newChatBubbleOffsetSizeY),
-											 	UDim2.new( (1-bubbleWidthScale)/2, 0, 1, -newChatBubbleOffsetSizeY),
-											 	Enum.EasingDirection.Out, Enum.EasingStyle.Elastic, 0.1, true,
-											 	function() bubbleText.Visible = true end)
+			chatBubbleRender:TweenSizeAndPosition(UDim2.new(bubbleWidthScale, 0, 0, newChatBubbleOffsetSizeY),
+												 	UDim2.new( (1-bubbleWidthScale)/2, 0, 1, -newChatBubbleOffsetSizeY),
+												 	Enum.EasingDirection.Out, Enum.EasingStyle.Elastic, 0.1, true,
+												 	function() bubbleText.Visible = true end)
 
-		-- todo: remove when over max bubbles
-		this:SetBillboardGuiLOD(billboardGui, line.Origin)
-		this:UpdateChatLinesForOrigin(line.Origin, -newChatBubbleOffsetSizeY)
+			-- todo: remove when over max bubbles
+			this:SetBillboardGuiLOD(billboardGui, line.Origin)
+			this:UpdateChatLinesForOrigin(line.Origin, -newChatBubbleOffsetSizeY)
 
-		delay(line.BubbleDieDelay, function()
-			this:DestroyBubble(fifo, chatBubbleRender)
-		end)
+			delay(line.BubbleDieDelay, function()
+				this:DestroyBubble(fifo, chatBubbleRender)
+			end)
+		end
 	end
 
 	local testLabel = Instance.new('TextLabel')
@@ -591,18 +596,15 @@ local function createChatOutput()
 
 		local line = createPlayerChatLine(chatType, sourcePlayer, safeMessage, not fromOthers)
 
-		local fifo = this.CharacterSortedMsg:Get(line.Origin).Fifo
-		fifo:PushBack(line)
-
-		if sourcePlayer then
+		if sourcePlayer and line.Origin then
+			local fifo = this.CharacterSortedMsg:Get(line.Origin).Fifo
+			fifo:PushBack(line)
 			--Game chat (badges) won't show up here
 			this:CreateChatLineRender(sourcePlayer.Character, line, true, fifo)
 		end
 	end
 
 	function this:OnGameChatMessage(origin, message, color)
-		if not this:BubbleChatEnabled() then return end
-
 		local localPlayer = PlayersService.LocalPlayer
 		local fromOthers = localPlayer ~= nil and (localPlayer.Character ~= origin)
 
@@ -654,4 +656,4 @@ local success = pcall(function() isClient = game:GetService("RunService"):IsClie
 -- init only if we have a simulation going
 if isClient or not success then
 	createChatOutput()
-end
+end

RCCService2017/RCCService.exe.bak

@@ -6,14 +6,15 @@
 -- Variables
 local contextActionService = game:GetService("ContextActionService")
 local userInputService = game:GetService("UserInputService")
+local playersService = game:GetService("Players")
 local isTouchDevice = userInputService.TouchEnabled
 local functionTable = {}
 local buttonVector = {}
 local buttonScreenGui = nil
 local buttonFrame = nil
 
-local ContextDownImage = "http://www.roblox.com/asset/?id=97166756"
-local ContextUpImage = "http://www.roblox.com/asset/?id=97166444"
+local ContextDownImage = "https://www.roblox.com/asset/?id=97166756"
+local ContextUpImage = "https://www.roblox.com/asset/?id=97166444"
 
 local oldTouches = {}
 
@@ -32,9 +33,11 @@ local maxButtons = #buttonPositionTable
 game:GetService("ContentProvider"):Preload(ContextDownImage)
 game:GetService("ContentProvider"):Preload(ContextUpImage)
 
-repeat wait() until game:GetService("Players").LocalPlayer
-
-local localPlayer = game:GetService("Players").LocalPlayer
+local localPlayer = playersService.LocalPlayer
+while not localPlayer do
+	playersService.ChildAdded:wait()
+	localPlayer = playersService.LocalPlayer
+end
 
 function createContextActionGui()
 	if not buttonScreenGui and isTouchDevice then
@@ -103,10 +106,10 @@ function createNewButton(actionName, functionInfoTable)
 	local contextButton = Instance.new("ImageButton")
 	contextButton.Name = "ContextActionButton"
 	contextButton.BackgroundTransparency = 1
-	contextButton.Size = UDim2.new(0,90,0,90)
+	contextButton.Size = UDim2.new(0,45,0,45)
 	contextButton.Active = true
 	if isSmallScreenDevice() then 
-		contextButton.Size = UDim2.new(0,70,0,70)
+		contextButton.Size = UDim2.new(0,35,0,35)
 	end
 	contextButton.Image = ContextUpImage
 	contextButton.Parent = buttonFrame
@@ -194,6 +197,9 @@ function createButton( actionName, functionInfoTable )
 
 	if buttonScreenGui and buttonScreenGui.Parent == nil then
 		buttonScreenGui.Parent = localPlayer.PlayerGui
+		if not buttonFrame.Parent then
+			buttonFrame.Parent = buttonScreenGui
+		end
 	end
 end
 

RCCService2017/content/scripts/CoreScripts/BubbleChat.lua renamed to RCCService2017/content/scripts/CoreScripts/CoreScripts/BubbleChat.lua

@@ -28,20 +28,6 @@ local isTenFootInterface = tenFootInterface:IsEnabled()
 local radialButtons = {}
 local lastInputChangedCon = nil
 
-local function getButtonForCoreGuiType(coreGuiType)
-	if coreGuiType == Enum.CoreGuiType.All then
-		return radialButtons
-	else
-		for button, table in pairs(radialButtons) do
-			if table["CoreGuiType"] == coreGuiType then
-				return button
-			end
-		end
-	end
-
-	return nil
-end
-
 local function getImagesForSlot(slot)
 	if slot == 1 then		return "rbxasset://textures/ui/Settings/Radial/Top.png", "rbxasset://textures/ui/Settings/Radial/TopSelected.png",
 									"rbxasset://textures/ui/Settings/Radial/Menu.png",
@@ -111,6 +97,26 @@ local function setButtonEnabled(button, enabled)
 	radialButtons[button]["Disabled"] = not enabled
 end
 
+local function setButtonVisible(button, visible)
+	button.Visible = visible
+	if not visible then
+		setButtonEnabled(button, false)
+	end
+end
+
+local function enableVR()
+	local visibleButtons = {
+		Settings = true, LeaveGame = true,
+		PlayerList = false, Notifications = false,
+		Backpack = false, Chat = false
+	}
+	for button, _ in pairs(radialButtons) do
+		if visibleButtons[button.Name] ~= nil then
+			setButtonVisible(button, visibleButtons[button.Name])
+		end
+	end
+end
+
 local emptySelectedImageObject = utility:Create'ImageLabel'
 {
 	BackgroundTransparency = 1,
@@ -173,7 +179,7 @@ local function createRadialButton(name, text, slot, disabled, coreGuiType, activ
 		TextColor3 = Color3.new(1,1,1),
 		Name = "RadialLabel",
 		Visible = false,
-		ZIndex = 2,
+		ZIndex = 3,
 		Parent = radialButton
 	};
 	if not smallScreen then
@@ -297,7 +303,7 @@ local function createGamepadMenuGui()
 	------------ Chat ---------------
 	local chatFunc = function() 
 		toggleCoreGuiRadial()
-		local ChatModule = require(GuiRoot.Modules.Chat)
+		local ChatModule = require(GuiRoot.Modules.ChatSelector)
 		ChatModule:ToggleVisibility()
 	end
 	local chatRadial = createRadialButton("Chat", "Chat", 6, not StarterGui:GetCoreGuiEnabled(Enum.CoreGuiType.Chat), Enum.CoreGuiType.Chat, chatFunc)
@@ -380,6 +386,10 @@ local function createGamepadMenuGui()
 			end
 		end
 	end)
+
+	if InputService.VREnabled then
+		enableVR()
+	end
 end
 
 local function isCoreGuiDisabled()
@@ -523,14 +533,16 @@ local function setupGamepadControls()
 		end
 	end
 
-	function setOverrideMouseIconBehavior()
-		pcall(function()
+	function setOverrideMouseIconBehavior(override)
+		if override then
 			if InputService:GetLastInputType() == Enum.UserInputType.Gamepad1 then
 				InputService.OverrideMouseIconBehavior = Enum.OverrideMouseIconBehavior.ForceHide
 			else
 				InputService.OverrideMouseIconBehavior = Enum.OverrideMouseIconBehavior.ForceShow
 			end
-		end)
+		else
+			InputService.OverrideMouseIconBehavior = Enum.OverrideMouseIconBehavior.None
+		end
 	end
 
 	function toggleCoreGuiRadial(goingToSettings)
@@ -539,8 +551,8 @@ local function setupGamepadControls()
 		setVisibility()
 
 		if isVisible then
-			setOverrideMouseIconBehavior()
-			pcall(function() lastInputChangedCon = InputService.LastInputTypeChanged:connect(setOverrideMouseIconBehavior) end)
+			setOverrideMouseIconBehavior(true)
+			lastInputChangedCon = InputService.LastInputTypeChanged:connect(function() setOverrideMouseIconBehavior(true) end)
 
 			gamepadSettingsFrame.Visible = isVisible
 
@@ -560,8 +572,7 @@ local function setupGamepadControls()
 				lastInputChangedCon:disconnect()
 				lastInputChangedCon = nil
 			end
-			pcall(function() InputService.OverrideMouseIconBehavior = Enum.OverrideMouseIconBehavior.None end)
-
+			
 			local settingsChildren = gamepadSettingsFrame:GetChildren()
 			for i = 1, #settingsChildren do
 				if settingsChildren[i]:IsA("GuiButton") then
@@ -571,6 +582,9 @@ local function setupGamepadControls()
 			gamepadSettingsFrame:TweenSizeAndPosition(UDim2.new(0,102,0,102), UDim2.new(0.5,-51,0.5,-51),
 														Enum.EasingDirection.Out, Enum.EasingStyle.Sine, 0.1, true, 
 				function()
+					if not InputService.VREnabled then
+						setOverrideMouseIconBehavior(false)
+					end
 					if not goingToSettings and not isVisible then GuiService:SetMenuIsOpen(false) end
 					gamepadSettingsFrame.Visible = isVisible
 			end)
@@ -601,9 +615,11 @@ local function setupGamepadControls()
 
 	doGamepadMenuButton = function(name, state, input)
 		if state ~= Enum.UserInputState.Begin then return end
-
-		if not toggleCoreGuiRadial() then
-			unbindAllRadialActions()
+		
+		if game.IsLoaded then
+			if not toggleCoreGuiRadial() then
+				unbindAllRadialActions()
+			end
 		end
 	end
 
@@ -617,35 +633,47 @@ local function setupGamepadControls()
 		end)
 	end
 
+	-- some buttons always show/hide depending on platform
+	local function canChangeButtonVisibleState(buttonType)
+		if isTenFootInterface then
+			if buttonType == Enum.CoreGuiType.Chat or buttonType == Enum.CoreGuiType.PlayerList then
+				return false
+			end
+		end
+
+		return true
+	end
+
 	local function setRadialButtonEnabled(coreGuiType, enabled)
-		local returnValue = getButtonForCoreGuiType(coreGuiType)
-		if not returnValue then return end
-
-		local buttonsToDisable = {}
-		if type(returnValue) == "table" then
-			for button, buttonTable in pairs(returnValue) do
-				if buttonTable["CoreGuiType"] then
-					if isTenFootInterface and buttonTable["CoreGuiType"] == Enum.CoreGuiType.Chat then
-					else
-						buttonsToDisable[#buttonsToDisable + 1] = button
+		for button, buttonTable in pairs(radialButtons) do
+			local buttonType = buttonTable["CoreGuiType"]
+			if buttonType then
+				if coreGuiType == buttonType or coreGuiType == Enum.CoreGuiType.All then
+					if canChangeButtonVisibleState(buttonType) then
+						setButtonEnabled(button, enabled)
 					end
 				end
 			end
-		else
-			if isTenFootInterface and returnValue.Name == "Chat" then
-			else
-				buttonsToDisable[1] = returnValue
-			end
 		end
-
-		for i = 1, #buttonsToDisable do
-			local button = buttonsToDisable[i]
-			setButtonEnabled(button, enabled)
+	end
+	
+	local loadedConnection
+	local function enableRadialMenu()
+		ContextActionService:BindCoreAction(toggleMenuActionName, doGamepadMenuButton, false, Enum.KeyCode.ButtonStart)
+		loadedConnection:disconnect()
+	end
+	
+	loadedConnection = game.Players.PlayerAdded:connect(function(plr) 
+		if game.Players.LocalPlayer and plr == game.Players.LocalPlayer then
+			enableRadialMenu()
 		end
+	end)
+	
+	if game.Players.LocalPlayer then
+		enableRadialMenu()
 	end
+	
 	StarterGui.CoreGuiChangedSignal:connect(setRadialButtonEnabled)
-
-	ContextActionService:BindCoreAction(toggleMenuActionName, doGamepadMenuButton, false, Enum.KeyCode.ButtonStart)
 end
 
 -- hook up gamepad stuff

RCCService2017/content/scripts/CoreScripts/BuildToolsScripts/BuildToolManager.lua renamed to RCCService2017/content/scripts/CoreScripts/CoreScripts/BuildToolsScripts/BuildToolManager.lua

@@ -37,7 +37,7 @@ local characterAddedConnection = nil
 local greenBarImage = "rbxasset://textures/ui/Health-BKG-Center.png"
 local greenBarImageLeft = "rbxasset://textures/ui/Health-BKG-Left-Cap.png"
 local greenBarImageRight = "rbxasset://textures/ui/Health-BKG-Right-Cap.png"
-local hurtOverlayImage = "http://www.roblox.com/asset/?id=34854607"
+local hurtOverlayImage = "https://www.roblox.com/asset/?id=34854607"
 
 game:GetService("ContentProvider"):Preload(greenBarImage)
 game:GetService("ContentProvider"):Preload(hurtOverlayImage)