-
Notifications
You must be signed in to change notification settings - Fork 159
Squad-HUDs removed from headsets #820
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
base: master
Are you sure you want to change the base?
Squad-HUDs removed from headsets #820
Conversation
I say, after hours of trying other things first
Test merge deployment history:Test Merge Updated @ 03/23/2025 09:05:10 +00:00:Server InstancePVECM: Green Merged ByDrathek RevisionOrigin: 1172d1f Test Merge Updated @ 03/23/2025 09:33:14 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: 1172d1f Test Merge Deployed @ 03/23/2025 16:10:37 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin: 1172d1f Test Merge Updated @ 03/24/2025 14:12:20 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: 384d501 Test Merge Updated @ 03/24/2025 14:17:04 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: 384d501 Test Merge Updated @ 03/24/2025 14:20:53 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: 384d501 Test Merge Updated @ 03/24/2025 18:07:27 +00:00:Server InstancePVECM: Red Merged Bylordloko RevisionOrigin: 384d501 Test Merge Removed @ 03/24/2025 21:35:25 +00:00:Server InstancePVECM: Green Test Merge Updated @ 03/25/2025 00:57:55 +00:00:Server InstancePVECM: Red Merged ByRob606 RevisionOrigin: 384d501 Test Merge Updated @ 03/25/2025 23:29:34 +00:00:Server InstancePVECM: Red Merged ByRob606 RevisionOrigin: 384d501 Test Merge Updated @ 03/27/2025 00:17:07 +00:00:Server InstancePVECM: Red Merged ByAthena14 RevisionOrigin: 08f2790 Test Merge Deployed @ 03/27/2025 17:29:49 +00:00:Server InstancePVECM: Blue Merged ByPandora029 RevisionOrigin: 08f2790 Test Merge Updated @ 03/27/2025 21:23:57 +00:00:Server InstancePVECM: Red Merged BySome Random Username RevisionOrigin: 08f2790 Test Merge Updated @ 03/29/2025 00:02:46 +00:00:Server InstancePVECM: Red Merged ByThe32bitguy RevisionOrigin: 934ac37 Test Merge Updated @ 03/29/2025 13:03:42 +00:00:Server InstancePVECM: Red Merged ByThe32bitguy RevisionOrigin: 934ac37 Test Merge Updated @ 03/29/2025 13:57:45 +00:00:Server InstancePVECM: Red Merged ByThe32bitguy RevisionOrigin: 934ac37 Test Merge Updated @ 03/30/2025 03:02:42 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin: 934ac37 Test Merge Updated @ 03/30/2025 03:12:13 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin: 934ac37 Test Merge Updated @ 03/30/2025 10:02:10 +00:00:Server InstancePVECM: Red Merged ByThe32bitguy RevisionOrigin: ccfd444 Test Merge Updated @ 03/30/2025 16:56:21 +00:00:Server InstancePVECM: Red Merged BySome Random Username RevisionOrigin: ccfd444 Test Merge Updated @ 03/30/2025 17:29:12 +00:00:Server InstancePVECM: Blue Merged Bylordloko RevisionOrigin: ccfd444 Test Merge Updated @ 03/31/2025 21:12:08 +00:00:Server InstancePVECM: Red Merged Bylordloko RevisionOrigin: ccfd444 Test Merge Removed @ 04/01/2025 11:16:10 +00:00:Server InstancePVECM: Red Test Merge Deployed @ 04/01/2025 12:55:27 +00:00:Server InstancePVECM: Red Merged ByAndroBetel RevisionOrigin: a8c03b5 Test Merge Updated @ 04/01/2025 18:42:24 +00:00:Server InstancePVECM: Red Merged ByMerrgear RevisionOrigin: a8c03b5 Test Merge Updated @ 04/02/2025 01:57:23 +00:00:Server InstancePVECM: Red Merged BySome Random Username RevisionOrigin: 8746c36 Test Merge Updated @ 04/02/2025 03:23:27 +00:00:Server InstancePVECM: Red Merged BySome Random Username RevisionOrigin: 8746c36 Test Merge Updated @ 04/02/2025 23:12:40 +00:00:Server InstancePVECM: Red Merged ByRob606 RevisionOrigin: b190850 Test Merge Updated @ 04/02/2025 23:28:29 +00:00:Server InstancePVECM: Red Merged ByRob606 RevisionOrigin: b190850 Test Merge Updated @ 04/03/2025 05:17:55 +00:00:Server InstancePVECM: Blue Merged ByAmoryBlaine RevisionOrigin: b190850 Test Merge Updated @ 04/03/2025 12:38:18 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin: b190850 Test Merge Updated @ 04/03/2025 15:14:04 +00:00:Server InstancePVECM: Blue Merged ByAmoryBlaine RevisionOrigin: b190850 Test Merge Updated @ 04/03/2025 17:42:18 +00:00:Server InstancePVECM: Red Merged Bylordloko RevisionOrigin: b190850 Test Merge Updated @ 04/03/2025 17:47:07 +00:00:Server InstancePVECM: Red Merged Bylordloko RevisionOrigin: b190850 Test Merge Updated @ 04/03/2025 21:32:48 +00:00:Server InstancePVECM: Red Merged BySome Random Username RevisionOrigin: b190850 Test Merge Updated @ 04/04/2025 01:27:42 +00:00:Server InstancePVECM: Red Merged BySome Random Username RevisionOrigin: b190850 Test Merge Updated @ 04/04/2025 01:31:50 +00:00:Server InstancePVECM: Red Merged BySome Random Username RevisionOrigin: b190850 Test Merge Updated @ 04/04/2025 17:57:09 +00:00:Server InstancePVECM: Red Merged Bylordloko RevisionOrigin: b190850 Test Merge Updated @ 04/05/2025 00:24:42 +00:00:Server InstancePVECM: Red Merged ByKirsh RevisionOrigin: b190850 Test Merge Updated @ 04/05/2025 13:52:51 +00:00:Server InstancePVECM: Blue Merged Bylordloko RevisionOrigin: b190850 Test Merge Updated @ 04/05/2025 14:01:15 +00:00:Server InstancePVECM: Blue Merged Bylordloko RevisionOrigin: b190850 Test Merge Updated @ 04/05/2025 17:36:35 +00:00:Server InstancePVECM: Blue Merged ByAmoryBlaine RevisionOrigin: b190850 Test Merge Updated @ 04/05/2025 22:52:20 +00:00:Server InstancePVECM: Red Merged BySome Random Username RevisionOrigin: b190850 Test Merge Updated @ 04/06/2025 03:23:38 +00:00:Server InstancePVECM: Blue Merged ByMessageCypher RevisionOrigin: b4ec248 Test Merge Updated @ 04/06/2025 07:17:37 +00:00:Server InstancePVECM: Blue Merged ByEmiSol RevisionOrigin: 2249a53 Test Merge Updated @ 04/06/2025 16:57:58 +00:00:Server InstancePVECM: Blue Merged Bylordloko RevisionOrigin: 2249a53 Test Merge Updated @ 04/06/2025 19:04:12 +00:00:Server InstancePVECM: Red Merged ByRob606 RevisionOrigin: 2249a53 Test Merge Removed @ 04/06/2025 21:14:09 +00:00:Server InstancePVECM: Blue Test Merge Updated @ 04/07/2025 23:32:08 +00:00:Server InstancePVECM: Red Merged ByRob606 RevisionOrigin: 59a7196 Test Merge Removed @ 04/09/2025 04:28:28 +00:00:Server InstancePVECM: Red Test Merge Deployed @ 04/11/2025 00:18:30 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin: f42638d Test Merge Deployed @ 04/11/2025 13:14:25 +00:00:Server InstancePVECM: Blue Merged ByThe32bitguy RevisionOrigin: f42638d Test Merge Updated @ 04/11/2025 19:20:08 +00:00:Server InstancePVECM: Red Merged ByAndroBetel RevisionOrigin: f42638d Test Merge Updated @ 04/11/2025 19:37:28 +00:00:Server InstancePVECM: Red Merged ByAndroBetel RevisionOrigin: f42638d Test Merge Updated @ 04/11/2025 22:10:00 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin: f42638d Test Merge Updated @ 04/12/2025 00:32:48 +00:00:Server InstancePVECM: Red Merged ByRob606 RevisionOrigin: f42638d Test Merge Deployed @ 04/12/2025 12:49:54 +00:00:Server InstancePVECM: Green Merged ByAthena14 RevisionOrigin: f42638d Test Merge Updated @ 04/12/2025 15:43:54 +00:00:Server InstancePVECM: Green Merged ByMessageCypher RevisionOrigin: f42638d Test Merge Updated @ 04/12/2025 15:47:43 +00:00:Server InstancePVECM: Green Merged ByMessageCypher RevisionOrigin: f42638d Test Merge Updated @ 04/12/2025 17:38:57 +00:00:Server InstancePVECM: Red Merged ByKirsh RevisionOrigin: f42638d Test Merge Updated @ 04/12/2025 19:16:22 +00:00:Server InstancePVECM: Green Merged ByWettowels RevisionOrigin: f42638d Test Merge Updated @ 04/12/2025 19:31:20 +00:00:Server InstancePVECM: Green Merged ByAthena14 RevisionOrigin: f42638d Test Merge Updated @ 04/12/2025 20:55:27 +00:00:Server InstancePVECM: Green Merged Bylordloko RevisionOrigin: f42638d Test Merge Updated @ 04/13/2025 00:15:27 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: f42638d Test Merge Updated @ 04/13/2025 00:15:39 +00:00:Server InstancePVECM: Blue Merged ByMerrgear RevisionOrigin: f42638d Test Merge Updated @ 04/13/2025 03:30:34 +00:00:Server InstancePVECM: Red Merged ByRob606 RevisionOrigin: 785d59a Test Merge Removed @ 04/13/2025 13:20:12 +00:00:Server InstancePVECM: Green Test Merge Updated @ 04/13/2025 14:39:20 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin: 785d59a Test Merge Updated @ 04/13/2025 14:43:55 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin: 785d59a Test Merge Updated @ 04/13/2025 15:15:00 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin: 785d59a Test Merge Removed @ 04/13/2025 19:58:57 +00:00:Server InstancePVECM: Blue Test Merge Updated @ 04/15/2025 00:16:11 +00:00:Server InstancePVECM: Red Merged ByRob606 RevisionOrigin: a0c6796 Test Merge Updated @ 04/15/2025 07:17:11 +00:00:Server InstancePVECM: Red Merged ByMessageCypher RevisionOrigin: a0c6796 Test Merge Deployed @ 04/15/2025 19:50:13 +00:00:Server InstancePVECM: Blue Merged ByThe32bitguy RevisionOrigin: a0c6796 Test Merge Updated @ 04/15/2025 20:28:25 +00:00:Server InstancePVECM: Blue Merged ByThe32bitguy RevisionOrigin: 4027a3e Test Merge Updated @ 04/16/2025 00:27:14 +00:00:Server InstancePVECM: Red Merged BySome Random Username RevisionOrigin: 4027a3e Test Merge Updated @ 04/16/2025 12:58:17 +00:00:Server InstancePVECM: Red Merged ByAndroBetel RevisionOrigin: 463bff6 Test Merge Updated @ 04/16/2025 13:14:45 +00:00:Server InstancePVECM: Red Merged ByAndroBetel RevisionOrigin: 463bff6 Test Merge Updated @ 04/16/2025 15:23:25 +00:00:Server InstancePVECM: Red Merged ByAndroBetel RevisionOrigin: 463bff6 Test Merge Updated @ 04/16/2025 16:12:13 +00:00:Server InstancePVECM: Blue Merged ByThe32bitguy RevisionOrigin: 463bff6 Test Merge Updated @ 04/16/2025 23:32:54 +00:00:Server InstancePVECM: Red Merged ByRob606 RevisionOrigin: 463bff6 Test Merge Updated @ 04/17/2025 14:53:33 +00:00:Server InstancePVECM: Red Merged ByAthena14 RevisionOrigin: 3618b7d Test Merge Updated @ 04/17/2025 14:57:54 +00:00:Server InstancePVECM: Red Merged ByAthena14 RevisionOrigin: 3618b7d Test Merge Updated @ 04/17/2025 18:38:53 +00:00:Server InstancePVECM: Red Merged ByRob606 RevisionOrigin: 3618b7d Test Merge Deployed @ 04/18/2025 14:58:32 +00:00:Server InstancePVECM: Green Merged ByAthena14 RevisionOrigin: b3bd5af Test Merge Updated @ 04/18/2025 19:02:04 +00:00:Server InstancePVECM: Red Merged ByJoooks RevisionOrigin: b3bd5af Test Merge Removed @ 04/18/2025 22:49:49 +00:00:Server InstancePVECM: Green Test Merge Updated @ 04/19/2025 13:01:13 +00:00:Server InstancePVECM: Blue Merged ByThe32bitguy RevisionOrigin: b3bd5af Test Merge Updated @ 04/19/2025 13:07:21 +00:00:Server InstancePVECM: Blue Merged ByThe32bitguy RevisionOrigin: b3bd5af Test Merge Updated @ 04/19/2025 13:47:37 +00:00:Server InstancePVECM: Blue Merged ByThe32bitguy RevisionOrigin: b3bd5af Test Merge Removed @ 04/19/2025 16:02:17 +00:00:Server InstancePVECM: Red Test Merge Removed @ 04/21/2025 19:38:17 +00:00:Server InstancePVECM: Blue Test Merge Deployed @ 05/05/2025 06:05:07 +00:00:Server InstancePVECM: Green Merged ByAthena14 RevisionOrigin: 7e020da Test Merge Updated @ 05/06/2025 08:23:02 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: 7e020da Test Merge Updated @ 05/06/2025 08:48:53 +00:00:Server InstancePVECM: Green Merged BySpartanBobby RevisionOrigin: 7e020da Test Merge Updated @ 05/06/2025 14:52:09 +00:00:Server InstancePVECM: Green Merged ByJoooks RevisionOrigin: 7e020da Test Merge Updated @ 05/07/2025 18:18:16 +00:00:Server InstancePVECM: Green Merged ByJoooks RevisionOrigin: acb3f60 Test Merge Removed @ 05/07/2025 20:35:05 +00:00:Server InstancePVECM: Green |
PMC synth headset subtype, new subtypes of the crew monitor for UPP & WY PMC, adjustments to PMC synth preset
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Conflicts have been resolved. A maintainer will review the pull request shortly. |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Conflicts have been resolved. A maintainer will review the pull request shortly. |
About the pull request
Finishes the work done by Amory & Vile in #424 to move the squad HUD functionality from the headset to various other sources such as; squad-optic helmet visor, the M56 gunsight eyepiece, the M5 camera gear (& subtypes for different factions) and the multitude of NVG eyepieces we have like the M42 or M49 gunsight.
The headset retains the tracker component as standard, along with squad management access, so you can see who is in your squad/section without having to grab a helmet or cam-gear early.
USCM synthetic headsets for the moment keep the HUD tied to it, as they don't normally wear helmets nor wear cam-gear.
The corpsman helmet comes with a combi squad & advanced medical hud now, so they won't need to toggle between them constantly to check who's who in the section/platoon & who's hurting
Adds a faction hud for the CMB, courtesy of Blundir for the code
Revamps many of the head mounted sight systems to give overwatch cameras too
Uniform/gear vendors have had their contents list adjusted, putting equipment that links them to the overwatch network up at the top
Explain why it's good for the game
No more magi-HUD on an earpiece. Didn't make too much sense, so now it's instead reliant on gear that will provide you a tie-in to the sensor-network (aka things that will let Overwatch see what you see)
Encourages taking a helmet or cam-gear for the optic on it now.
Testing Photographs and Procedure
Compiled without issue, tested locally & works as intended. Didn't run into any bugs during the testing.
Changelog
🆑
add: The M10's squad optic visor, M56 gunsight eyepiece, M42 scout sight, M49A battle-sight, Mk4 Battlemedic sight, M5 camera gear and all relevant subtypes now function as the primary means of seeing who is who amongst the section/platoon at a glance. The squad management menu is still accessible with just the headset and the tracker will point to your squad lead/section lead
add: The M42A, M42C, UPP commando NVGs and M56 gunsight optic now offer corresponding faction HUDs, for those who run those kinds of eyepieces without a helmet. Many of them will also offer a camera for OW units to observe through the wearer
add: Faction subtypes of the M5 cam-gear, PMC, TWE & UPP
add: Synthetic headset subtypes for PMC, UPP & FORECONE ones, bringing them in-line with the USCM one
add: Subtypes of the crew monitor tablet, in UPP & PMC flavours
add: CMB faction HUD
del: Removes the HUD functionality on the base USCM (standard & FORECON), UPP & PMC (platoon) headsets. Only synthetics headsets retain it for the time being
qol: Many HUD sources will give the squad HUD info of allied factions, so USCM can see USASF & Army and PMC can see the TWE ones
qol: The corpsman helmet now toggles both the squad hud & advanced medical hud at the same time, rather than needing to cycle through them
qol: Standard gear vendors had their lists adjusted to put helmets & cam-gear up at the top in their own category. The USCM medical vendors have recieved a new category for a combi squad & medical HUD eyepiece. The USCM LT of the Garrow recieves one in their office too
/:cl: