PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-01-20 02:24:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1896 commits 2 branches 0 tags 20 MiB
Commit graph

1896 commits

This branch
This branch
All branches
Author SHA1 Message Date
ScrawnyRonnie 962904b3d9 don't charge cargo 2023-11-14 11:05:58 -05:00
ScrawnyRonnie 9e76fcc42a
Update EffectTarget.scala 
Set back to findLast after review
 2023-11-07 21:38:28 -05:00
ScrawnyRonnie 537417f880
Merge branch 'psforever:master' into master 2023-11-07 18:59:06 -05:00
Fate-JH f883dd8ec1
Merge pull request #1136 from Resaec/hanhau_doors 
Hanhau Doors
 2023-11-07 16:25:13 -05:00
ScrawnyRonnie 5930e7fb76 Merge remote-tracking branch 'origin/master' 2023-11-04 07:56:33 -04:00
ScrawnyRonnie 78552f6691 Recharge only AT weapons 2023-11-04 07:56:09 -04:00
ScrawnyRonnie 12b90f0bc2
Merge pull request #5 from ScrawnyRonnie/Lodestar 
Lodestar, repair interrupt, and more crystal fixes
 2023-11-01 13:25:41 -04:00
ScrawnyRonnie fdccba40b5 Energy crystals weren't working. Seemed to be caused by GUIDs. 2023-11-01 13:21:14 -04:00
ScrawnyRonnie 8991a15470
Fix weapon recharge 
Had it working, broke it, and forgot to fix.
 2023-10-31 21:34:19 -04:00
ScrawnyRonnie 26824da624 Lodestar repairs vehicles now and damage interrupts repairing 2023-10-30 20:28:35 -04:00
ScrawnyRonnie 8637ca6c8d
Merge pull request #4 from ScrawnyRonnie/Random_Fixes 
Cavern crystals (except damage - that needs help)
 2023-10-29 22:01:07 -04:00
ScrawnyRonnie d228784e1c Cavern crystals (except damage - that needs help) 2023-10-29 21:55:19 -04:00
ScrawnyRonnie 2f6d8eee7a
Merge pull request #3 from ScrawnyRonnie/Random_Fixes 
Fix cave facility terms
 2023-10-27 21:16:11 -04:00
ScrawnyRonnie 5f3c9d4cc9 Fix cave facility terms 2023-10-27 21:07:30 -04:00
ScrawnyRonnie d1bd6fb055
Merge pull request #2 from ScrawnyRonnie/Misc_tweaks_and_fixes 
Fall damage reduced
 2023-10-27 12:25:49 -04:00
