Mazo
5e1a244123
Merge branch 'master' into feature/Nanites
...
# Conflicts:
# common/src/main/scala/net/psforever/objects/definition/VehicleDefinition.scala
# common/src/main/scala/net/psforever/packet/game/objectcreate/VehicleData.scala
# common/src/main/scala/services/avatar/AvatarService.scala
# common/src/main/scala/services/vehicle/VehicleService.scala
# common/src/main/scala/services/vehicle/support/DeconstructionActor.scala
# common/src/main/scala/services/vehicle/support/DelayedDeconstructionActor.scala
# pslogin/src/main/scala/WorldSessionActor.scala
2018-06-12 17:30:38 +01:00
Fate-JH
3717d84750
Merge pull request #218 from Mazo/feature/TerminalHacking
...
Terminal hacking
2018-06-11 19:59:30 -04:00
Fate-JH
3eb49e6b55
Merge pull request #220 from Fate-JH/inventory-items
...
Minor Inventory Modifications
2018-06-11 19:28:09 -04:00
Fate-JH
117ca9e478
Merge pull request #219 from Fate-JH/char-data
...
Characters, and Vehicles, and Characters in Vehicles.
2018-06-11 19:21:30 -04:00
Mazo
ca8d72cc4c
Added correct sounds for hacking terminals/lockers & consolidated FinishHacking function
...
Wait for target actor to set HackedBy property before sending LocalAction.HackTemporarily to fix crash when run in the wrong order
2018-06-11 18:29:33 +01:00
FateJH
a29090890b
changing InventoryEquipmentSlot such that it does not perform the same insertion collision check twice anymore; commenting out entirety of RemoverActorTest to align with the other PR
2018-06-10 01:37:37 -04:00
FateJH
58d2a35f9f
SetCellsOffset -> SetCells
2018-06-10 01:11:35 -04:00
FateJH
44741b2898
modification to GridInventory to avoid unnecessary leaking of internal support value and unnecessary complication of item access
2018-06-10 00:23:59 -04:00
FateJH
8166a43bdc
named parameters for certain longer packets
2018-06-09 20:51:54 -04:00
FateJH
ffd8c02de9
some code clean-up; tests for VehicleControl mount behavior override
2018-06-09 01:09:34 -04:00
FateJH
a20e75d07c
added an enumeration for character voices, which prompoted a massive file update; separated BasicCharacterData from CharacterAppearanceData; added some yet unimplemented support to WSA and VehicleData; completely commented out RemoveActorTests for later repairs so they do not break in Travis CI
2018-06-08 21:07:47 -04:00
FateJH
c664f96bd4
a little bit of vehicles everything; work on the endocder/decoder for vehicles and seated players and bitstream size; vehicle ownership is extremely passable right now; seat restrictionsfor getting into vehicles is now in place; tests repaired; adjustment to vehicle spawn pad (again) to hopefully increase tolerance and recovery
2018-06-06 19:13:39 -04:00
Mazo
9707e88924
Merge psforever/master
2018-06-05 20:13:25 +01:00
Mazo
0c964ddfca
Locker hacking
...
Terminal hacking (cert / equipment / medical)
Hacking speed based on certification level
REK beam colour based on hacking level
QoL change - show hacked object as belonging to faction that hacked it for the duration of the hack (only for that faction's players)
2018-06-05 20:01:30 +01:00
Mazo
21b0f07fb7
Documentation update
2018-06-05 20:01:30 +01:00
Mazo
c6eff22df7
Add Hackable trait to all terminals / IFF locks / lockers
2018-06-05 19:43:44 +01:00
FateJH
b2e0fd1276
resolved issue with failing tests; padding value of outfit name must always be observed
2018-06-04 08:03:03 -04:00
FateJH
f730be261a
in the middle of testing
2018-06-04 08:03:03 -04:00
FateJH
292a9bad23
attached version of the OCM for avatars works; known encoding issues with OCDM encoding for avatars, specifically the calculated bit length
2018-06-04 08:03:03 -04:00
FateJH
caf56c4e72
added a door in home3 HART C that I missed; modified AvatarConverter and VehicleConverter to correctly handle multiple players in vehicles at world join time; began implementation of this procedure in WSA, but independent creation of players in implant terminals is giving trouble; fixed a ludicrous oversight with the bitsize of players without outfits
2018-06-04 08:03:03 -04:00
FateJH
389d0b4d82
added documentation and refined comments; corrected stream length calculation issues where padding lengths were not being properly retained or updated; working tests
2018-06-04 08:03:03 -04:00
FateJH
4e41468cd0
meta-stability in terms of the underlying structure that will eventually read off seated passengers in vehicles; the padding offsets just need tuning
2018-06-04 08:03:03 -04:00
FateJH
052a318285
Refactored CharacterData and DetailedCharacterData to be a component of PlayerData and DetailedPlayerData, respectively. Position information is now optional; inventory data and exposed hand data are also removed into PlayerData and DetailedPlayerData. String padding management has been preserved. Tests and packet converters have been repaired.
2018-06-04 08:03:03 -04:00
Fate-JH
a9db4b5820
Merge pull request #216 from Fate-JH/drop-item
...
Dropping Items, Picking up Items, Cleaning up Items
2018-06-04 08:00:16 -04:00
FateJH
a96d76a3d6
two clarifying comments requested
2018-06-04 07:35:44 -04:00
Mazo
8dc4a20332
Initial functionality for vehicle cargo holds & cargo passengers
2018-06-02 14:17:22 +01:00
Mazo
447f6de2d6
Add definitions/objects for cargo holds and cargo
2018-06-02 14:11:19 +01:00
Mazo
27d8f91cec
Update documentation
2018-06-02 14:09:42 +01:00
Mazo
5347b78e7c
Add CargoMountPointStatusMessage / DismountVehicleCargoMsg / MountVehicleCargomsg packets
2018-06-02 14:08:13 +01:00
FateJH
9e75fd1191
even more generosity with the tests
2018-05-28 09:04:09 -04:00
FateJH
d26e8834c6
hopefully more generous timing for the tests
2018-05-28 08:24:57 -04:00
FateJH
8c7417aabf
added timing so that thr advanced mobile spawn and the router waste away for 20 minutes, while all other vehicles die early at 5 minutes
2018-05-27 20:59:44 -04:00
FateJH
c7641fc117
modified zone ground actor operation to include no-callback item removal message; adjusted tests for Zone and wrote tests for RemoverActor
2018-05-27 02:24:20 -04:00
Mazo
52357415c6
Temporarily disable base offlining when NTU hits zero, otherwise there's no way to get an ANT onto the continent to refill it until warp gates are functional
2018-05-26 19:37:34 +01:00
Mazo
fc71bbfd2a
Shut down base power if NTU runs out, and restore it once refilled.
2018-05-26 17:13:24 +01:00
Mazo
0ecceebf34
Change/remove debug logging
2018-05-26 16:41:53 +01:00
Mazo
a4c2085fb7
Sync silo NTU level on map with all clients when it changes
2018-05-26 16:39:12 +01:00
Mazo
b326cdf530
Add functionality for BuildingControl to send map updates to all clients via GalaxyService
2018-05-26 16:38:49 +01:00
Mazo
d72e1adf04
Sync resource silo display & warning light with newly connected clients
2018-05-26 16:38:02 +01:00
Mazo
86bb83dc09
Rename existing galaxy service to cluster and add GalaxyService to send map updates to all connected clients
2018-05-26 16:37:42 +01:00
Mazo
aa81116260
Sync resource silo charge level on continent map with clients on zone entry
2018-05-26 12:55:57 +01:00
Mazo
d55cd6ef9f
Functionality for discharging ANT into resource silo
2018-05-26 12:54:47 +01:00
Mazo
519e56e27c
Add basic functionality to deploy ANT & charge at warpgate
2018-05-26 12:54:02 +01:00
Mazo
bd7647177b
Add resource silo to Anguta
2018-05-26 12:52:17 +01:00
Mazo
2933811ac6
Add ResourceSilo definition with basic functionality for charging/discharging
2018-05-26 12:52:03 +01:00
Mazo
2d2788383c
Add capacitor / max capacitor values to vehicles
2018-05-26 12:49:50 +01:00
Mazo
8a2896f434
Move services to common to allow server objects to send messages
2018-05-26 09:17:35 +01:00
Mazo
1b0b84e53e
Improvements/fixes to some javadoc / comments
2018-05-26 07:57:51 +01:00
Mazo
cd3e6d2f63
Add missing deployment time to ANT definition
2018-05-26 07:51:18 +01:00
FateJH
ee5d0c666c
replaced DelayedDeconstructionActor and DeconstructionActor with VehicleRemover, a class that does performs both tasks; all messages to, from, and used by the previous two actors have been removed and replaced with the new messages
2018-05-26 01:04:38 -04:00
