Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port Chat from Outdated branch #1426

Merged
merged 89 commits into from
Mar 5, 2024
Merged
Changes from 1 commit
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
70e8860
Port chat from outdated version
David-Goru Feb 17, 2024
ae5b297
Make ChatRegister non-NetworkBehaviour and deattach from Human
David-Goru Feb 17, 2024
60fac88
Unify ChatRegister and ChatWindow
David-Goru Feb 17, 2024
568f8a1
Fix NRE when dragging tabs in chat
David-Goru Feb 17, 2024
094f971
Fix ChatWindow missing script
David-Goru Feb 17, 2024
3539624
Remove unused ChatWindow2
David-Goru Feb 17, 2024
2757c48
Remove AutoExpandGridLayoutGroup
David-Goru Feb 17, 2024
c4ac41f
Fix can't move ChatWindow
David-Goru Feb 17, 2024
aa14c22
Clean ResizePanel.cs
David-Goru Feb 17, 2024
451feae
Clean TabCreator.cs
David-Goru Feb 17, 2024
18b00a6
Remove unused ToggleChat.cs
David-Goru Feb 17, 2024
4a552e8
Clean ChatChannel.cs
David-Goru Feb 17, 2024
9ea8edf
Clean ChatChannels.cs
David-Goru Feb 17, 2024
b738ee0
Clean ChatTabData.cs
David-Goru Feb 17, 2024
7610393
Clean ChatFilterOption.cs
David-Goru Feb 17, 2024
115f70e
Re-add multiple chats windows functionality
David-Goru Feb 17, 2024
16f71b4
Update ChatWindow.prefab
David-Goru Feb 17, 2024
c1bbc4f
Make ToggleChats work for all windows
David-Goru Feb 17, 2024
d36430e
Clean ChatWindow + avoid some input while writing
David-Goru Feb 18, 2024
9bb8961
Undo ugly solution for blocking input while writing in chat
David-Goru Feb 18, 2024
6482468
Change chat input to ControlsOffInputText
David-Goru Feb 18, 2024
3177db2
Add SendChatMessage input control
David-Goru Feb 18, 2024
57194f4
Let players remove chat windows with one tab
David-Goru Feb 18, 2024
c6d7199
Move ChatChannels to ScriptableObjects
David-Goru Feb 18, 2024
d0cba85
Add role required to chat channels
David-Goru Feb 18, 2024
563ec25
Add chat to lobby
David-Goru Feb 18, 2024
665509f
Undo Game.unity changes from port
David-Goru Feb 18, 2024
3c7eca2
Merge branch 'RE-SS3D:develop' into develop
David-Goru Feb 18, 2024
eb91d91
Fix can't drag ChatWindow in-game
David-Goru Feb 18, 2024
81c89de
Add formattable channels
David-Goru Feb 18, 2024
091d8ca
Add distance-based chats
David-Goru Feb 18, 2024
ed2da8b
Add prefix/suffix option for chat channels
David-Goru Feb 18, 2024
9bd3dee
Add "hide sender name" option for chat channels
David-Goru Feb 18, 2024
5816fd6
Update HideSender values of some channels
David-Goru Feb 18, 2024
302a2a1
Split ChatWindow into Lobby and InGameChatWindow
David-Goru Feb 18, 2024
3599322
Fix duplicated client chat messages
David-Goru Feb 18, 2024
beb6330
Add system to make chat channels depend on headset
David-Goru Feb 20, 2024
a408bce
Improve channels workflow
David-Goru Feb 20, 2024
0253890
Fix comparison between traits not working correctly
David-Goru Feb 20, 2024
0d10900
Add a simple log for the chat
David-Goru Feb 22, 2024
0d540a4
Merge branch 'RE-SS3D:develop' into develop
David-Goru Feb 22, 2024
ef5f994
Add tabName to ChatChannels
David-Goru Feb 22, 2024
423cb85
Add tooltips to ChatChannel ScriptableObject
David-Goru Feb 22, 2024
e1d98c8
Improve a bit the visuals of the ChatWindows
David-Goru Feb 22, 2024
c318293
Block camera zoom when hovering a chat
David-Goru Feb 22, 2024
9634d39
Fix available channels not syncing in client
David-Goru Feb 22, 2024
723ff8b
Fix nomenclature of fields
David-Goru Feb 22, 2024
557b77d
Use ViewLocator in ToggleChats
David-Goru Feb 22, 2024
a7b02c8
Remove ternary operator when getting tab name
David-Goru Feb 22, 2024
6d18841
Fix wrong capitalization on AvailableChannels
David-Goru Feb 22, 2024
0632086
Add OnAvailableChannelsChanged method
David-Goru Feb 22, 2024
fad84d5
Rename ChatFilterOption Init to Setup
David-Goru Feb 22, 2024
1dccbf7
Improve ChatFilterOptionToggleUI readability
David-Goru Feb 22, 2024
9d9c89a
Rename ChatTab variables for readability
David-Goru Feb 22, 2024
fb2b8c9
Rename ChatTab Init to Setup
David-Goru Feb 22, 2024
96c00b4
Cache transforms in ChatTab
David-Goru Feb 22, 2024
d37fc97
Set correct name to new tab button in ChatTab
David-Goru Feb 22, 2024
69ecfb7
Remove msg abbreviation in ChatWindow
David-Goru Feb 22, 2024
e3da9e4
Convert ChatMessageSender to ChatSystem
David-Goru Feb 22, 2024
f20f5f1
Add RegisteredChatChannels dictionary to ChatSystem
David-Goru Feb 22, 2024
0cbc349
Add ToString method to ChatMessage
David-Goru Feb 22, 2024
6f74927
Convert ChatChannels to ScriptableSettings
David-Goru Feb 22, 2024
3c93d6a
Remove unused var in ChatWindow
David-Goru Feb 22, 2024
510ca0f
Remove defaultChat var from InGameChatWindow
David-Goru Feb 22, 2024
0437ac0
Fix tabs in ResizePanel
David-Goru Feb 22, 2024
2855001
Remove UI responsibility of ChatSystem
David-Goru Feb 22, 2024
2a564cf
Fix missing references
David-Goru Feb 22, 2024
0db3b04
Clean ChatSystem code
David-Goru Feb 22, 2024
9b8886e
Fix new tabs not syncing available channels correctly
David-Goru Feb 22, 2024
654a486
Add NotImplementedException to ChatWindow GetCurrentChatChannel
David-Goru Feb 23, 2024
7f4ef14
Fix controls enabled while writing tab name
David-Goru Feb 23, 2024
6a9fd06
Add scroll to tabs row
David-Goru Feb 23, 2024
91a679f
Add HeadsetSecurity (Left/Right)
David-Goru Feb 23, 2024
ef1115a
Merge branch 'RE-SS3D:develop' into develop
David-Goru Feb 23, 2024
737a975
Update UI to match a bit more the UI design
David-Goru Feb 24, 2024
b6615f2
Move chat formatting to original client + tweaks to match design
David-Goru Feb 24, 2024
19e74b9
Rename channel General to Local
David-Goru Feb 26, 2024
7a77287
Add LOOC channel
David-Goru Feb 26, 2024
e207066
Add StationAlerts channel
David-Goru Feb 26, 2024
ddea851
Add more options for ChatChannels
David-Goru Feb 26, 2024
0845848
Remove player joined message
David-Goru Feb 26, 2024
ff1b4d0
Add welcome to the ship message on round start
David-Goru Feb 26, 2024
296b478
Add character joined message for late joining
David-Goru Feb 26, 2024
255dfa2
Add General trait to headsets + required traits to channels
David-Goru Feb 26, 2024
48a19de
Update ChatChannels list
David-Goru Feb 26, 2024
fb712e2
Fix late join message being sent by player
David-Goru Feb 27, 2024
e4832c0
Remove "Character" from in-game chat name
David-Goru Feb 27, 2024
561b728
Fix headset left floating on clients
David-Goru Feb 27, 2024
bc03f1a
Merge branch 'RE-SS3D:develop' into develop
David-Goru Feb 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add StationAlerts channel
David-Goru committed Feb 27, 2024
commit e207066b416b6bfa85abc9134ba4c4636c23fd46
30 changes: 30 additions & 0 deletions Assets/Content/Data/UI/Chat/Channels/StationAlerts.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cd2d6eaeb9ae4b9f85a3ab7c93c2a1bb, type: 3}
m_Name: StationAlerts
m_EditorClassIdentifier:
Abbreviation: Station Alerts
TabName: I
Color: {r: 0.8301887, g: 0.66064215, b: 0, a: 1}
Hidable: 0
CodeOnlyChannel: 0
RoleRequiredToUse: 0
CanFormatText: 0
DistanceBased: 0
MaxDistance: 0
defaultVerb:
TextPrefix:
TextSuffix:
UseCharacterName: 1
HideSenderName: 0
SurroundMessageWithQuotationMarks: 1
RequiredTraitInHeadset: {fileID: 0}
8 changes: 8 additions & 0 deletions Assets/Content/Data/UI/Chat/Channels/StationAlerts.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.