Commit graph

361 commits

Author SHA1 Message Date
SouNourS
61a51c1dd1 Map updates (#222)
map elements on Ishundar and home11 from Play-Live (51200)
2018-07-14 20:56:00 -04:00
FateJH
20a4fdfe45 documentation for projectiles; moved LocalProjectile construction intoMaps.scala; extensive test corrections 2018-06-16 17:31:49 -04:00
FateJH
000652c969 documentation and tests; added projectile names; changed logging level for ActorTests to OFF to remove the majority of log clutter; issue with number pool hub re-assignment and the existence of fixed objects (LocalProjectile) that requires unrelated tests be modified 2018-06-16 17:31:49 -04:00
FateJH
c57999d676 basic projectiles tracked in WSA - generated (WeaponFire), queued, and marked as resolved through any of four packets (RequestDestroy, Hit, Splash, and Lash) 2018-06-16 17:31:49 -04:00
Mazo
2ebebb416f Merge branch 'master' into feature/CargoPassengers
# Conflicts:
#	common/src/main/scala/net/psforever/packet/game/PlanetsideAttributeMessage.scala
#	common/src/main/scala/services/avatar/AvatarAction.scala
#	common/src/main/scala/services/avatar/AvatarResponse.scala
#	pslogin/src/main/scala/WorldSessionActor.scala
#	pslogin/src/main/scala/services/vehicle/support/DeconstructionActor.scala
2018-06-13 12:52:23 +01:00
Mazo
7746801371 Move new services from master merge to common 2018-06-12 17:49:37 +01:00
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
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
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
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
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
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
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
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
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
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
FateJH
36b9d81e6c moved current object dropping functionality over to AvatarService entirely; adjusting special support actor messaging for AvatarService; modified calls for DroppedItemRemover and CorpseRemoverActor; Player now has a more sensible check for its VisibleSlots 2018-05-25 21:11:25 -04:00
FateJH
d35536da06 created a generic base model for automated object deletion that isn't user driven; the first instance is the DroppedItemRemover for LocalService 2018-05-23 23:53:50 -04:00
FateJH
f6f7ad5617 unified code paths for dropping an item, and reinforced code path for picking an item back up; LocalService will handle some of the work now; ActionResultMessage embraces its simplistic nature (we don't have enough error messages) 2018-05-22 19:13:59 -04:00
FateJH
185da88db5 small change 2018-05-21 11:12:13 -04:00
FateJH
552206974e rebased to master/v-spawn-pad-redo; added ams spawn refresh when vehicle is deconstructed 2018-05-21 11:01:00 -04:00
FateJH
e00202e8fb Tuned positioning on player spawned at an AMS; fixed 'AMS' label draw and clear issue by expanding deployment options; modifications to BattlePlanMessage packet 2018-05-21 10:58:18 -04:00
FateJH
cd91080c9a Worked ams spawning rules into normal SpawnRequestMessage workflow using the (reliable) spawn group number of 2 2018-05-21 10:58:18 -04:00
FateJH
cc3e1dde86 packets RespawnAMSInfoMessage and SquadWaypointEvent, the latter with tests; system of keeping track of deployed AMS vehicles and displaying their data to interested users added through the VehicleService path 2018-05-21 10:54:32 -04:00
FateJH
48dde3a4b3 increased amount of time these tests are allowed to run to mitigate chance of incorrect failures 2018-05-21 10:16:20 -04:00