Commit graph

1448 commits

Author SHA1 Message Date
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
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
Renovate Bot 9c9b92487f
Update dependency org.codehaus.janino:janino to v3 2021-03-26 18:27:04 +00:00
Mazo a0ed8ac9b6
Merge pull request #738 from psforever/renovate/org.codehaus.janino-janino-2.x
Update dependency org.codehaus.janino:janino to v2.7.8
2021-03-26 17:50:54 +00:00
Renovate Bot c0116e2fa6
Update dependency org.codehaus.janino:janino to v2.7.8 2021-03-26 14:45:48 +00:00
Mazo a22f1118d1
Merge pull request #737 from Fate-JH/logging
Logging
2021-03-26 12:37:17 +00:00
Jason_DiDonato@yahoo.com eea549707a added other logging filters, include a custom one for suppressing duplicate messages within a time period 2021-03-25 15:15:51 -04:00
Mazo 54688f7ee3
Merge pull request #736 from Fate-JH/reset-seq-2
ResetSequence 2
2021-03-24 19:18:29 +00:00
Jason_DiDonato@yahoo.com 7cd3f4d63f transforming payload of ResetSequence into flags, sequence, and remainder, along with a test decryption 2021-03-24 14:09:55 -04:00
Fate-JH 3d3b3eceae
Merge pull request #734 from Fate-JH/gen-boom
The Exploding Generator
2021-03-24 14:02:31 -04:00
Renovate Bot 148155e483 Update dependency org.flywaydb:flyway-core to v7.7.1 2021-03-24 17:10:24 +00:00
Jason_DiDonato@yahoo.com 2568b66a80 generator no longer exclusively cares about projectile-caused damage at the end of tis life, and will recognize boomer damage 2021-03-24 00:16:56 -04:00
Mazo bd01fd1695
Merge pull request #732 from Fate-JH/quick-fixes
Quick Fixes
2021-03-23 19:16:53 +00:00
Fate-JH aac2100f0d
Merge pull request #729 from Fate-JH/reset-seq
ResetSequence 1
2021-03-23 14:10:56 -04:00
Jason_DiDonato@yahoo.com 4d1fcfb0ff Cyssor sea is level again; fixing vehicle spawn pad auto-mount 2021-03-23 14:09:21 -04:00
Mazo bde51e9e44
Merge pull request #683 from Mazo/vehicle-contents-fix
Fix vehicle inventory unloading on mounting
2021-03-23 17:37:37 +00:00
Jason_DiDonato@yahoo.com 5c169e1ca7 catching reset sequence so that we can output details about how the packet looks; for live logging 2021-03-23 12:14:56 -04:00
Jason_DiDonato@yahoo.com 2fbe926725 tweaks for 'gender -> sex' change 2021-03-23 12:01:22 -04:00
Jason_DiDonato@yahoo.com 9798e27d29 gender was never the same thing as sex; for now, I just need easy pronouns for the log 2021-03-23 12:01:22 -04:00
Jason_DiDonato@yahoo.com 39d68b537d adjusted logback.xml to facilitate two populated logs for different purposes; brief pass over all instance of log calls 2021-03-23 11:45:28 -04:00
Fate-JH e9cf2e7aff
Merge pull request #728 from psforever/renovate/com.typesafe.scala-logging-scala-logging-3.x
Update dependency com.typesafe.scala-logging:scala-logging to v3.9.3
2021-03-23 11:18:44 -04:00
Fate-JH 873f19db5e
Dirty master (#727)
to resolve a dirty master
2021-03-23 11:08:25 -04:00
Renovate Bot b3faf72f5b
Update dependency com.typesafe.scala-logging:scala-logging to v3.9.3 2021-03-23 14:33:17 +00:00
Fate-JH 71ab35ecab
Hart (#723)
* initial OrbitalShuttleTimeMsg packet and tests; new objects to support HART shuttle transport system

* master was stale

* grouped scheduling for timing orbital shuttle activity

* door lock controls for HART shuttle lifecycle, and specifically for the doors that lead into the shuttle boarding hallway

* separation of the door from the door unlocking logic, which now has to be provided if performed by an outside source; a door that is locked either by bolt, HART routine, or other reason, can now be shut immediately; message when HART is not docked with a corresponding entry hallway door

* better degree of door logic control; all shuttle-related messages have been moved to LocalService; careful managing of 'original state' for the shuttle's cycle

* modification of seat mounting and cargo mounting support entities to expand functionality

* absolutely very little to do with the feature of this branch and a lot to do with yak-shaving; long story short, class inheritance is greatly modified and mountable seats can now accept multiple players if initialized properly

* a lot has changed: distribution of MountableBehavior, mount point information is more complex, vehicles convert differently, the routine of the shuttle timer is initialized differently; you can now successfully utilize the HART shuttle to drop into a zone

* swap of shutle from pad to pad control; tests and comments

* eject players from HART gantry hallway as if passengers dismounting from seat when not boarding through the use of environmental geometry; HART system uses duration from config settings to set scheduler

* rebase to curious master; repairs to vector rotation calculations; regression of mountable changes involving seats with occupancy greater than 1; orbital shuttle as a unique vehicle and amenity; corrected dismount offsets and offset calculations; weird angle of nc hart a building has been properly accommodated; hart events have prerequisite animation states

* rebase with master; looks like rebase with merged_master, which is also a commit

* lots of tests (though not nearly enough); checking the permission group of a shuttle seat no longer creates that seat

* fixing explosions

* fixed the persistence monitor service potentially using non-printable unicode in actor names

* can not use a droppod to gain access to one's own sanctuary

* removed hart facility update that causing open bay doors and beeping

* PR review changes

* fix for aggravation issues
2021-03-23 09:44:10 -04:00
Mazo e3de497be3
Merge pull request #726 from psforever/renovate-bundle-kamon
Bundle kamon packages in renovate.json
2021-03-22 23:53:06 +00:00
Renovate Bot 7327b74422 Update dependency org.fusesource.jansi:jansi to v2.3.2 2021-03-22 20:42:57 +00:00
Renovate Bot 99a1fe9ecf Update dependency io.kamon:kamon-bundle to v2.1.13 2021-03-22 19:04:25 +00:00
Renovate Bot 5e4a3fc52e Update dependency io.kamon:kamon-apm-reporter to v2.1.13 2021-03-22 16:22:46 +00:00
Mazo b43e21e528
Bundle kamon packages in renovate.json 2021-03-22 15:01:32 +00:00
Renovate Bot 1c16aa81bc Update dependency io.getquill:quill-jasync-postgres to v3.7.0 2021-03-17 19:02:16 +00:00
Renovate Bot e718ecc18c Update dependency org.flywaydb:flyway-core to v7.7.0 2021-03-15 20:36:34 +00:00
Mazo 159d9070af
Merge pull request #716 from psforever/renovate/org.scalatest-scalatest-3.x
Update dependency org.scalatest:scalatest to v3.2.6
2021-03-15 17:49:09 +00:00