Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add magazine wells for GM CDLC #1538

Merged
merged 11 commits into from
Sep 13, 2023
Merged

Add magazine wells for GM CDLC #1538

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5c43ab2
Add Global Mobilization magazines to CBA magazine wells
Dahlgren Mar 22, 2022
441ca74
Add CBA magazine wells to Global Mobilization weapons
Dahlgren Mar 23, 2022
8852b4a
Add missing quote in conditional include
Dahlgren Mar 23, 2022
b79e2ce
Add required addons for Global Mobilization weapons
Dahlgren Mar 23, 2022
508322e
Merge branch 'master' into feature/gm-magazine-wells
Dahlgren Sep 7, 2023
57ac2eb
Migrate to skipWhenMissingDependencies
Dahlgren Sep 7, 2023
84cdd95
Migrate CfgMagazineWells to cba_jam_gm
Dahlgren Sep 7, 2023
34eaf77
Add missing semicolon
Dahlgren Sep 7, 2023
6a7e055
Merge branch 'master' into pr/1538
PabstMirror Sep 13, 2023
4ed1d8f
SUBADDON
PabstMirror Sep 13, 2023
d131ce2
Update addons/jam/jam_gm/config.cpp
jonpas Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions addons/jam/jam_gm/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "script_component.hpp"

class CfgPatches {
class ADDON {
name = ECSTRING(jam,component);
class SUBADDON {
jonpas marked this conversation as resolved.
Show resolved Hide resolved
name = CSTRING(component);
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
Expand Down
5 changes: 2 additions & 3 deletions addons/jam/jam_gm/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
#define COMPONENT jam_gm
#include "\x\cba\addons\main\script_mod.hpp"
#include "\x\cba\addons\main\script_macros.hpp"
#define SUBCOMPONENT gm
#include "..\script_component.hpp"