Commit graph

1478 commits

Author SHA1 Message Date
Jason_DiDonato@yahoo.com
0b7930eeff more concise management of purchase timers 2021-04-18 09:07:03 -04: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
Jason_DiDonato@yahoo.com
dfd8201683 fixed message duplicate cooldown filter 2021-04-17 07:43:41 -04: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
Fate-JH
7c1d603dcf
Merge pull request #754 from psforever/renovate/org.flywaydb-flyway-core-7.x
Update dependency org.flywaydb:flyway-core to v7.7.3
2021-04-15 08:59:41 -04:00
Renovate Bot
931c589492
Update dependency org.flywaydb:flyway-core to v7.7.3 2021-04-15 12:41:16 +00: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
Mazo
d51eba7a63
Merge pull request #755 from NickPSF/Battle-Island-Override-Update
Battle Island "Certification Grant" Overrides Fixed
2021-04-12 22:57:51 +01:00
NickPSF
ba1c4ce957
Update game_objects32.adb.lst 2021-04-12 01:54:07 -05:00
NickPSF
edfdf0f7e6
Update game_objects32.adb.lst 2021-04-12 01:49:56 -05:00
NickPSF
546f6b75a0
Update game_objects31.adb.lst 2021-04-12 01:34:35 -05:00
NickPSF
1245e6ffc4
Update game_objects31.adb.lst 2021-04-12 01:19:23 -05:00
NickPSF
3321d630b7
Update game_objects30.adb.lst 2021-04-12 01:12:09 -05:00
NickPSF
b05f9ae3f2
Update game_objects32.adb.lst 2021-04-12 00:20:25 -05:00
NickPSF
08d0d29886
Update game_objects31.adb.lst 2021-04-12 00:14:28 -05:00
NickPSF
e7b1b17279
Update game_objects30.adb.lst 2021-04-12 00:00:38 -05:00
NickPSF
bb6bc4b2a5
Update game_objects29.adb.lst 2021-04-11 23:51:41 -05: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
Fate-JH
0124167b7a
Merge pull request #750 from psforever/renovate/docker-build-push-action-2.x
Update docker/build-push-action action to v2.4.0
2021-04-07 09:38:31 -04:00
Fate-JH
a3b540272d
Merge pull request #747 from Mazo/llu-2021
Fix capturing neutral LLU bases with no friendly neighbours as a timed hack
2021-04-07 09:38:17 -04:00
Renovate Bot
67375c3d44
Update docker/build-push-action action to v2.4.0 2021-04-07 00:35:42 +00:00
Fate-JH
f7b640d29d
Merge pull request #745 from psforever/renovate/org.scalatest-scalatest-3.x
Update dependency org.scalatest:scalatest to v3.2.7
2021-04-06 17:12:05 -04:00
Renovate Bot
068a561c94
Update dependency org.scalatest:scalatest to v3.2.7 2021-04-06 21:02:00 +00:00
Fate-JH
a5d5ff843c
Merge pull request #748 from psforever/renovate/jamesives-github-pages-deploy-action-4.x
Update JamesIves/github-pages-deploy-action action to v4.1.1
2021-04-06 17:01:25 -04:00
Renovate Bot
8981f49e0d
Update JamesIves/github-pages-deploy-action action to v4.1.1 2021-04-06 21:01:16 +00:00
Fate-JH
13f6866c6d
Merge pull request #746 from psforever/renovate/org.flywaydb-flyway-core-7.x
Update dependency org.flywaydb:flyway-core to v7.7.2
2021-04-06 17:01:04 -04:00
Fate-JH
a2cf7cef67
Merge pull request #744 from psforever/renovate/kamon
Update kamon to v2.1.15
2021-04-06 17:00:31 -04:00
Renovate Bot
f015de918d
Update dependency org.flywaydb:flyway-core to v7.7.2 2021-04-06 21:00:00 +00:00
Fate-JH
341d643230
Merge pull request #743 from psforever/renovate/org.scala-lang.modules-scala-parallel-collections-1.x
Update dependency org.scala-lang.modules:scala-parallel-collections to v1.0.2
2021-04-06 16:59:53 -04:00
Fate-JH
64ed293f81
Merge pull request #742 from psforever/renovate/ch.epfl.scala-sbt-scalafix-0.x
Update dependency ch.epfl.scala:sbt-scalafix to v0.9.27
2021-04-06 16:59:25 -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
Renovate Bot
8e713dc199
Update kamon to v2.1.15 2021-04-02 16:21:13 +00:00
Renovate Bot
8eed4a8b99
Update dependency org.scala-lang.modules:scala-parallel-collections to v1.0.2 2021-04-02 16:21:04 +00:00
Renovate Bot
6705431c83
Update dependency ch.epfl.scala:sbt-scalafix to v0.9.27 2021-04-02 16:20:54 +00:00
Mazo
9ce60e7eff
Merge pull request #678 from Mazo/llu-2021
LLUs. 🤯
2021-04-02 17:20:20 +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
6c6236844d
Merge pull request #739 from psforever/renovate/org.codehaus.janino-janino-3.x
Update dependency org.codehaus.janino:janino to v3
2021-03-26 18:35:32 +00:00