Commit Graph

58 Commits

Author SHA1 Message Date
dbff8d31d4 Merge branch 'main' into inv_expan 2024-01-30 17:03:36 -08:00
ac9509244f Merge pull request 'reinsert-requests' (#14) from reinsert-requests into main
Reviewed-on: https://17th-gs.iceberg-gaming.com:5443/hizumi/MissionTemplate/pulls/14
2024-01-30 19:00:00 -06:00
53c1d3b18d change milsim_respawn to milsim_reinsert 2024-01-30 15:37:04 -08:00
9ec51a5e19 big refactor to isolate functionality. adds milsim_fnc_log. 2024-01-30 15:05:02 -08:00
f52011cbc4 adds getNearestBase, rework logging, use server diag_tickTime 2024-01-30 10:39:45 -08:00
3e4b0c76b9 Merge pull request 'improve inventory check performance and logging' (#10) from #7-inventory-compliance-message into inv_expan
Reviewed-on: https://17th-gs.iceberg-gaming.com:5443/hizumi/MissionTemplate/pulls/10
2024-01-29 23:37:07 -06:00
072975c99e Merge pull request 'change logPlayerInventory to return lines, which handlers send to CBA ev' (#12) from #11-inventory-processed-on-every-machine into #7-inventory-compliance-message
Reviewed-on: https://17th-gs.iceberg-gaming.com:5443/hizumi/MissionTemplate/pulls/12
2024-01-29 23:36:41 -06:00
cada98e15a change logPlayerInventory to return lines, which handlers send to CBA ev 2024-01-29 13:48:35 -08:00
2951e9cda9 structured logging 2024-01-29 13:26:44 -08:00
8d42fa4593 fixes error in respawn wait over threshold notification 2024-01-29 10:59:39 -08:00
f77e418ac8 simplifies log types 2024-01-29 10:35:24 -08:00
93204f7d36 rework for structured logging and improvements 2024-01-29 10:18:01 -08:00
49fb1bb7fa fixes '_restricted' var references, uses find to identify if any non0 2024-01-28 22:44:49 -08:00
b6189cc7f3 fixes reinsertion formatting and includes groups in diaglog 2024-01-28 22:38:38 -08:00
49fa0c39d2 makes supply boxes ignore weight restrictions for drag and carry 2024-01-28 21:14:22 -08:00
018255a9ab Merge pull request 'feature/reinsert-queue' (#9) from feature/reinsert-queue into main
Reviewed-on: https://17th-gs.iceberg-gaming.com:5443/hizumi/MissionTemplate/pulls/9
2024-01-28 22:52:45 -06:00
7f0431868d Merge branch 'main' into feature/reinsert-queue 2024-01-28 22:52:33 -06:00
801328dc6e Merge pull request 'feature/better-ammo-boxes' (#8) from feature/better-ammo-boxes into main
Reviewed-on: https://17th-gs.iceberg-gaming.com:5443/hizumi/MissionTemplate/pulls/8
2024-01-28 22:49:08 -06:00
fbbc699197 Merge branch 'main' into feature/better-ammo-boxes 2024-01-28 22:48:31 -06:00
9b7042cd7d add mortar resupply crates for mk6 and 60mm 2024-01-28 14:40:03 -08:00
1ac1664faf bug fixes 2024-01-28 13:46:56 -08:00
e395fa9c16 add forcedPilotCheck setting, some formatting changes 2024-01-26 21:22:35 -08:00
4ced508005 add global broadcast on players waiting longer than threshold, log 2024-01-26 21:06:47 -08:00
7e4af79fed locally tested. adds settings, fixes removal logic 2024-01-26 16:16:18 -08:00
754d7356e1 adds events, queue, auto-notifications, manual checks for pilots 2024-01-26 00:45:52 -08:00
d823ebeb26 fix icons for crate defs 2024-01-25 21:39:39 -08:00
e9fc5cfe21 update FBCB2 element callsigns 2024-01-25 21:24:14 -08:00
dcb8d2d0d6 fix cfgfunctions and add init declaration 2024-01-25 21:14:11 -08:00
ef4c5a63ad add general createBox fnc, adjust zen module, central definition 2024-01-25 21:08:37 -08:00
6eb598b660 Update fn_logPlayerInventory.sqf
Expanded the items arrays to check not only internal inventory items but primary slot inventory items.
2024-01-16 22:48:36 -06:00
7a1d0be6d6 Update 'functions/server/fn_logPlayerInventory.sqf'
Updated the fn_logPlayerInventory.sqf to do a check against a list of items that are "approved / rejected / restricted / and meme items in a players inventory
2024-01-15 21:44:40 -06:00
445cb5e75d Merge pull request 'Adjust Draw3D Triage Deceased Color to Dark Gray' (#5) from feature/triagestatus-draw3d into main
Reviewed-on: https://17th-gs.iceberg-gaming.com:5443/hizumi/MissionTemplate/pulls/5
3.1.3
2024-01-10 01:07:58 -06:00
09a800ab01 Merge branch 'main' into feature/triagestatus-draw3d 2024-01-10 01:05:46 -06:00
723aebcbf5 fix handler cleanup and make deceased a dark gray 2024-01-09 23:03:17 -08:00
Hizumi
6f5affd283 Update CHANGELOG.md
for release 3.1.3
2024-01-10 00:23:11 -06:00
dbe5473dad Merge pull request 'Draw 3D icons representing triage status of unconscious units (visible to medics only)' (#4) from feature/triagestatus-draw3d into main
Reviewed-on: https://17th-gs.iceberg-gaming.com:5443/hizumi/MissionTemplate/pulls/4
2024-01-10 00:19:15 -06:00
7630efeb4d fixes unit gather method, ready 2024-01-09 22:16:43 -08:00
12dd0fc83c Merge remote-tracking branch 'origin/main' into feature/triagestatus-draw3d 2024-01-09 21:29:56 -08:00
Hizumi
3b06fe717b Update CHANGELOG.md 3.1.2 2024-01-09 02:17:50 -06:00
Hizumi
d9dfee0c7b rewrite logic for inventory check 2024-01-09 02:15:53 -06:00
1f1552bd53 Merge pull request 'add exclusion whitelist for known vehicle models w/out flag proxies' (#3) from bug/update-flag-exclusions into main
Reviewed-on: https://17th-gs.iceberg-gaming.com:5443/hizumi/MissionTemplate/pulls/3
2024-01-08 15:02:21 -06:00
c912e730ac Merge branch 'main' into bug/update-flag-exclusions 2024-01-07 21:31:07 -06:00
0301758e28 add exclusion whitelist for known vehicle models w/out flag proxies 2024-01-07 19:28:38 -08:00
Hizumi
85e9af6a73 version 3.1.2 2024-01-04 01:12:14 -06:00
Hizumi
32d8589733 add medical overlay 2024-01-04 01:11:59 -06:00
Hizumi
bc9b20a89d version 3.1.1 3.1.1 2024-01-04 01:09:57 -06:00
61d3e2faf1 Merge pull request 'Fix flags applying to CAManBase' (#2) from bug/flags-apply-to-men into main
Reviewed-on: https://17th-gs.iceberg-gaming.com:5443/hizumi/MissionTemplate/pulls/2
2023-12-29 23:31:28 -06:00
544039efbf Merge branch 'main' into bug/flags-apply-to-men 2023-12-29 23:31:02 -06:00
15f7225a5f define parent classes to apply handler to 2023-12-29 21:21:19 -08:00
a3da783d06 Merge pull request 'fixes spelling of battalion' (#1) from bug/fixtypo into main
Reviewed-on: https://17th-gs.iceberg-gaming.com:5443/hizumi/MissionTemplate/pulls/1
2023-12-29 18:22:45 -06:00