Skip to content

3.9.0 unstable -> master #3604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
jaj22 merged 98 commits into from
May 18, 2025
Merged

3.9.0 unstable -> master #3604

jaj22 merged 98 commits into from
May 18, 2025

Conversation

@jaj22
Copy link
Collaborator

@jaj22 jaj22 commented May 18, 2025

What type of PR is this.

  1. Bug
  2. Change
  3. Enhancement

What have you changed and why?

Unstable -> master PR.

Please specify which Issue this PR Resolves.

closes #XXXX

Please verify the following and ensure all checks are completed.

  1. Have you loaded the mission in LAN host?
  2. Have you loaded the mission on a dedicated server?

Is further testing or are further changes required?

  1. No
  2. Yes (Please provide further detail below.)

jaj22 and others added 30 commits December 28, 2024 20:42
@jaj22
Fix up and re-enable UAV support for major attacks and HQ attacks
aa73bbb
@jaj22
Ensure return value of HandleDisconnect is correct
1102593
@SunStalker
Update fn_initVarServer.sqf
7e56818 
added ACRE_BF888S https://acre2.idi-systems.com/wiki/class-names
@jaj22
Improve paradrop placement:
6dc45fe 
- Move drop centre another 100m away (now 250-400m from target).
- Check 150m before and after for water, not just drop centre.
- Move leader to middle of group to reduce regroup time after drop.
@jaj22
Fix dead paratroops jumping from plane
67cf301
@jaj22
Improve dive bombing accuracy
dfd83aa
@Bob-Murphy
removes dublicate container entry
ec980e8
@Bob-Murphy
Merge pull request #3504 from official-antistasi-community/gui_xml_fix
f96079b 
removes dublicate container entry
@Bob-Murphy
Automated Tolgee Update
1cdf874
@Bob-Murphy
Merge pull request #3505 from official-antistasi-community/tolgee-upd…
eaf7b16 
…ate-1742045403

Updated Stringtable files
@Bob-Murphy
Automated Tolgee Update
a149288
@Bob-Murphy
Merge pull request #3506 from official-antistasi-community/tolgee-upd…
03fb52a 
…ate-1742046033

Updated Stringtable files
@jaj22
Add mapInfo params for land/air attack distances, and change banks to…
8e092e6 
… work with any buildings
@Luigi-chidlia
Fixed double Intel search Bug (#3481)
dfb2e77
@jaj22
Merge pull request #3482 from jaj22/fix-handleDisconnect-return
f407569 
Ensure return value of HandleDisconnect is correct
@jaj22
Merge pull request #3493 from SunStalker/acre
b2245fa 
Add ACRE_BF888S
@jaj22
Merge pull request #3496 from jaj22/improve-paradrop-placement
9d44bed 
Improve paradrop placement and fix corpse paradropping behaviour.
@initramfs
Implement loading of binocular magazine from arsenal (#3501)
991a7b6 
Loads the first unlocked/infinite binocular magazine from the arsenal
when loading from an inventory preset.
@jaj22
Merge pull request #3507 from jaj22/mapInfo-banks-and-attack-dist
acdc93f 
Add some mapInfo features (banks, distances)
@Play3rgg
Added appropriate names to SOG factions
7a1d118
@Tiny-DM
added plotting board
b78f748
@Tiny-DM
fakePrimaryWeapon lets you stay undercover
834efc8
@Tiny-DM
fixed wrong intel string
65d3268
@jaj22
Merge pull request #3502 from jaj22/improve-divebomb-accuracy
38b9085 
Improve dive bombing accuracy
@jaj22
Merge pull request #3472 from jaj22/reenable-UAV-support
1825107 
Fix up and re-enable UAV support for major attacks and HQ attacks
@jaj22
Merge pull request #3508 from official-antistasi-community/3465-bug-s…
8c01d01 
…ogpf-factions-names-arent-set

Added appropriate names to SOG factions
@Vlash271
Maps Napf and Napf Winter as playable (#3483)
b26a41d 
Adds both Napf and NapfWinter as playable maps.
@wersal454
Additional garage categories + dlc info (#3378)
6a27d12 
Add additional vehicle categories and DLC info to the garage.
@Tiny-DM
changed arrays to numbers
dfd33f4
@jaj22
Merge pull request #3522 from Tiny-DM/napf-hotfix
c67ee4e 
Napf Hotfix
jaj22 and others added 23 commits May 8, 2025 22:20
@jaj22
Fix towns on Napf and Napf Winter (#3554)
32acf3a
@jaj22
Fix controlsX remnant in HQ position setup dialog (#3573)
319c9ae
@jaj22
Worst hack ever written (#3580)
0c87ce4
@jaj22
Clean up orphaned towing helpers to prevent log spam (#3574)
8fe94ad
@jaj22
Reduce punishment chance when rebels have successfully defended punis…
e8ebf99 
…hments recently (#3579)
@jaj22
Update findBasesForConvoy to use new navgrid-based logic (#3571)
273a1b5
@jaj22
Fix one misplaced camp on Napf plus an incorrect log line (#3572)
f1a8e91
@Tiny-DM
Garage Category Culling 1 (#3575)
82b43ef 
* trimmed garage cats
* switched around vtols
* fix stringtable typo
@Tiny-DM
UI fixes 3 (#3581)
61dffef 
- Mortar routine now checks if the target pos is within range before allowing fire
- Marker and HC squad draw EHs now added to garrison and fast travel maps
- Clicking on the commander map no longer closes the UI in many cases
- Changed many stringtabled breaks to be \n instead
@Vlash271
Napf town edits, Seap_5_Mortar fix, capitalisation of Napf winter's c…
4a247f9 
…limate (#3582)

* Alpnach, Giswil and Hagacher blacklisted.
* Worb Horw, Brienz, Sissach, Mutternz, Hungerschwand and Liestal moved away from outposts.
* Seap_5_mortar marker, tower rotation change.
* Fixed Napf Winter climate capitalisation.
@jaj22
Reduce Osprey speed before combat landing (#3585)
19a76c0
@jaj22
Various gunshop/supply drop edge case fixes (#3584)
b140532 
- Make Solomon despawn as soon as players are 200m away.
- Run supply drop cleanup if items in the box are changed.
- Don't set crate maximum load below default.
@jaj22
Fix BIS_fnc_baseWeapon complaining about non-weapons on arsenal trans…
b251045 
…fers (#3586)
@jaj22
Fix bug with garage category defaulting to helicopter (#3587)
26824bb
@ante185
RHIB replacing assault boat, all templates (#3588)
72e73af
@jaj22
Remove invisible map icon usage with 360 angle trick (#3592)
7633dd6
@jaj22
Fix RHS M252 appearing in armour category in garage (#3595)
aa4b356
@jaj22
Preload map icons in attempt to workaround Arma crash bug (#3596)
a575e5b
@Tiny-DM
Rebalanced airbase heli spawns (#3589)
697adc3
@wersal454
Origins panel tweak to fit 3CBF (#3598)
d59e31e
@Tiny-DM
map fix + enemy garrison fix (#3599)
9851ca8
@jaj22
Change UI setting to a per-user toggle in game options (#3600)
493b081
@Tiny-DM
3.9.0 changelog and version (#3542)
6174914
jaj22
jaj22 commented May 18, 2025
View reviewed changes
Tiny-DM
Tiny-DM approved these changes May 18, 2025
View reviewed changes
Copy link

@Tiny-DM Tiny-DM left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What have we done

@jaj22 jaj22 merged commit 15e15bf into master May 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Tiny-DM Tiny-DM Tiny-DM approved these changes

Assignees

No one assigned

Labels

Ready for merge

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.