Skip to content

UPDATE: 1.24 to 1.25 #1672

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
merged 78 commits into from
Feb 2, 2025
Merged

UPDATE: 1.24 to 1.25 #1672

merged 78 commits into from
Feb 2, 2025

Conversation

Vdauphin
Copy link
Owner

@Vdauphin Vdauphin commented Nov 23, 2024 •
edited
Loading

To-do list:

Release:

Before release:

  • update documentation lines with new code lines
  • update factions list in master before merge master_daily

During release:

  • merge fix from master_stable
  • add version 1.26
  • close milestone 1.25
  • Param.hpp changed.
  • Mission.sqm not changed.
  • Add: Compatibility with Restrict Markers (@mrschick).
  • Add: Side Mission Improvements (@mrschick).
  • Add: Reputation bonus when player put civilian killed by player in grave near religious building (@Vdauphin).
  • Add: Deadbody direct processing, without bodybag (@Vdauphin).
  • Add: Massacre side mission (@Vdauphin).
  • Add: Setting to toggle chemical side mission (@TomDraal).
  • Add: Setting to change chemical weapon cache probability (@TomDraal).
  • Add: ACE3 Flags support since 3.19 update (@Vdauphin).

Vdauphin and others added 30 commits May 18, 2024 18:53
@Vdauphin
Add btc_respawn_fnc_addInteraction
dbc5836
@Vdauphin
add stringtable
271fb0a
@Vdauphin
move param
b7c929c
@Vdauphin
change to btc_fob_fnc_addInteraction
82c2a4d
@Vdauphin
default setting
73794e9
@Vdauphin
readd "FOB"
2e4494e
@Vdauphin
tweak syntaxe
2f32dd7
@Vdauphin
use common _condition
21c5622
@Vdauphin
Add timeout
52f1b67
@Vdauphin
refine timeout
4ecf389
@mrschick
Append custom suffix to player markers loaded from DB
d35898a 
For compatibility with marker-manipulating mods like Restrict Markers
@Vdauphin
Merge pull request #1624 from bagigi-arma/feature/marker-loading-comp…
61dcf12 
…atibility

Add: Compatibility with Restrict Markers
@Vdauphin
Merge pull request #1622 from Vdauphin/Add-respawn-ace_int
e77a7f8 
Add: Respawn ACE interaction from outside base
@mrschick
Fix Heli Pilot being turned non-captive far from players
5ddf3ea
@mrschick
Fix Convoy Officer not disembarking when isolated
8d0a095
@mrschick
Assassination/Hostage Side Mission Improvements
dd4ea34
@mrschick
Delete Hostage Area on Success
24e31a5
@mrschick
No Task AOU for Hostage Rescue and Assassination
94b6a73
@mrschick
Revert "Fix Heli Pilot being turned non-captive far from players"
b9c413b 
This reverts commit 5ddf3ea.
@mrschick
Prevent KJW Imposters from resetting pilot captive state
83d1c90
@Vdauphin
Merge pull request #1633 from bagigi-arma/feature/side-mission-improv…
c97c69a 
…ements

Add: Side Mission Improvements
@Vdauphin
Merge branch 'master' into master_daily
01ba330
@Vdauphin
Add grave
af2f58b
@Vdauphin
rename btc_rep_graveS
7f44faa
@Vdauphin
add btc_type_flowersBig
158b439
@Vdauphin
add fnc to compile
9177989
@Vdauphin
update documentation
97bcf7d
@Vdauphin
fix position
2e498aa
@Vdauphin
multiole flower
2739f88
@Vdauphin
test
b7dd219
@Vdauphin Vdauphin added this to the 1.25 milestone Nov 23, 2024
TomDraal and others added 22 commits December 1, 2024 18:56
@TomDraal
Advanced Chemical Warfare Settings
ef247a3
@TomDraal
Update param.hpp to allow 0% Chemical Cache Proba
ade1d28
@TomDraal
Remove btc_p_chem for consistency
4b648da 
btc_p_chem becomes useless with the introduction of btc_p_sides and btc_p_chem_cache_probability.
@TomDraal @Vdauphin
Update =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/cache/create.sqf
6eb1adc 
Co-authored-by: Vdauphin <[email protected]>
@TomDraal @Vdauphin
Update =BTC=co@30_Hearts_and_Minds.Altis/core/def/param.hpp
a8c9a60 
Co-authored-by: Vdauphin <[email protected]>
@TomDraal @Vdauphin
Update =BTC=co@30_Hearts_and_Minds.Altis/core/def/param.hpp
2bd691e 
Co-authored-by: Vdauphin <[email protected]>
@TomDraal @Vdauphin
Update =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/db/load.sqf
a91cd38 
Co-authored-by: Vdauphin <[email protected]>
@TomDraal @Vdauphin
Update =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/db/load_old.sqf
944a756 
Co-authored-by: Vdauphin <[email protected]>
@TomDraal
VDauphin's suggestions
373ba99
@TomDraal @Vdauphin
Update =BTC=co@30_Hearts_and_Minds.Altis/stringtable.xml
76406a8 
Co-authored-by: Vdauphin <[email protected]>
@TomDraal @Vdauphin
Update =BTC=co@30_Hearts_and_Minds.Altis/stringtable.xml
4341a99 
Co-authored-by: Vdauphin <[email protected]>
@Vdauphin
Merge pull request #1674 from TomDraal/TomDraal-AdvChem
a8b975e 
Add: Setting to toggle chemical side mission and chemical weapon cache probability
@Vdauphin
Save ACE3 flag
7f89470
@Vdauphin
Save flags placed on ground
bd09359
@Vdauphin
disable H&M flag by default
5d5cd7a
@Vdauphin
Merge pull request #1683 from Vdauphin/Add-ACE_flag
0f8356b 
Add: ACE3 Flags support since 3.19 update
@Vdauphin
update doc line
c3c80f2
@Vdauphin
Merge branch 'master' into update_doc
eba9c14
@Vdauphin
Merge pull request #1684 from Vdauphin/update_doc
4420966 
Update doc lines
@Vdauphin
Add version 1.25
d33ec11
@Vdauphin
Update faction list
02cd9e0
@Vdauphin
Merge pull request #1686 from Vdauphin/Update-faction-list_2
86941b3 
Update faction list
@Vdauphin Vdauphin merged commit 9ef01f9 into master Feb 2, 2025
3 checks passed
TomDraal added a commit to TomDraal/HeartsAndMinds that referenced this pull request Feb 8, 2025
@TomDraal
Squashed commit of the following:
ae975db 
commit df02a9b
Author: TomDraal <[email protected]>
Date:   Sat Feb 8 15:39:15 2025 +0100

    Custom Cache Location Fix

    Fix to make sure to match all the criterias to spawn the cache and to deal with the case where the selected city is not occupied anymore, in that case the cache is spawned randomly.

commit de318f9
Merge: 30d0f67 9ef01f9
Author: TomDraal <[email protected]>
Date:   Tue Feb 4 00:36:49 2025 +0100

    Merge branch 'Vdauphin:master' into h&m_tom_contribs

commit 9ef01f9
Merge: fb26d56 86941b3
Author: Vdauphin <[email protected]>
Date:   Sun Feb 2 19:37:32 2025 +0100

    Merge pull request Vdauphin#1672 from Vdauphin/master_daily

    UPDATE: 1.24 to 1.25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
enhancement
Projects
None yet
Milestone
1.25
Development

Successfully merging this pull request may close these issues.
3 participants
@Vdauphin @mrschick @TomDraal