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

Adding directional animation + 2H weapon handling #24

Merged
merged 20 commits into from
Sep 16, 2024

Conversation

Dennis-Nesterenko
Copy link

Adding two files directional walking animations as well as 2 handed weapon walking

Theres probably a better way to go about this but for now this allows the character to strafe with and without a rifle

David-Goru and others added 20 commits February 16, 2024 23:20
* Add Belt trait and filter

* Set up Belt trait and filter

* Set up IDSlot filter
* Rework how the application is initialized and how the network settings are set

* Rework how application is initialized

* Fix issues with rebase and add documentation

* Fix rebase errors

* Fixed issues with the rebase

* Fix assemblies and add docs to SceneSystem

* Fix build error related to Editor imports on Item.cs

* Remove unused class

* Fix issue with launcher checks and conflict errors

* Remove prefab that caused tests to fail

* Update some values to fix intro
* Fix item colliders

* Fix everything

* Fish fears me

* Sausages

* Move stuff to Freeze/Unfreeze

* add comment

* Fix wrong component

* Add a comment to _container and Container

---------

Co-authored-by: Mechar418 <77565416+Mechar418@users.noreply.github.com>
Co-authored-by: stilnat <nathan.raynal.castang@gmail.com>
* Port chat from outdated version

RE-SS3D#89

* Make ChatRegister non-NetworkBehaviour and deattach from Human

* Unify ChatRegister and ChatWindow

* Fix NRE when dragging tabs in chat

* Fix ChatWindow missing script

* Remove unused ChatWindow2

* Remove AutoExpandGridLayoutGroup

* Fix can't move ChatWindow

* Clean ResizePanel.cs

* Clean TabCreator.cs

* Remove unused ToggleChat.cs

* Clean ChatChannel.cs

* Clean ChatChannels.cs

* Clean ChatTabData.cs

* Clean ChatFilterOption.cs

* Re-add multiple chats windows functionality

* Update ChatWindow.prefab

* Make ToggleChats work for all windows

* Clean ChatWindow + avoid some input while writing

* Undo ugly solution for blocking input while writing in chat

* Change chat input to ControlsOffInputText

* Add SendChatMessage input control

* Let players remove chat windows with one tab

* Move ChatChannels to ScriptableObjects

* Add role required to chat channels

* Add chat to lobby

* Undo Game.unity changes from port

* Fix can't drag ChatWindow in-game

* Add formattable channels

* Add distance-based chats

* Add prefix/suffix option for chat channels

* Add "hide sender name" option for chat channels

* Update HideSender values of some channels

* Split ChatWindow into Lobby and InGameChatWindow

* Fix duplicated client chat messages

* Add system to make chat channels depend on headset

Uses traits in the headset. For example, Security channel has the Security headset. Creating a headset and adding the Security trait will enable that channel

* Improve channels workflow

* Fix comparison between traits not working correctly

This is a weird issue that only happens on the client but not on the host. The type of the same two traits returns a different value, the first trait that is getting compared returns the general/main object type (Trait) while the second returns the specific type. For example, Security trait returns "Trait" object type for item 1 being compared, while the same trait returns "IDPermission" object type for item 2

* Add a simple log for the chat

It's really simple and unoptimized, but does the trick (for now). Chat log can be found with the rest of logs (Game > Logs)

* Add tabName to ChatChannels

* Add tooltips to ChatChannel ScriptableObject

* Improve a bit the visuals of the ChatWindows

* Block camera zoom when hovering a chat

* Fix available channels not syncing in client

* Fix nomenclature of fields

* Use ViewLocator in ToggleChats

* Remove ternary operator when getting tab name

* Fix wrong capitalization on AvailableChannels

* Add OnAvailableChannelsChanged method

* Rename ChatFilterOption Init to Setup

* Improve ChatFilterOptionToggleUI readability

* Rename ChatTab variables for readability

* Rename ChatTab Init to Setup

* Cache transforms in ChatTab

* Set correct name to new tab button in ChatTab

* Remove msg abbreviation in ChatWindow

* Convert ChatMessageSender to ChatSystem

* Add RegisteredChatChannels dictionary to ChatSystem

* Add ToString method to ChatMessage

* Convert ChatChannels to ScriptableSettings

* Remove unused var in ChatWindow

* Remove defaultChat var from InGameChatWindow

* Fix tabs in ResizePanel

* Remove UI responsibility of ChatSystem

* Fix missing references

* Clean ChatSystem code

* Fix new tabs not syncing available channels correctly

* Add NotImplementedException to ChatWindow GetCurrentChatChannel

* Fix controls enabled while writing tab name

* Add scroll to tabs row

* Add HeadsetSecurity (Left/Right)

* Update UI to match a bit more the UI design

https://ss3d.gitbook.io/design/basic-game-mechanics/user-interface/game/player-hud

* Move chat formatting to original client + tweaks to match design

Now chat formatting is done only by the original client who sents the message, so the rest of players receive the message already formatted
Also updated how text is displayed to match the UI design (https://ss3d.gitbook.io/design/basic-game-mechanics/user-interface/game/player-hud)

* Rename channel General to Local

* Add LOOC channel

* Add StationAlerts channel

* Add more options for ChatChannels

* Remove player joined message

* Add welcome to the ship message on round start

* Add character joined message for late joining

* Add General trait to headsets + required traits to channels

* Update ChatChannels list

* Fix late join message being sent by player

* Remove "Character" from in-game chat name

* Fix headset left floating on clients
…-SS3D#1434)

The Slots list was keeping a list of destroyed slots between rounds, breaking the order of slots after the first round
* Fix large wall mount clipping (RE-SS3D#1347)

* Set isLarge on the wall mounts that clip
* Add UserInterfaceSettings script and fix BandwidthView not showing

* Add category and interactive elements prefabs to the Game scene

* Change UserInterfaceSettings to GlobalUiVisibilityControllerView
* Update ProjectSettings.asset

* Update ProjectSettings.asset

* Update ProjectSettings.asset
We need to figure out a better naming scheme
@stilnat stilnat merged commit 4edee4e into stilnat:Animations Sep 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants