develop #21

Merged
hizumi merged 21 commits from develop into main 2024-02-06 23:17:31 -06:00

21 Commits

Author SHA1 Message Date
aa640d31a3 Merge pull request 'big CBA rework & improvements' (#19) from implement-cba-macros-for-some-modules into develop
Reviewed-on: https://17th-gs.iceberg-gaming.com:5443/hizumi/MissionTemplate/pulls/19
2024-02-06 23:14:46 -06:00
c44247061a bug fixes from dedicated testing 2024-02-06 20:56:42 -08:00
8a27abe6c5 add verbosity to 3d triageIcons tooltip under Enable, for clarity 2024-02-06 18:14:23 -08:00
91b982e06e ready for dedi -- improvements to resupply, triageIcons too 2024-02-06 17:36:01 -08:00
0a64d9e170 big refactor, WIP! 2024-02-06 01:52:25 -08:00
f588ffa4a0 many changes. includes rework of baselocation-asset storage format 2024-02-05 17:42:31 -08:00
f450f4611b wip, fbcb2_assets, init, util 2024-02-04 22:18:06 -08:00
4cfa159ee9 change root level folder name to framework, update resupply+vehicleflags
tested locally
2024-02-04 21:23:12 -08:00
c45f778188 Merge pull request 'move-supply-crates-to-cfg' (#17) from move-supply-crates-to-cfg into develop
Reviewed-on: https://17th-gs.iceberg-gaming.com:5443/hizumi/MissionTemplate/pulls/17
2024-02-04 22:56:25 -06:00
7cc8d9aaca Merge branch 'develop' into move-supply-crates-to-cfg 2024-02-04 22:55:58 -06:00
311a4c4007 Merge pull request 'move-flags-to-config' (#18) from move-flags-to-config into develop
Reviewed-on: https://17th-gs.iceberg-gaming.com:5443/hizumi/MissionTemplate/pulls/18
2024-02-04 22:54:40 -06:00
d7b8e5186e tested local 2024-02-03 22:55:21 -08:00
94ccf0d80d adds scroll wheel spawning and setting, adds utils for getting cfg 2024-02-03 22:37:44 -08:00
09dcde7471 wip 2024-02-03 20:59:51 -08:00
7ef48ecaa2 move to cfg, update createbox, create /defines 2024-02-03 18:40:18 -08:00
6764186794 Merge remote-tracking branch 'origin/main' into update-asset-diary-entries 2024-02-03 18:39:11 -08:00
affc8ffb1f remove debug hint 2024-02-03 15:04:47 -08:00
b8b8f1de22 use netId in dairy entry link for dedicated to work 2024-02-03 13:53:28 -08:00
8d93bb5743 adds starting assets and assets at mission end to RPT 2024-02-02 15:13:45 -08:00
b67888f4f1 locally tested, adds more features. ready for dedi 2024-02-02 14:34:04 -08:00
3f5c6c5a59 WIP: add asset diary pages 2024-02-02 01:06:43 -08:00