Commit Graph

236 Commits

Author SHA1 Message Date
f6703e7dd4 Merge branch 'develop' into ingame_chat_options 2024-12-23 00:07:10 -06:00
hizumi
ea64f8e63c Update fn_logRespawnButtonUse.sqf
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 3m6s
add triagelevel status to respawn message
2024-12-23 00:01:43 -06:00
dba0a0e57c Update framework/client/functions/fn_bindEventHandlers.sqf
Added Chat Handler Mission Space Variable Checks
2024-08-11 12:01:01 -05:00
888a688f56 Update framework/common/functions/fn_addCBASettings.sqf
Added CBA Settings for Chat Handler as well as Defaults
2024-08-11 11:57:29 -05:00
c94f660682 Merge pull request '4.2.1 release' (#56) from develop into main
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 41s
Reviewed-on: #56
4.2.1
2024-06-23 23:35:59 -05:00
hizumi
7e93ebfbfd Update script_version.hpp
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 41s
prep 4.2.1 release
2024-06-23 23:33:23 -05:00
hizumi
e0c8f3c952 Update CHANGELOG.md
version 4.2.0 release notes
2024-06-23 23:33:07 -05:00
hizumi
d200f83375 Update DisallowedEquipment.hpp 2024-06-23 23:32:24 -05:00
51c5da44ce Merge pull request '4.2.0 release' (#55) from develop into main
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 36s
Reviewed-on: #55
4.2.0
2024-06-20 23:51:06 -05:00
0f5569c5ba Merge branch 'main' into develop
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 36s
2024-06-20 23:49:29 -05:00
hizumi
448fad1ee0 Update script_version.hpp
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 41s
prep 4.2.0 release
2024-06-20 23:24:08 -05:00
hizumi
2210dc1a70 Update CHANGELOG.md
version 4.2.0 release notes
2024-06-20 23:23:50 -05:00
hizumi
7e5e7e26af Update SupplyCrates.hpp
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 40s
add ability to pull tires and tracks out of the arsenal boxes for loading into vehicles
2024-06-19 22:20:49 -05:00
hizumi
7c6130891a update custom remainsCollector event handlers
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 39s
add extra verbose debug logging to determine owner, time, and whether or not the custom garbage collector is who processed the body
2024-06-19 20:55:12 -05:00
hizumi
eee4ac1b83 Update fn_initClient.sqf
temporarily remove pilot ability to check re-insertion queue
2024-06-19 20:53:19 -05:00
faf84a0bf2 Merge pull request 'Campaign-Updates-6-9-2024' (#54) from Campaign-Updates-6-9-2024 into develop
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 39s
Reviewed-on: #54
2024-06-19 19:55:03 -05:00
68d793a519 Merge branch 'develop' into Campaign-Updates-6-9-2024 2024-06-19 19:54:49 -05:00
2e67e0e932 Merge pull request 'flag_simpleshape_variety' (#53) from flag_simpleshape_variety into develop
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 45s
Reviewed-on: #53
2024-06-19 19:53:39 -05:00
04546e49f7 Update defines/SupplyCrates.hpp
Increased White Smokes in Squad Ammo Crate
Added M84 tun Grenade to Squad Ammo Crate
2024-06-19 00:36:21 -05:00
8cfebeef10 Update defines/SupplyCrates.hpp
Added Pain Killers to Medical Resupply
2024-06-19 00:32:04 -05:00
8c6c1f6a62 Update defines/SupplyCrates.hpp
Added SIG MCX AMMO
Created a Squad Utility Box with Chems / Smokes / Breaching Items / Cable Ties / Radios
2024-06-19 00:30:56 -05:00
1fea46355a Merge remote-tracking branch 'origin/develop' into flag_simpleshape_variety 2024-06-18 19:07:56 -07:00
de91b61fcc some updates 2024-06-18 19:05:54 -07:00
fedc6f1432 Merge pull request 'wip' (#51) from flag_simpleshape_variety into develop
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 37s
Reviewed-on: #51
2024-06-16 15:45:24 -05:00
b34928c0c3 wip 2024-06-16 15:45:12 -05:00
2d9e5aabef Merge pull request 'Campaign-Updates-6-9-2024' (#50) from Campaign-Updates-6-9-2024 into develop
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 38s
Reviewed-on: #50
2024-06-16 15:41:23 -05:00
87ebbae31c Update defines/ApprovedAssets.hpp
Updated Approved assets.
2024-06-16 15:41:06 -05:00
408228f07b Added Black Hornet Restricted Item 2024-06-16 15:41:06 -05:00
736e90e305 Removed SMA Resupply Items
Removed the following Items from resupply
{"SMA_30Rnd_762x35_BLK_EPR",25}, 
{"SMA_20Rnd_762x51mm_M80A1_EPR",25},
{"SMA_20Rnd_762x51mm_M80A1_EPR_Tracer",25},
{"SMA_20Rnd_762x51mm_Mk316_Mod_0_Special_Long_Range",25},
{"SMA_20Rnd_762x51mm_Mk316_Mod_0_Special_Long_Range_Tracer",25},
2024-06-16 15:41:06 -05:00
f17fff8363 Asset Change
Removed Athena and Homer, Changed Armed VTOL callsign
2024-06-16 15:41:06 -05:00
64bc303893 Update defines/BattalionInfo.hpp
Updated ECO Callsign
2024-06-16 15:41:06 -05:00
80247a01d0 Update defines/BattalionInfo.hpp
Updated ACO and BCO Callsign
2024-06-16 15:41:06 -05:00
7c8cd6104b wip 2024-06-15 20:01:48 -07:00
7322799b78 add custom sounds support
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 42s
2024-06-15 16:43:56 -07:00
8f89283ceb Added Black Hornet Restricted Item 2024-06-12 00:13:04 -05:00
hizumi
db7bdf1ecd Update fn_createBox.sqf
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 37s
fix incorrect ace variable name. fixes #47.
2024-05-26 16:36:47 -05:00
hizumi
0f8783ffa9 add initial dead unit garbage collection
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 40s
2024-05-23 21:21:10 -05:00
af7600ac16 Merge pull request 'develop' (#46) from develop into main
Reviewed-on: #46
4.1.2
2024-04-25 21:41:04 -05:00
hizumi
fac86f18f0 Update CHANGELOG.md
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 42s
version 4.1.2 release notes
2024-04-25 21:36:48 -05:00
hizumi
87b6f359c1 Update fn_addEmptyGroupCleanupPFH.sqf
fix logic order and update logging output
2024-04-25 21:34:34 -05:00
hizumi
cbd8b5963e Update fn_addEmptyGroupCleanupPFH.sqf
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 37s
add more logging as to where the empty group is owned to track down deletion issues
2024-04-21 19:44:19 -05:00
hizumi
09ee014912 Merge branch 'develop' of https://gitea.iceberg-gaming.com/17th-Ranger-Battalion-ORG/MissionTemplate into develop
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 32s
2024-04-21 18:43:09 -05:00
hizumi
5b482b022f Update SupplyCrates.hpp
swap Tier1 5.56 mags to rhs 5.56 mags for mod compatability
2024-04-21 18:42:47 -05:00
hizumi
8afe420527 versioning update
4.1.2
2024-04-21 18:42:25 -05:00
ff98546907 Merge pull request 'main' (#45) from main into develop
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 37s
Reviewed-on: #45
2024-04-21 18:34:12 -05:00
5a1e6dd1a1 Merge pull request '4.1.1 release' (#43) from develop into main
Reviewed-on: #43
4.1.1
2024-04-19 00:31:43 -05:00
hizumi
0524af05b9 Update CHANGELOG.md
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 33s
4.1.1 release
2024-04-19 00:28:31 -05:00
hizumi
023550743d Update BattalionInfo.hpp
alpha callsign change
2024-04-19 00:23:01 -05:00
hizumi
ab28ed4e50 Update fn_bindVehicleActions.sqf
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 38s
remove now unneeded custom tire patching ace interaction
2024-04-19 00:01:14 -05:00
hizumi
8794dc226d Update fn_calculateServerStats.sqf
remove unneeded publicVariable declaration to reduce network traffic
2024-04-18 23:59:27 -05:00