Commit Graph

263 Commits

Author SHA1 Message Date
hizumi
851a172b69 Update CHANGELOG.md 2025-11-09 21:05:46 -06:00
7b15333d2e Merge pull request 'main' (#67) from main into develop
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 1m48s
Reviewed-on: #67
2025-11-09 20:54:16 -06:00
4c0467b21a Merge pull request 'Operation_Fractured_Bolt-Campaign_Updates' (#66) from Operation_Fractured_Bolt-Campaign_Updates into main
Reviewed-on: #66
2025-11-09 20:51:22 -06:00
eb3e08e14a Update defines/SupplyCrates.hpp
Change rhs_weap_m72a7 with JPSP_weap_m72ecmk1
2025-11-09 15:28:01 -06:00
8532ec5786 Update defines/BattalionInfo.hpp
Call Sign Updates for ACO / BCO
2025-11-09 13:28:42 -06:00
6b33680e77 Merge pull request '4.2.3 release' (#65) from develop into main
All checks were successful
Pack Release files / Dispatch MissionZGM build job (release) Successful in 1m33s
Pack Release files / Publish cleaned template (release) Successful in 1m47s
Reviewed-on: #65
4.2.3
2025-05-27 20:46:28 -05:00
hizumi
3db6191e0d Update script_version.hpp
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 2m17s
2025-05-27 20:33:29 -05:00
hizumi
fef05fa153 Update CHANGELOG.md 2025-05-27 20:33:23 -05:00
hizumi
2bd8a16079 Update fn_bindEventHandlers.sqf
correct logic for handling chat messages based on allowed channel cba settings
2025-05-25 22:48:53 -05:00
1fbda6ac95 Merge pull request 'aj-campaign-update-5-17-2025' (#64) from aj-campaign-update-5-17-2025 into develop
Some checks failed
Generate testing snapshot / Create testing release (push) Has been cancelled
Reviewed-on: #64
2025-05-19 16:32:08 -05:00
dbc380c6af Merge branch 'develop' into aj-campaign-update-5-17-2025 2025-05-19 16:31:58 -05:00
22c1f1a21a revert 05936d9213
revert Update defines/DisallowedEquipment.hpp

Added AJ's T-Shirts to the Tabbed Weapons
2025-05-19 16:31:42 -05:00
hizumi
3f4d4147a3 Warlord emblem addition
add new texture for warlord flag and add it to vehicle flag list
2025-05-19 16:31:24 -05:00
c9c15681ce Merge pull request 'Tabbed-Shirt-Update-3-25-2025' (#63) from Tabbed-Shirt-Update-3-25-2025 into develop
Some checks failed
Generate testing snapshot / Create testing release (push) Has been cancelled
Reviewed-on: #63
2025-05-19 16:18:17 -05:00
840652f853 Update defines/SupplyCrates.hpp
Added new resupply Mags for KAR and JCA
2025-05-18 19:12:45 -05:00
05936d9213 Update defines/DisallowedEquipment.hpp
Added AJ's T-Shirts to the Tabbed Weapons
2025-05-05 23:44:21 -05:00
84ab6a1ca7 Update defines/BattalionInfo.hpp
Updated Alpha Callsign
2025-05-04 15:11:46 -05:00
175988efe6 Removed PVS14 and PVS15 from Blacklist 2025-05-04 00:04:36 -05:00
b60f7922f3 Update defines/DisallowedEquipment.hpp
Added T-Shirt Items
2025-03-25 20:44:01 -05:00
hizumi
071a056dc8 Update script_version.hpp
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 2m58s
2024-12-23 00:21:25 -06:00
hizumi
c31e5cf9ac Update CHANGELOG.md 2024-12-23 00:21:21 -06:00
69aed97ce3 Merge pull request '4.2.2 release' (#62) from develop into main
Reviewed-on: #62
4.2.2
2024-12-23 00:21:15 -06:00
5cf3ea5c1f Merge pull request 'Campaign-Updates-Nov-13-2024' (#61) from Campaign-Updates-Nov-13-2024 into develop
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 2m56s
Reviewed-on: #61
2024-12-23 00:09:37 -06:00
38d03353b3 Merge branch 'develop' into Campaign-Updates-Nov-13-2024 2024-12-23 00:09:22 -06:00
ca478ab08d Merge pull request 'ingame_chat_options' (#59) from ingame_chat_options into develop
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 2m55s
Reviewed-on: #59
2024-12-23 00:07:53 -06:00
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
3308cdc5ba Update defines/DisallowedEquipment.hpp
Added Restricted Item Check for MRH Satcom / Satellite
2024-11-16 17:42:14 -06:00
a35c39721e Update defines/BattalionInfo.hpp
Commented out unused Units
Updated Command Callsigns
2024-11-13 19:53:11 -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