Skip to content

Commit

Permalink
Merge branch 'deploy/fafdevelop' into Fix/Chrono-targeting
Browse files Browse the repository at this point in the history
  • Loading branch information
lL1l1 committed May 1, 2024
2 parents d364d9f + f80b936 commit 869259d
Show file tree
Hide file tree
Showing 562 changed files with 7,403 additions and 3,815 deletions.
33 changes: 8 additions & 25 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,37 +1,20 @@

<!--
General useful tooling:
- [GifToScreen](https://www.screentogif.com/): Free, open source screen recorder that can export to MP4. If the changes are visual, these can help you tell us exactly what the changes imply!
-->
<!-- General useful tooling:
- [ScreenToGif](https://www.screentogif.com/): Free, open source screen recorder that can export to MP4. If the changes are visual, these can help you tell us exactly what the changes imply!
-->
<!-- Feel free to remove unused parts of this template. -->

## Description of the proposed changes
<!-- A clear and concise description (or visuals) of what the changes imply. -->
<!-- If it closes an issue, make sure to link the issue by using "(Closes/Fixes/Resolves) #(Issue Number)" in your pull request. -->

<!--
A clear and concise description (or visuals) of what the changes imply. If
it closes an issue, make sure to use closing keywords to automatically link
the issue.
-->

## Testing done on the proposed changes
<!-- List all relevant testing that you've done to confirm the changes work. -->

<!--
List all relevant testing that you've done to confirm the changes work.
-->

## Additional context
<!-- Add any other context about the pull request here. -->

<!--
Add any other context about the pull request here.
-->

## Checklist

Expand Down
49 changes: 49 additions & 0 deletions .github/workflows/changelog.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Create changelog

on:
workflow_dispatch:
pull_request:
paths:
- "changelog/snippets/*.md"
push:
branches:
- deploy/fafdevelop

jobs:
verify:
name: Verify
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
sparse-checkout: |
changelog/snippets
- name: Verify the changelog snippets
working-directory: changelog/snippets # script assumes it is in this directory
run: |
./verify.sh
bundle:
name: Bundle
runs-on: ubuntu-latest
needs: [verify]
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
sparse-checkout: |
changelog/snippets
- name: Create the changelog
working-directory: changelog/snippets # script assumes it is in this directory
run: |
./combine.sh
- name: Add the changelog as an artifact
uses: actions/upload-artifact@v4
with:
name: changelog
path: |
changelog/snippets/changelog.md
11 changes: 10 additions & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
name: Test

on: [push]
on:
workflow_dispatch:
pull_request:
push:
branches:
- deploy/fafdevelop
- deploy/faf
- deploy/fafbeta
- develop
- master

jobs:
syntax:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ textures/ui/common/BUTTON/BACKUP/
*/dds/*
.idea
*.DS_Store
act.exe
8 changes: 4 additions & 4 deletions changelog/3801.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ the game version is equal or more than 3800. As game version 3800 is already occ

Note that the projectile of the Uosioz splits upon impacting the water and therefore the actual projectile count is 6.

Additionally, the Solace's MaxRadius and MuzzleSalvoDelay are reduced to decrease the likelihood of it dropping its torpedoes over terrain. Its RateOfFire and BreakOffDistance stats are increased to prevent it from sometimes failing to drop its payload, or dropping it on top of or behind ships. Effective DPS stays roughly the same.
Additionally, the Solace's MaxRadius and MuzzleSalvoDelay are reduced to decrease the likelihood of it dropping its torpedoes over terrain. Its RateOfFire and BreakOffDistance stats are increased to prevent it from sometimes failing to drop its payload, or dropping it on top of or behind ships. Effective DPS stays roughly the same.

Solace (XAA0306): reduce its range from 32 to 26; reduce its MuzzleSalvoDelay from 0.4 to 0.2; increase it's BreakOffDistance from 42 to 44; decrease its reload time from 12.5 down to 10 seconds.
- Solace (XAA0306): reduce its range from 32 to 26; reduce its MuzzleSalvoDelay from 0.4 to 0.2; increase it's BreakOffDistance from 42 to 44; decrease its reload time from 12.5 down to 10 seconds.

- (#5910) Adjust the pathfinding behavior of the Blaze

Expand Down Expand Up @@ -108,7 +108,7 @@ Solace (XAA0306): reduce its range from 32 to 26; reduce its MuzzleSalvoDelay fr

The templates you are cycling through are now preserved until you exit command mode. That means once you enter command mode by cycling you keep on cycling through the same templates.

- (#5846, 5915) Further improvements to the behavior of tactical missiles.
- (#5846, #5915) Further improvements to the behavior of tactical missiles.

A single (non-aeon) tactical missile defense can now protect itself against a missile with 2 hit points again. In general Aeon, UEF and Cybran missiles have a reduced velocity. The Seraphim missiles still have the same velocity, but decrease in velocity as they get closer to the target.

Expand Down Expand Up @@ -154,7 +154,7 @@ Solace (XAA0306): reduce its range from 32 to 26; reduce its MuzzleSalvoDelay fr

- (#5870, #5858, #5881) Improve the descriptions of a wide range of units.

(#5939) Improve the naming scheme of all UEF drones and update their descriptions and Tech levels.
- (#5939) Improve the naming scheme of all UEF drones and update their descriptions and Tech levels.

- (#5873) Reduce the lifetime of scorchmarks created by forest fires.

Expand Down
86 changes: 86 additions & 0 deletions changelog/3804.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
# Game Version 3804

Fixes various issues that were introduced in the past game versions. The most notable issue is the bug where the fog of war is not removed when a game ends.

With gratitude to all those who took the time to report issues,

Jip

## Bug Fixes

- (#6002) Fix a bug where the map would not reveal at the end of the game

- (#6007) Fix Siren uselessly trying to repair units when assisting them

- (#6015) Fix a bug with capping extractors via the context-based templates feature

It was no longer possible to create the mass storage template for tech 2 or higher extractors with tech 1 engineers.

- (#6013) Fix an exploit with the copy/distribute orders feature

The exploit was that a player could assign attack orders to (mobile) units that you lack any form of intel of as long as you control one unit that has an attack order that you can distribute and/or copy.

## Features

- (#6009) Add separate hotkeys to select all normal bombers and all torpedo bombers

They can be found in the Selection category of the hotkeys as "Select all Bombers (Normal)" and "Select all Bombers (Torpedo)".
Selecting normal bombers excludes the Mercy, as it is a kamikaze missile.

- (#6015) Extend the context-based templates feature
-
- (#6010) Add a hotkey label for the Attack Move button

- (#6015, #6016) Extend the context-based templates feature

The context-based templates feature generates and adjusts templates based on the context of your mouse. Globally speaking, this is one of two categories:

- (1) Mouse is over a unit or a build order

In this case the first template will always be the first buildable version of the unit that you're hovering over. Then additional templates may be introduced for common tasks, such as capping an extractor with storages.

The first 'template' acts like a color picker - it enables you to copy the unit you're hovering over and build more of them.

- (2) Mouse is over a deposit, land or water

In this scenario you can easily create mass extractors, hydrocarbons and/or walled point defenses.

## Other Changes

- (#6002) Simplify the setup for moderator events

- (#6001) Add missing categories to units with Anti-Torpedo defenses

- (#6012) Add missing categories to the CZAR

- (#6005) Remove the `BUILTBYEXPERIMENTALSUB` category from all units that previously had it. As this category was unused, the Tempest still functions as you would expect.

- (#6006) Remove the `MASSFABRICATION` category from all ACUs, SACUs and the Paragon. Add the `ANTIMISSILE` category to the Seraphim Aircraft Carrier.

- (#6008) Remove the `ANTIMISSILE` category from the Brick as it does not have torpedo defenses

- (#6009) Add Mercy to the `BOMB` category alongside Fire Beetle. Remove Loyalist from the category as its Charge ability was removed.

This allows category filtering to filter for Mercies.

## Contributors

With thanks to the following people who contributed through coding:

- Jip
- lL1l1
- apollodeathstar
- Relent0r
- Hdt80bro
- Basilisk3

And, last but certainly not least - with thanks to those that took part in constructive discussions:

- Basilisk3
- Sladow
- Babel
- Albert C
- Archsimkat
- Aranei
- 4z0t
- Shen
17 changes: 17 additions & 0 deletions changelog/3805.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Game Version 3805

Fixes various issues that were introduced in the past game versions.

With gratitude to all those who took the time to report issues,

Jip

## Bug Fixes

- (#6017) Fix a bug that prevents you from upgrading tech 2 mass extractors to tech 3 mass extractors

## Contributors

With thanks to the following people who contributed through coding:

Jip
40 changes: 40 additions & 0 deletions changelog/3806.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Game Version 3806

Fixes various bugs and visual inconsistencies that were reported by players.

With gratitude to all those who took the time to report issues,

Jip

## Bug Fixes

- (#6021) Fix the teleport reticle crashing when using a modded scoreboard

- (#6021) Fix the teleport reticle not working on maps not aligned to the top left corner

- (#6022) Fix a bug where the Seraphim Air Factories are more sensitive to the terrain than the air factories of other factions.

- (#6026) Fix a bug where the build icons of the build queues of units would randomly pop up on screen when observing and/or watching a replay.

## Other Changes

- (#6027) Attempt to fix odd behavior with the ACU when it gains veterancy.

With thanks to the community and specifically to Deribus for investigating.

## Contributors

With thanks to the following people who contributed through coding:

- lL1l1
- Basilisk3
- Jip

With thanks to the following people who contributed through binary patches:

- 4z0t

And, last but certainly not least - with thanks to those that took part in constructive discussions:

- Derp
- Stormlantern
59 changes: 59 additions & 0 deletions changelog/3807.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# Game Version 3807

Fixes various reported issues and removes the 1st april pranks from the game again.

With gratitude to all those who took the time to report issues,

Jip

## Bug Fixes

- (#6044) Fix Seraphim experimentals not appearing in the Notify settings window in normal games after having played Nomads.

- ([#73](https://github.com/FAForever/FA-Binary-Patches/pull/73)) Fix a memory leak where weak tables are not deallocated by the garbage collector

## Balance

- (#6040) Make veterancy requirements equal for presets and normal SACUs

Previously, the cost of enhancements for an SACU preset was added to the veterancy requirement of the unit, making it much harder to gain veterancy with them than manually upgraded SACUs.

## Graphics

- (#6036) Add custom 'foot fall textures' for the Ythotha

Previously the Ythotha would use the same texture that the ACU does, but scaled up. It now uses a custom made texture that better fits the shape. It's not perfect, if you're interested in improving it then do get in touch with us!

## AI

- (6052) Remove rounding performed on AI unit threat level calculations to improve threat assignment and variation between units.

## Other Changes

- (#6037) Various smaller improvements to the additional unit details displayed when `Show Armament Detail in Build Menu` is enabled in the settings.

- (#6036) Reduce the lifetime of foot fall textures

They are now inline with tread marks, reduced from roughly 120 seconds to 4 - 8 seconds.

## Contributors

With thanks to the following people who contributed through coding:

- lL1l1
- Basilisk3
- Jip

With thanks to the following people who contributed through binary patches:

- 4z0t

With thanks to the following individuals who contributed through model, texture, and effect changes:

- Jip

And, last but certainly not least - with thanks to those that took part in constructive discussions:

- Deribus
- Aranei
- RarePleasure
25 changes: 25 additions & 0 deletions changelog/3808.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Game Version 3808

A small hotfix because we it appears we finally managed to get achievements working again.

With gratitude to all those who took the time to report issues,

Jip

## Bug Fixes

- (#6058, a132700) Fix another bug with achievements

Preliminary data in the server logs show that achievements are being processed and updated again for players on the FAF Develop gametype! With this release we make the current state of our hunt on bugs surrounding achievements available to the player base.

# AI

- (#6052) Remove rounding performed on AI unit threat level calculations to improve threat assignment and variation between units.

## Contributors

With thanks to the following people who contributed through coding:

- Relent0r
- lL1l1
- Jip
Loading

0 comments on commit 869259d

Please sign in to comment.