Commit graph

170 commits

Author SHA1 Message Date
Fate-JH 7222a37e50
Merge pull request #786 from Fate-JH/missing-ammo
Missing Ammunition Types
2021-04-24 00:53:31 -04:00
Jason_DiDonato@yahoo.com f0726f88d1 firebird_missile ammo 2021-04-21 20:58:32 -04:00
NickPSF 5361005a08
Merge pull request #785 from NickPSF/Nick-Changes/Overrides
Nick Changes/Overrides
2021-04-21 18:33:58 -05:00
NickPSF 5d84c85687
Update Avatar.scala 2021-04-21 18:07:19 -05:00
NickPSF 1f711feda4
Update GlobalDefinitions.scala 2021-04-21 17:30:34 -05:00
Fate-JH c515c727ff
Merge pull request #782 from Fate-JH/locker-swap
Right Click Locker Swap
2021-04-21 17:32:13 -04:00
Fate-JH 00c8b92b44
Fixes From 20210421 Logs (#784)
* test before casting to int; unsupported equipment in loadouts

* replacing null with Default.Actor

* in/out times but no actor

* empty password; squad ui elements out of order
2021-04-21 17:31:02 -04:00
NickPSF 499bd0392d
Update GlobalDefinitions.scala 2021-04-21 15:22:59 -05:00
NickPSF c27cace813
Update GlobalDefinitions.scala 2021-04-21 15:21:44 -05:00
NickPSF 0a3cf2c6d7
Update GlobalDefinitions.scala 2021-04-21 15:08:31 -05:00
Jason_DiDonato@yahoo.com b78e068c88 changing agile -> infiltration 2021-04-20 20:41:49 -04:00
Jason_DiDonato@yahoo.com 571562b929 right-click swap should work when the locker interface is open 2021-04-20 20:38:15 -04:00
Fate-JH e94744a0be
Merge pull request #771 from Fate-JH/cooldown-reset
Vehicle Cooldown
2021-04-19 07:39:14 -04:00
Jason_DiDonato@yahoo.com 69b8237d42 location of resolution is different 2021-04-18 23:06:29 -04:00
Jason_DiDonato@yahoo.com e41c76ebbc avatar = ... 2021-04-18 23:04:09 -04:00
Jason_DiDonato@yahoo.com 7e2d7a2089 even more concise 2021-04-18 10:17:08 -04:00
Fate-JH f11bf70af7
Merge branch 'master' into cooldown-reset 2021-04-18 09:14:58 -04:00
Jason_DiDonato@yahoo.com 0b7930eeff more concise management of purchase timers 2021-04-18 09:07:03 -04:00
Jakob Gillich 2dc1b5736a Fix implant auto activation not always working 2021-04-18 08:29:56 +02:00
Jakob Gillich 490e6244e7 Correctly set active=false when deinitializing implants
Plus a minor logging improvement in MA
2021-04-18 08:29:56 +02:00
Jakob Gillich ce32a1a1ff Fix terminal hack clearing
Fixes #759
2021-04-18 02:12:27 +02:00
Jakob Gillich 765262f51a Send tactical squad chat only to squad members 2021-04-18 01:38:32 +02:00
Jakob Gillich 22de086bb8 Middleware: Add MTU rather than setting length to max
Don't want overflow errors here since the next iteration will still
add their packet length.
2021-04-17 22:47:01 +02:00
Jakob Gillich 9d3e468693 Fix CharacterInfoMessage being bundled with OCDMs 2021-04-17 22:42:14 +02:00
Mazo 6fbe35b15f
Merge pull request #770 from jgillich/unknown30
add Unknown30 decoder, allow non-advanced packets
2021-04-17 19:50:47 +01:00
Mazo e42a95a675
Merge pull request #768 from Fate-JH/leave-squad-by-id
Leave Squad Service by Character Id
2021-04-17 19:48:21 +01:00
Jason_DiDonato@yahoo.com a2bd6999ab moved the point where the cooldown timer for the vehicle order would apply to the avatar to later, when the player is first seated, rather than earlier, when then order is first returned 2021-04-17 08:35:13 -04:00
Jakob Gillich 406d55bae7
add Unknown30 decoder, allow non-advanced packets 2021-04-17 10:08:16 +02:00
Jason_DiDonato@yahoo.com 39915598a4 log ensures knowledge of what the player is dismounting (and from where, when necessary) 2021-04-16 23:27:11 -04:00
Jason_DiDonato@yahoo.com 18c7a92bd9 logs ensure knowledge of what the player is mounting (and where, when necessary) 2021-04-16 23:22:00 -04:00
Jason_DiDonato@yahoo.com 4dafc3f380 attempt to alleviate issues with leaving squad service coverage when using character id's 2021-04-16 22:20:29 -04:00
Jakob Gillich f2953890be Log packet contents when no decoder is found 2021-04-17 02:33:14 +02:00
Jakob Gillich 92a0b1dfaa Implant initialization fixes 2021-04-17 01:38:36 +02:00
Jason_DiDonato@yahoo.com cfeff70c6b adjusting deadState thus that the player is not set to 'Alive' during avatar create prior to avatar setup 2021-04-16 21:57:34 +02:00
Fate-JH f5ef0a9674
A Bad Filter (#763)
* comment out most of apply-cooldown-to... filter to find out which part of it causes issues with the PR

* fixed resource silo tests

* everything but starting the scheduled task

* shutdown now

* cleaning schedule managed by simple time check
2021-04-15 08:38:31 -04:00
Fate-JH 8c34a55530
Miscellaneous Fixes (#760)
* suicide can pull outdated damage entry when no other option is available; occupied seats need to be collected

* kicking one player does not kick all players anymore

* augmenting persistence when using KAM packets to include avatar release condition as well as initial login
2021-04-14 21:15:12 -04:00
Fate-JH 51d46d86d3
Squad Chat Disabled (#761)
* spin up a test server where the chat channel for squads never gets interested with

* where art thou, oh, squad leader?

* leave only one channel, not be left with only one channel

* once again, filtering is wrong

* squad list reloads after zoning; squad size is checked against squad capacity before handling standard invitations
2021-04-14 21:06:01 -04:00
Mazo 0143f3b072 Fix duplicate stacked IFF locks breaking dropship center CC doors 2021-04-13 00:14:44 +02:00
Mazo ba490051cd Fix potential exception in CaptureFlagConverter 2021-04-13 00:14:44 +02:00
Fate-JH b548260257
encode and decode of only known packet of the ResetSequence type (#752) 2021-04-07 14:20:51 -04:00
Fate-JH 41b3eb5f66
Flaky Facility Faction Fix (#751)
* constantly starting at full power

* created a token control agency for llu sockets
2021-04-07 14:11:47 -04:00
Fate-JH ee969b2737
Cargo vehicle Mounting and Gating Fix (#749)
* reorganizing flags that allow for cargo vehicle mounting; eliminating double zone transfer messaging that was interfering in cargo vehicle transfer

* insufficient dismount repaired so that vehicle mounts correctly; vehicle HasSpawned message on deconstruct actually goes somewhere now
2021-04-07 09:42:19 -04:00
Fate-JH 430c5d8890
Minor Squad Refactor (#740)
* disassembled SquadService's receive cases into separate methods

* making certain the correct sender reaches the correct functions

* regex

* getting rid of warnings
2021-04-07 09:40:40 -04:00
Mazo 0d046dedeb Fix capturing neutral LLU bases with no friendly neighbours as a timed hack 2021-04-03 20:05:03 +01:00
Mazo 920d71c2f3 Fix hack timer on map base details not showing 2021-04-01 22:27:28 +01:00
Mazo 7e1466c898 Merge branch 'master-upstream' into llu-2021
# Conflicts:
#	src/main/scala/net/psforever/objects/avatar/PlayerControl.scala
#	src/main/scala/net/psforever/services/galaxy/GalaxyService.scala
#	src/main/scala/net/psforever/services/local/LocalService.scala
#	src/main/scala/net/psforever/services/local/LocalServiceMessage.scala
2021-03-31 23:12:59 +01:00
Mazo 3a992c7dde Wire up generator state to lattice benefits, fix lattice benefits not updating properly when faction is changed via setFactionTo 2021-03-31 23:08:39 +01:00
Mazo 45b640e85e GOAM Docs update 2021-03-31 22:36:56 +01:00
Mazo bd9af97bd7 Fix LLU becoming invisible to other players when dying as a vehicle passenger 2021-03-31 21:44:50 +01:00
Mazo a22f1118d1
Merge pull request #737 from Fate-JH/logging
Logging
2021-03-26 12:37:17 +00:00