Skip to content

Wardrobe - Compats: CUP Units #10905

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
Draft
wants to merge 314 commits into
base: master
Choose a base branch
from
Draft

Wardrobe - Compats: CUP Units #10905

wants to merge 314 commits into from

Conversation

OverlordZorn
Copy link
Contributor

@OverlordZorn OverlordZorn commented May 9, 2025 •
edited by Drofseh
Loading

When merged this pull request will:

  • Provide Wardrobe Compats for CUP

ToDo

  • CUP Uniforms

Requirements

Co Contributor

@Andx667

OverlordZorn and others added 30 commits March 28, 2025 13:46
@OverlordZorn
fix formatting
1050160
@OverlordZorn
formatting
2e5b2af
@OverlordZorn
fix ID attribute
970a1e2
@OverlordZorn
Q( -> QUOTE(
092f28e
@OverlordZorn
pruned SUBCOMPONENT_BEAUTIFIED
5f0bbb2
@OverlordZorn
also adapt mass to 70
56add0d
@OverlordZorn
compat_vanilla -> root
f2c6891
@OverlordZorn
-> PREP 💩
581973e
@OverlordZorn
"../../" -> "../"
c67fba9
@OverlordZorn
1 New Line at EOF
f1e677f
@OverlordZorn
fnc headers and minor polish here and there
f3f7b8e
@OverlordZorn
disabled - to be deleted later
058d390
@OverlordZorn
WIP - Documentation
f0a34e1
@OverlordZorn
postInit -> XEH
6e06b86
@OverlordZorn
none -> None
a6d3528
@OverlordZorn @LinkIsGrim
Update addons/wardrobe/stringtable.xml
1350da1 
Co-authored-by: Grim <[email protected]>
@OverlordZorn @LinkIsGrim
Update addons/wardrobe/stringtable.xml
10265a0 
Co-authored-by: Grim <[email protected]>
@OverlordZorn
Drop Unneeded Description
68609e6
@OverlordZorn
ACE_SpareBarrel - needs testing
e30dc2a
@OverlordZorn @rautamiekka
Apply suggestions from code review
3bcff1e 
Co-authored-by: Jouni Järvinen <[email protected]>
@OverlordZorn
cleanup
b0e2c5b
@OverlordZorn
fix
295ac33
@OverlordZorn
Compat for ace_spareBarrel
20e229d
@OverlordZorn
Update launch.toml
e85902f
@OverlordZorn
remove fnc_say3d.sqf
f53e6c8
@OverlordZorn
remove unused variables
b1ecde5
@OverlordZorn
refactor: goggles as components
ece1741
@OverlordZorn
remove whitespace
fd980b5
@OverlordZorn
more compats
ef65249
@OverlordZorn
getMagIDs -> CBA fnc.
094547e
OverlordZorn and others added 30 commits June 3, 2025 23:55
@OverlordZorn
fix stringtable key
89b3558
@OverlordZorn
add space after =
c003901
@OverlordZorn
"," -> ", "
a0c318a
@OverlordZorn
sort prep a->z
35c38e7
@OverlordZorn @johnb432
sort includes
a9637c2 
Co-authored-by: johnb432 <[email protected]>
@OverlordZorn
add linebreak
f53e687
@OverlordZorn
Merge branch 'ace-wardrobe' of https://github.com/OverlordZorn/ACE3 i…
b2aa867 
…nto ace-wardrobe
@OverlordZorn
rm dead code
683f7a2
@OverlordZorn @johnb432
rm ; for return statement
30b48dd 
Co-authored-by: johnb432 <[email protected]>
@OverlordZorn
improve readability
6f8c53d
@OverlordZorn
rm comment
ebf0b33
@OverlordZorn
Update compareContainerMaxLoad.sqf
5eb71c0
@OverlordZorn
rm leading/trailing spaces inside () and []
29d4e8a
@OverlordZorn
Merge branch 'ace-wardrobe' of https://github.com/OverlordZorn/ACE3 i…
077724b 
…nto ace-wardrobe
@OverlordZorn
Update fnc_replace.sqf
6d63060
@OverlordZorn
isEqualTo "" -> isNil
9895157
@OverlordZorn
unify { } with leading/ending whitespace in .sqf
3480c79
@OverlordZorn
return false -> configNull
e96b655
@OverlordZorn
FUNC -> LINKFUNC
38a9fe9
@OverlordZorn
use classname instead of config where possible
42fdeb0 
Due to how previously all wardrobe info was stored inside the items config, before it got moved into configFile >> ACE_Wardrobe, alot of configs were not needed anymore and could be replaced directly with the classname.
@OverlordZorn
applicable examples
ea5b626
@OverlordZorn
_unit -> _player
0092033 
upon further thoughts i cannot think of a way where it would make sense to use the wardrobe framework to change the wearable for an ai unit. simply changing them via code directly is nearly always simpler and faster.
@OverlordZorn
added: directional display names
abe4172
@OverlordZorn
altDisplayName-> alternativeActionName
c3466fa
@OverlordZorn
-> alternativeActionName
694330a
@OverlordZorn
Merge remote-tracking branch 'upstream/master' into ace-wardrobe
cdd79d0
@OverlordZorn
Merge branch 'ace-wardrobe' into ace-wardrobe-compat-cup
d4c6e28
@OverlordZorn
IMPORT_BASE_CLASSES();
2cc4075
@OverlordZorn
IMPORT_BASE_CLASSES;
ac7d986
@OverlordZorn
rm ()
b09a57e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rautamiekka rautamiekka rautamiekka requested changes

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@OverlordZorn @rautamiekka