ScrawnyRonnie 326ae1e674 Fall damage reduced 2023-10-27 12:20:35 -04:00
ScrawnyRonnie e7850fb612
Supai Terms - Fall Damage - Cavern IA (#1) 
Tweaks
 2023-10-26 20:52:22 -04:00
Resaec a63aa95d24 Fixed 7 door GUIDs 2023-10-24 00:30:59 +02:00
Fate-JH 0485c759e7
Merge pull request #1132 from Fate-JH/db-patch 
Scoring Database Patch
 2023-10-11 23:13:21 -04:00
Fate-JH 90c507eaca before this, changed table on trigger without fixing function called by trigger 2023-10-11 17:50:08 -04:00
Fate-JH 2edb50eb03
Merge pull request #1130 from Fate-JH/pg10-4 
PostgreSql10 v4
 2023-10-08 13:48:18 -04:00
Fate-JH 5b806f8912 i am blind sometimes maybe 2023-10-08 13:34:31 -04:00
Fate-JH 113416554a
Merge pull request #1129 from Fate-JH/pg10-3 
Still Adjusting Triggers
 2023-10-08 13:11:56 -04:00
Fate-JH 6582e90499 no WHERE clause in trigger; moved that into called function body 2023-10-08 12:52:19 -04:00
Fate-JH 7a5319b062
Merge pull request #1128 from Fate-JH/pg10-2 
Adjusting triggers
 2023-10-08 12:34:27 -04:00
Fate-JH 8d0b8648a2 removing the OF statement in a trigger 2023-10-08 12:20:20 -04:00
Fate-JH 0b0b23d99c
PostgreSGL 10 Standards (#1127) 
* attempting to resolve pg14->pg10 issues

* unidon't

* rev 1

* rev 2

* rev 3

* rev 4
 2023-10-08 11:52:50 -04:00
Fate-JH c68d5e9864
Merge pull request #1125 from Fate-JH/fixed-relog 
Return Relog
 2023-08-15 15:06:38 -04:00
Fate-JH 2446a844e5 quit back to the server select screen and rejoin the server without having to close the client 2023-08-07 20:36:43 -04:00
Fate-JH c9a14527ea
Merge pull request #1123 from Resaec/add_launcher_and_token_functionality 
Add support for launcher login via tokens and file verification
 2023-08-01 01:37:13 -04:00
Fate-JH abd37c1726
Merge pull request #1122 from Fate-JH/kda-tables 
KDA Tables
 2023-07-31 23:58:03 -04:00
Resaec 7f792d63d4 Add support for launcher login via tokens and file verification 
Added code to LoginActor to handle client authentication via login token
Added code to LoginActor to generate the password used by the launcher to authenticate with the API
Changed code in LoginActor to replace deprecated bcrypt functions
Changed code in Account to add the field password, token and tokenCreated
Added database migration V009 containing table changes on account, new tables launcher and filehash and a trigger/function combo to update the tokenCreated column.
 2023-08-01 00:33:14 +02:00
Fate-JH dc89fa6b3f plsql tables for a future kda update 2023-07-31 16:21:15 -04:00
Fate-JH 663cfdc90a
moved polling of blockmap from psm callback to upstream handling (#1121) 2023-07-26 23:08:40 -04:00
Fate-JH 2b6edc25fb
No Work (#1116) 
* make the timer for outbound packet bundling a fallback option rather than a primary control for outbound timing

* better emergency timer determination

* eh

* master merge and light changes
 2023-07-26 23:07:24 -04:00
Jakob Gillich e391a0b3ef
Merge pull request #1120 from psforever/akka26 
revert to open-source akka
 2023-07-12 02:32:45 +02:00
Jakob Gillich 94486cc97d revert to open-source akka 2023-07-12 02:26:38 +02:00
Jakob Gillich 45609f62dc
Merge pull request #1119 from Resaec/dependency_updates_no_code_changes 
Updated dependencies
 2023-07-12 02:18:22 +02:00
Resaec 5c5712c24b Updated dependencies 
Updated to the newest minor/patch version. No code changes were necessary.
0-3 failing tests, changing each run :(
 2023-07-12 00:43:48 +02:00
Fate-JH d413516a11
Merge pull request #1118 from Fate-JH/old-mac 
Old Mac
 2023-07-10 21:15:39 -04:00
Fate-JH 735f5f95cd missing subslots is now a self message rather than an anonymous callback 2023-07-10 20:01:37 -04:00
Fate-JH 490b04380f reuse crypotgraphic informtion for the md5-mac algorithm in packet coding; deprecated toFoo calls 2023-07-10 14:29:16 -04:00
Jakob Gillich 947a931fd0
Merge pull request #1117 from Resaec/optimisations_MD5MAC 
Optimisations on MD5MAC and updated Scala version to 2.13.10
 2023-07-10 03:13:10 +02:00
Resaec c7a697213b Optimisations on MD5MAC and updated Scala version to 2.13.10 
Adopted ListBuffer to ArrayBuffer switch that also fixes the problem with the new Scala version
 2023-07-10 02:35:07 +02:00
Fate-JH b0d7ae12d1
Merge pull request #1115 from Resaec/fix_ams_ant_router_undeploy_on_owner_zone_change 
Fix AMS, ANT, Router and BFR siphon undeploying when owner leaves zone
 2023-07-07 10:02:17 -04:00
Fate-JH db020e0dfc
Merge pull request #1112 from Resaec/fix_some_doors_searhus 
Fixed doors in Searhus
 2023-07-07 10:02:00 -04:00
Fate-JH 0f36275653
Merge pull request #1113 from Resaec/fixed_doors_forseral 
Fixed doors on Forseral - Gwydion
 2023-07-07 10:01:44 -04:00
Resaec b67b71bd70 BFR siphon is not a deployment or a continuous action, but a fire action. Removed from check. 
AMS, ANT and Router will be placed under ConditionalDriverVehicleControl instead.
 2023-07-07 13:28:25 +02:00
Resaec 5d2c321efb Fix AMS, ANT, Router and BFR siphon undeploying when owner leaves zone 2023-07-07 03:26:05 +02:00
Resaec f5bb202802 Fixed doors on Forseral 2023-07-03 03:20:15 +02:00