Commit Graph

264 Commits

Author SHA1 Message Date
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
hizumi
2bfaaacfc6 Update fn_initServer.sqf
disable zeus lightning bolt functionality first pass
2024-04-18 23:58:42 -05:00
8a4f161df9 Merge pull request 'authorized_gear_april_update' (#42) from authorized_gear_april_update into develop
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 6m1s
Reviewed-on: #42
2024-04-14 00:07:48 -05:00
cc5b8bbf45 Update defines/DisallowedEquipment.hpp
Updated Defines / Allowed Items for Tabbed Weapons to align with new announcement 

https://www.guilded.gg/Iceberg-gaming/groups/v3j2vAP3/channels/06d0c762-6a54-4657-9ed0-9d73763fcd1e/announcements/16nPOKxR
2024-04-14 00:07:48 -05:00
eb4959a2ba 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 40s
2024-03-16 20:22:38 -07:00
643a7f212b log client performance to server RPT 2024-03-16 20:22:27 -07:00
6c4740dd1f Merge pull request 'develop' (#37) from develop into main
Reviewed-on: #37
4.1.0
2024-03-02 01:08:33 -06:00
hizumi
f128e0fec8 Update on-release.yaml 2024-03-02 01:08:33 -06:00
hizumi
32dda56f69 Update on-release.yaml
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 36s
2024-03-02 01:06:28 -06:00
hizumi
90f3caf1f9 Merge branch 'develop' of https://gitea.iceberg-gaming.com/17th-Ranger-Battalion-ORG/MissionTemplate into develop 2024-03-02 01:06:17 -06:00
706794a114 Merge pull request 'Update on-release.yaml' (#36) from develop into main
Reviewed-on: #36
2024-03-02 00:49:54 -06:00
hizumi
ee43868a32 Update on-release.yaml
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 31s
2024-03-02 00:49:41 -06:00
hizumi
e7af2f115e Update on-release.yaml
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 31s
2024-03-02 00:48:47 -06:00
c1aeace994 Merge pull request 'Update on-release.yaml' (#35) from develop into main
Reviewed-on: #35
2024-03-02 00:23:31 -06:00
d9beb44c72 Merge branch 'main' into develop
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 30s
2024-03-02 00:23:08 -06:00
hizumi
44b842ad33 Update on-release.yaml
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 30s
2024-03-02 00:18:05 -06:00
d9b5dd66a8 Merge pull request 'develop' (#34) from develop into main
Reviewed-on: #34
2024-03-01 23:59:30 -06:00
d6549fc040 Merge branch 'main' into develop
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 30s
2024-03-01 23:56:55 -06:00
hizumi
073f5ffd63 Update CHANGELOG.md
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 36s
2024-03-01 23:49:35 -06:00
hizumi
53a8b782e6 Update README.md
newer file structure, release link, and new file purposes
2024-03-01 23:49:25 -06:00
737f1ef7ee skip respawn button log if no last uncon timer registered
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 37s
2024-02-24 19:45:55 -08:00
hizumi
3e4eda2843 Update on-push-devel.yaml
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 32s
2024-02-22 23:23:12 -06:00
hizumi
34c36f58e2 Delete create-testing-snapshot.yaml 2024-02-22 23:20:25 -06:00