Commit graph

1531 commits

Author SHA1 Message Date
NickPSF 8af1bbabe3
Merge pull request #794 from psforever/NickPSF-patch-1
Update game_objects0.adb.lst
2021-04-25 18:58:06 -05:00
NickPSF 80b4786de7
Merge pull request #795 from psforever/NickPSF-patch-2
Update GlobalDefinitions.scala
2021-04-25 18:57:53 -05:00
NickPSF b4cfeb3322
Update GlobalDefinitions.scala 2021-04-25 18:57:04 -05:00
NickPSF 6e23f560bc
Update game_objects0.adb.lst 2021-04-25 18:54:20 -05:00
NickPSF 478465e361
Merge pull request #793 from psforever/Corrected/Removed-some-temporary-values
Corrected/Removed some temporary values
2021-04-25 16:36:51 -05:00
NickPSF d1e9361687
Corrected/Removed some temporary values 2021-04-25 16:02:47 -05:00
NickPSF 4832bee71f
Merge pull request #792 from psforever/Override-Update
Override Update
2021-04-25 15:46:02 -05:00
NickPSF 2c54e8013e
Update game_objects0.adb.lst 2021-04-25 15:41:33 -05:00
Fate-JH 564f7a188b
Merge pull request #790 from psforever/renovate/org.specs2-specs2-core-4.x
Update dependency org.specs2:specs2-core to v4.11.0
2021-04-24 00:54:11 -04:00
Fate-JH 7222a37e50
Merge pull request #786 from Fate-JH/missing-ammo
Missing Ammunition Types
2021-04-24 00:53:31 -04:00
Renovate Bot 42355ad1d8
Update dependency org.specs2:specs2-core to v4.11.0 2021-04-23 18:30:28 +00:00
Renovate Bot 9c2d141b59 Update kamon to v2.1.17 2021-04-23 12:01:37 +00:00
NickPSF fc4ae0887d
Merge pull request #788 from NickPSF/Disable-the-Router
Disable the Router
2021-04-22 21:32:35 -05:00
NickPSF 12c988912e
Update game_objects0.adb.lst 2021-04-22 21:17:19 -05:00
Renovate Bot 1465654c8f Update dependency org.postgresql:postgresql to v42.2.20 2021-04-22 16:30:16 +00:00
Jason_DiDonato@yahoo.com f0726f88d1 firebird_missile ammo 2021-04-21 20:58:32 -04:00
NickPSF 5361005a08
Merge pull request #785 from NickPSF/Nick-Changes/Overrides
Nick Changes/Overrides
2021-04-21 18:33:58 -05:00
NickPSF 5d84c85687
Update Avatar.scala 2021-04-21 18:07:19 -05:00
NickPSF a2231d70d3
Update game_objects0.adb.lst 2021-04-21 17:35:52 -05:00
NickPSF 1f711feda4
Update GlobalDefinitions.scala 2021-04-21 17:30:34 -05:00
Fate-JH c515c727ff
Merge pull request #782 from Fate-JH/locker-swap
Right Click Locker Swap
2021-04-21 17:32:13 -04:00
Fate-JH 00c8b92b44
Fixes From 20210421 Logs (#784)
* test before casting to int; unsupported equipment in loadouts

* replacing null with Default.Actor

* in/out times but no actor

* empty password; squad ui elements out of order
2021-04-21 17:31:02 -04:00
NickPSF 499bd0392d
Update GlobalDefinitions.scala 2021-04-21 15:22:59 -05:00
NickPSF c27cace813
Update GlobalDefinitions.scala 2021-04-21 15:21:44 -05:00
NickPSF 0a3cf2c6d7
Update GlobalDefinitions.scala 2021-04-21 15:08:31 -05:00
NickPSF f66ed5015d
Update game_objects0.adb.lst 2021-04-21 14:46:41 -05:00
Fate-JH ffa8e16c07
Merge pull request #781 from psforever/renovate/org.scalatest-scalatest-3.x
Update dependency org.scalatest:scalatest to v3.2.8
2021-04-21 09:47:11 -04:00
Renovate Bot cd0f3321e6
Update dependency org.scalatest:scalatest to v3.2.8 2021-04-21 13:44:50 +00:00
Fate-JH 20e7882307
Merge pull request #783 from Fate-JH/implant-exo
Infiltration Suit Stamina Drain
2021-04-21 09:43:18 -04:00
Jason_DiDonato@yahoo.com b78e068c88 changing agile -> infiltration 2021-04-20 20:41:49 -04:00
Jason_DiDonato@yahoo.com 571562b929 right-click swap should work when the locker interface is open 2021-04-20 20:38:15 -04:00
Renovate Bot 416bfb9bae Update kamon to v2.1.16 2021-04-19 17:54:28 +00:00
Fate-JH e94744a0be
Merge pull request #771 from Fate-JH/cooldown-reset
Vehicle Cooldown
2021-04-19 07:39:14 -04:00
Fate-JH 20c37ba7fb
Merge pull request #779 from Fate-JH/sunburst
Dragon Sunburst
2021-04-19 00:21:00 -04:00
Jason_DiDonato@yahoo.com 69b8237d42 location of resolution is different 2021-04-18 23:06:29 -04:00
Jason_DiDonato@yahoo.com e41c76ebbc avatar = ... 2021-04-18 23:04:09 -04:00
Jason_DiDonato@yahoo.com 7e2d7a2089 even more concise 2021-04-18 10:17:08 -04:00
Fate-JH f11bf70af7
Merge branch 'master' into cooldown-reset 2021-04-18 09:14:58 -04:00
Jason_DiDonato@yahoo.com 0b7930eeff more concise management of purchase timers 2021-04-18 09:07:03 -04:00
Jakob Gillich 2dc1b5736a Fix implant auto activation not always working 2021-04-18 08:29:56 +02:00
Jakob Gillich 490e6244e7 Correctly set active=false when deinitializing implants
Plus a minor logging improvement in MA
2021-04-18 08:29:56 +02:00
Renovate Bot 25bb2cc5ac Update dependency com.github.pureconfig:pureconfig to v0.15.0 2021-04-18 02:31:52 +00:00
Jakob Gillich ce32a1a1ff Fix terminal hack clearing
Fixes #759
2021-04-18 02:12:27 +02:00
Jakob Gillich 765262f51a Send tactical squad chat only to squad members 2021-04-18 01:38:32 +02:00
Jakob Gillich 22de086bb8 Middleware: Add MTU rather than setting length to max
Don't want overflow errors here since the next iteration will still
add their packet length.
2021-04-17 22:47:01 +02:00
Jakob Gillich 9d3e468693 Fix CharacterInfoMessage being bundled with OCDMs 2021-04-17 22:42:14 +02:00
Mazo 6fbe35b15f
Merge pull request #770 from jgillich/unknown30
add Unknown30 decoder, allow non-advanced packets
2021-04-17 19:50:47 +01:00
Mazo e42a95a675
Merge pull request #768 from Fate-JH/leave-squad-by-id
Leave Squad Service by Character Id
2021-04-17 19:48:21 +01:00
Jason_DiDonato@yahoo.com a2bd6999ab moved the point where the cooldown timer for the vehicle order would apply to the avatar to later, when the player is first seated, rather than earlier, when then order is first returned 2021-04-17 08:35:13 -04:00
Jason_DiDonato@yahoo.com dfd8201683 fixed message duplicate cooldown filter 2021-04-17 07:43:41 -04:00