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.

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

UPDATE: 1.24 to 1.25 #1672

Open
wants to merge 68 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
dbc5836
Add btc_respawn_fnc_addInteraction
Vdauphin May 18, 2024
271fb0a
add stringtable
Vdauphin May 18, 2024
b7c929c
move param
Vdauphin May 18, 2024
82c2a4d
change to btc_fob_fnc_addInteraction
Vdauphin May 18, 2024
73794e9
default setting
Vdauphin May 18, 2024
2e4494e
readd "FOB"
Vdauphin Jun 8, 2024
2f32dd7
tweak syntaxe
Vdauphin Jun 15, 2024
21c5622
use common _condition
Vdauphin Jun 15, 2024
52f1b67
Add timeout
Vdauphin Jun 15, 2024
4ecf389
refine timeout
Vdauphin Jun 16, 2024
d35898a
Append custom suffix to player markers loaded from DB
mrschick Jun 28, 2024
61dcf12
Merge pull request #1624 from bagigi-arma/feature/marker-loading-comp…
Vdauphin Jun 30, 2024
e77a7f8
Merge pull request #1622 from Vdauphin/Add-respawn-ace_int
Vdauphin Jul 20, 2024
5ddf3ea
Fix Heli Pilot being turned non-captive far from players
mrschick Jul 29, 2024
8d0a095
Fix Convoy Officer not disembarking when isolated
mrschick Jul 29, 2024
dd4ea34
Assassination/Hostage Side Mission Improvements
mrschick Jul 29, 2024
24e31a5
Delete Hostage Area on Success
mrschick Jul 29, 2024
94b6a73
No Task AOU for Hostage Rescue and Assassination
mrschick Aug 3, 2024
b9c413b
Revert "Fix Heli Pilot being turned non-captive far from players"
mrschick Aug 6, 2024
83d1c90
Prevent KJW Imposters from resetting pilot captive state
mrschick Aug 6, 2024
c97c69a
Merge pull request #1633 from bagigi-arma/feature/side-mission-improv…
Vdauphin Aug 11, 2024
01ba330
Merge branch 'master' into master_daily
Vdauphin Aug 17, 2024
af2f58b
Add grave
Vdauphin Sep 5, 2024
7f44faa
rename btc_rep_graveS
Vdauphin Sep 5, 2024
158b439
add btc_type_flowersBig
Vdauphin Sep 5, 2024
9177989
add fnc to compile
Vdauphin Sep 5, 2024
97bcf7d
update documentation
Vdauphin Sep 5, 2024
2e498aa
fix position
Vdauphin Sep 8, 2024
2739f88
multiole flower
Vdauphin Sep 8, 2024
b7dd219
test
Vdauphin Sep 10, 2024
bbcb416
Revert "test"
Vdauphin Sep 10, 2024
7085bbd
Reapply "test"
Vdauphin Sep 10, 2024
50e3dbf
fix flower direction
Vdauphin Sep 10, 2024
39d596c
must have one flower
Vdauphin Sep 10, 2024
a0d88c9
fix dedicated
Vdauphin Sep 12, 2024
4dc3b2c
fix position of grave
Vdauphin Sep 12, 2024
3ba089f
fix db
Vdauphin Sep 14, 2024
1f0dc4c
add _medic
Vdauphin Oct 2, 2024
6c379f4
Merge branch 'master' into master_daily
Vdauphin Oct 12, 2024
492aa4f
Merge branch 'master_daily' into Add-Grave
Vdauphin Oct 12, 2024
4019a6b
Merge pull request #1656 from Vdauphin/Add-Grave
Vdauphin Oct 14, 2024
404fff4
Merge branch 'master' into master_daily
Vdauphin Oct 19, 2024
f04da40
add massacre
Vdauphin Oct 26, 2024
da6dabf
track place in body bag
Vdauphin Oct 26, 2024
8aec964
fix fail when leave an other city
Vdauphin Oct 26, 2024
f0dc22a
add some item around
Vdauphin Oct 26, 2024
3450b4f
add comment
Vdauphin Oct 26, 2024
97eb397
add stringtable
Vdauphin Oct 26, 2024
0388d1b
add deadbody processing
Vdauphin Oct 30, 2024
c2d2d9a
add massacre side to side mission list
Vdauphin Nov 1, 2024
9ab36b2
update documentation
Vdauphin Nov 4, 2024
50dbe31
Merge pull request #1668 from Vdauphin/Add-deadbody_processing
Vdauphin Nov 7, 2024
3757e1e
add new items
Vdauphin Nov 10, 2024
2ae1eca
typo
Vdauphin Nov 11, 2024
2db9e77
fix delay of _restingPlace
Vdauphin Nov 16, 2024
b76d511
Merge pull request #1667 from Vdauphin/Add-massacre
Vdauphin Nov 17, 2024
ef247a3
Advanced Chemical Warfare Settings
TomDraal Dec 1, 2024
ade1d28
Update param.hpp to allow 0% Chemical Cache Proba
TomDraal Dec 1, 2024
4b648da
Remove btc_p_chem for consistency
TomDraal Dec 15, 2024
6eb1adc
Update =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/cache/create.sqf
TomDraal Dec 15, 2024
a8c9a60
Update =BTC=co@30_Hearts_and_Minds.Altis/core/def/param.hpp
TomDraal Dec 15, 2024
2bd691e
Update =BTC=co@30_Hearts_and_Minds.Altis/core/def/param.hpp
TomDraal Dec 15, 2024
a91cd38
Update =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/db/load.sqf
TomDraal Dec 15, 2024
944a756
Update =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/db/load_old.sqf
TomDraal Dec 15, 2024
373ba99
VDauphin's suggestions
TomDraal Dec 15, 2024
76406a8
Update =BTC=co@30_Hearts_and_Minds.Altis/stringtable.xml
TomDraal Dec 18, 2024
4341a99
Update =BTC=co@30_Hearts_and_Minds.Altis/stringtable.xml
TomDraal Dec 18, 2024
a8b975e
Merge pull request #1674 from TomDraal/TomDraal-AdvChem
Vdauphin Dec 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/db/load.sqf
Co-authored-by: Vdauphin <[email protected]>
  • Loading branch information
TomDraal and Vdauphin authored Dec 15, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit a91cd3807aff1a36a51bffcd856913a612e7fe91
2 changes: 1 addition & 1 deletion =BTC=co@30_Hearts_and_Minds.Altis/core/fnc/db/load.sqf
Original file line number Diff line number Diff line change
@@ -102,7 +102,7 @@ btc_cache_pos = _cache_pos;
btc_cache_n = _cache_n;
btc_cache_info = _cache_info;

[_cache_pos, (btc_p_chem_cache_probability > 0), [1, 0] select _isChem] call btc_cache_fnc_create;
[_cache_pos, btc_p_chem_cache_probability > 0, [1, 0] select _isChem] call btc_cache_fnc_create;
btc_cache_obj setVariable ["btc_cache_unitsSpawned", _cache_unitsSpawned];

btc_cache_markers = [];