Merge branch 'master' of https://sphynx.bumblebeargames.com/josh/namedropper

# Conflicts:
#	namedropper/Assets/Scenes/Game.unity
#	namedropper/Assets/Scripts/Player.cs

namedropper/Assets/Scenes/TopicSelect.unity

@@ -185,7 +185,27 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
       propertyPath: m_text
-      value: "\t"
+      value: Player\u00A01
+      objectReference: {fileID: 0}
+    - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
+      propertyPath: m_fontSize
+      value: 44.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
+      propertyPath: m_fontColor.b
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
+      propertyPath: m_fontColor.g
+      value: 0.9441657
+      objectReference: {fileID: 0}
+    - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
+      propertyPath: m_fontColor.r
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
+      propertyPath: m_fontColor32.rgba
+      value: 4294963456
       objectReference: {fileID: 0}
     - target: {fileID: 9049015333349338377, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
       propertyPath: _team
@@ -466,7 +486,27 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
       propertyPath: m_text
-      value: "\t"
+      value: Player\u00A04
+      objectReference: {fileID: 0}
+    - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
+      propertyPath: m_fontSize
+      value: 42.65
+      objectReference: {fileID: 0}
+    - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
+      propertyPath: m_fontColor.b
+      value: 0.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
+      propertyPath: m_fontColor.g
+      value: 0.27615115
+      objectReference: {fileID: 0}
+    - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
+      propertyPath: m_fontColor.r
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
+      propertyPath: m_fontColor32.rgba
+      value: 4282402559
       objectReference: {fileID: 0}
     - target: {fileID: 9049015333349338377, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
       propertyPath: _team
@@ -645,7 +685,27 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
       propertyPath: m_text
-      value: "\t"
+      value: Player\u00A03
+      objectReference: {fileID: 0}
+    - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
+      propertyPath: m_fontSize
+      value: 42.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
+      propertyPath: m_fontColor.b
+      value: 0.12253404
+      objectReference: {fileID: 0}
+    - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
+      propertyPath: m_fontColor.g
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
+      propertyPath: m_fontColor.r
+      value: 0.7169812
+      objectReference: {fileID: 0}
+    - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
+      propertyPath: m_fontColor32.rgba
+      value: 4280221879
       objectReference: {fileID: 0}
     - target: {fileID: 9049015333299688696, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
       propertyPath: m_Text
@@ -965,7 +1025,27 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
       propertyPath: m_text
-      value: "\t"
+      value: Player\u00A02
+      objectReference: {fileID: 0}
+    - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
+      propertyPath: m_fontSize
+      value: 42.65
+      objectReference: {fileID: 0}
+    - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
+      propertyPath: m_fontColor.b
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
+      propertyPath: m_fontColor.g
+      value: 0.306108
+      objectReference: {fileID: 0}
+    - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
+      propertyPath: m_fontColor.r
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5117799249883694698, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
+      propertyPath: m_fontColor32.rgba
+      value: 4294921728
       objectReference: {fileID: 0}
     - target: {fileID: 9049015333299688696, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3}
       propertyPath: m_Text