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.

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

added new fences to wirecutter #6423

Merged
merged 9 commits into from Jul 19, 2018

Conversation

Projects
None yet
5 participants
@shukari
Contributor

shukari commented Jul 9, 2018

When merged this pull request will:

  • added new isFence classes
  • added all isFence model p3ds and special xcam dences to macro FENCE_P3DS

resolve #6420

shukari added some commits Jul 9, 2018

added apex and tacops fences
informations from #6420
@jonpas

This comment has been minimized.

Member

jonpas commented Jul 9, 2018

Use tabs spaces, as per our coding guidelines.

shukari added some commits Jul 9, 2018

@jonpas jonpas added this to the 3.12.3 milestone Jul 9, 2018

@shukari

This comment has been minimized.

Contributor

shukari commented Jul 9, 2018

@jonpas should i use tab... the error say i should not... confused

@jonpas

This comment has been minimized.

Member

jonpas commented Jul 9, 2018

No, you should not. You should use spaces.

@jonpas

This comment has been minimized.

Member

jonpas commented Jul 9, 2018

Oh, I just realized haha, I wrote it the other way around, sorry!

@shukari

This comment has been minimized.

Contributor

shukari commented Jul 9, 2018

@jonpas ok, is fixed

PabstMirror added some commits Jul 13, 2018

Merge branch 'master' into pr/6423
 Conflicts:
	addons/logistics_wirecutter/CfgVehicles.hpp
	addons/logistics_wirecutter/script_component.hpp
@PabstMirror

This comment has been minimized.

Collaborator

PabstMirror commented Jul 13, 2018

Fixed merge conflicts from #6389
I think I got the correct union of both lists, let me know if I missed anything.

@@ -16,28 +16,42 @@
#include "\z\ace\addons\main\script_macros.hpp"

This comment has been minimized.

@mharis001

mharis001 Jul 14, 2018

Contributor

Not needed extra line

@PabstMirror PabstMirror merged commit bf2cbaa into acemod:master Jul 19, 2018

1 check passed

ci/circleci Your tests passed on CircleCI!
Details

@shukari shukari deleted the shukari:patch-8 branch Jul 23, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment