Commit graph

126 commits

Author SHA1 Message Date
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
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
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 873f19db5e
Dirty master (#727)
to resolve a dirty master
2021-03-23 11:08:25 -04: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
Fate-JH ab354e49df
Merge pull request #676 from Mazo/capture-terminal-refactor
Capture terminal logic refactor
2021-02-27 07:29:59 -05:00
Fate-JH fcf0240342
Merge pull request #689 from Fate-JH/ok-boomer
Ok Boomer
2021-02-27 07:29:13 -05:00
Mazo f949926bb2 Add newline to end of files 2021-02-10 17:54:02 +00:00
Mazo 49225271ba Amendment from PR review to unwrap optional boolean 2021-02-10 17:49:28 +00:00
Jason_DiDonato@yahoo.com f41de41d5a added a check called no double lash that should stop players from suffering double lash 2021-02-09 01:56:17 -05:00
Fate-JH e9a7eb3d78
Merge pull request #671 from Mazo/cmt-warp-list
Restore `/warp -list` functionality
2021-02-08 10:38:05 -05:00
Fate-JH b4d6e9172f
Merge pull request #685 from Mazo/bailable-seats
Allow vulture/liberator/ggs seats to be bailed from in motion
2021-02-08 10:36:46 -05:00
Jason_DiDonato@yahoo.com 6e81ee7e95 mechanism for server-driven emp caused by projectiles with emp properties; finalization of geometry elements and tests for geometric tests 2021-02-08 00:20:17 -05:00
Mazo 34444f5b66 Allow vulture/liberator/ggs seats to be bailed from in motion 2021-02-05 23:44:00 +00:00
Mazo b4fb0cf855 Amend mounting tests 2021-02-05 23:43:17 +00:00
Mazo 3f1003c51e Allow rexo to mount battlebusses as the driver (fixes #519) 2021-02-05 23:43:17 +00:00
Jason_DiDonato@yahoo.com e41e7e7cfa established geometry definitions for damageable object types; fixed rotations; removed unnecessary classes 2021-02-03 19:39:32 -05:00
Mazo 7ed2cc7af4 Dont unload vehicle inventory when closing trunk after rearming 2021-02-02 21:08:01 +00:00
Mazo 7cc1dbbc63 Don't unload vehicle inventory contents if the player is seated in it (fixes race condition with PSUM + vehicle mounting) 2021-02-02 20:56:47 +00:00
Mazo b730f4c974 Update missed param in CaptureFlagDataTest 2021-01-27 22:39:23 +00:00
Mazo c300bce0ff CaptureFlagManager + Supporting changes 2021-01-27 22:11:13 +00:00
Mazo f7caf2f880 Override LLU position to match player position if carried 2021-01-27 21:45:00 +00:00
Jason_DiDonato@yahoo.com fe386bd79b integrated geometric representation with object definition, explosion target detection, and explosion resolution 2021-01-27 14:33:43 -05:00
Mazo 70d47c7731 Add llm_socket to zone initialization 2021-01-26 23:04:16 +00:00
Mazo 5d8d4609a8 Revised decoding/encoding for CaptureFlagData 2021-01-26 23:03:42 +00:00
Mazo 805847793f Documentation update / enum additions 2021-01-26 23:02:43 +00:00
Mazo 0a342c3173 Allow Amenities to be removed from AmenityOwner, add IsCtfBase / GetFlagSocket / GetFlag to Building 2021-01-26 23:01:25 +00:00
Mazo 0534ec6f0c Fix CaptureFlagSocket object type 2021-01-26 23:00:09 +00:00
Mazo 2c07ef4a05 Add CaptureFlagUpdateMessage decoder to GamePacketOpcode 2021-01-26 22:59:56 +00:00
Mazo d0e6c44e58 CaptureFlag + CaptureFlagSocket objects/converters/definitions 2021-01-26 22:59:39 +00:00
Mazo 84a36dc9c8 CaptureFlagUpdateMessage encoder/decoder + tests 2021-01-26 22:56:23 +00:00
Jason_DiDonato@yahoo.com 9d86844396 modified shape structures and operations on said shapes 2021-01-24 23:11:02 -05:00
Mazo efe0c293a3 Allow "bo" and "neutral" as valid factions for /capturebase 2021-01-24 20:52:45 +00:00
Mazo 38a67d0388 Remove non-ctf facility LLU sockets from map json 2021-01-24 20:46:58 +00:00
Mazo 0ff24feffc Fix for map not updating with flag when cavern CC is hacked (resolves #448) 2021-01-23 20:48:17 +00:00