Skip to content
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

UPDATE: 1.24 to 1.25 #1672

Open
wants to merge 56 commits into
base: master
Choose a base branch
from
Open

UPDATE: 1.24 to 1.25 #1672

wants to merge 56 commits into from

Conversation

Vdauphin
Copy link
Owner

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.

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
Revert "test"
bbcb416 
This reverts commit b7dd219.
@Vdauphin
Reapply "test"
7085bbd 
This reverts commit bbcb416.
@Vdauphin
fix flower direction
50e3dbf
@Vdauphin
must have one flower
39d596c
@Vdauphin
fix dedicated
a0d88c9
@Vdauphin
fix position of grave
4dc3b2c
@Vdauphin
fix db
3ba089f
@Vdauphin
add _medic
1f0dc4c
@Vdauphin
Merge branch 'master' into master_daily
6c379f4
@Vdauphin
Merge branch 'master_daily' into Add-Grave
492aa4f
@Vdauphin
Merge pull request #1656 from Vdauphin/Add-Grave
4019a6b 
Add: Reputation bonus when player put civilian killed by player in grave near religious building
@Vdauphin
Merge branch 'master' into master_daily
404fff4
@Vdauphin
add massacre
f04da40
@Vdauphin
track place in body bag
da6dabf
@Vdauphin
fix fail when leave an other city
8aec964
@Vdauphin
add some item around
f0dc22a
@Vdauphin
add comment
3450b4f
@Vdauphin
add stringtable
97eb397
@Vdauphin
add deadbody processing
0388d1b
@Vdauphin
add massacre side to side mission list
c2d2d9a
@Vdauphin
update documentation
9ab36b2
@Vdauphin
Merge pull request #1668 from Vdauphin/Add-deadbody_processing
50dbe31 
Add: Deadbody direct processing, without bodybag
@Vdauphin
add new items
3757e1e
@Vdauphin
typo
2ae1eca
@Vdauphin
fix delay of _restingPlace
2db9e77
@Vdauphin
Merge pull request #1667 from Vdauphin/Add-massacre
b76d511 
Add: Massacre side mission
@Vdauphin Vdauphin added this to the 1.25 milestone Nov 23, 2024
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.
2 participants
@Vdauphin @mrschick