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

Trench improvements from grad trenches #6712

Closed
wants to merge 67 commits into from
Closed

Trench improvements from grad trenches #6712

wants to merge 67 commits into from

Conversation

AdlerSalbei
Copy link

@AdlerSalbei AdlerSalbei commented Dec 1, 2018 •
edited
Loading

Merges the changes done in Grad Trenches into ACE
These include features like:

  • More & better trenches models
  • Surface texture on trench
  • Rewriten placement mechanic
  • Use of Stamina
  • Camouflaging trenches

Todo:

  • remove spawn in Cfg3DEN.hpp
  • fix indentation
  • replace setVar every 0,1s with a better system
  • remove diag_logs

@AdlerSalbei
Copy link
Author

I do not know what problem the linter has, but all brackets are correckt. It works ingame.

@jokoho48
Copy link
Member

jokoho48 commented Dec 1, 2018

the issue is that /" in CfgWorlds.hpp at line 5. the Linter interprets that as line break of the string and continuation of to the next line
you can see here what the issue is
https://github.com/acemod/ACE3/pull/6712/files#diff-7ebb23549a146ca1b78a2ea36d823428R4
a string should not end with /" that can create issues.

@dedmen
Copy link
Contributor

dedmen commented Dec 2, 2018 •
edited
Loading

a string should not end with /" that can create issues.

Nope. That's perfectly valid, It's armake that's making the mistake here.
KoffeinFlummi/armake#84

Don't know if Arma needs the ending \ there or not, if not you can of course change completely fine code just because the packing tool is bugged.

Code doesn't seem fine tho. Takes it does surfaceTexturePath\filename so that would end in double backslash here?
https://github.com/acemod/ACE3/pull/6712/files#diff-6683fd5b71b72df67e4917493ba4c50eR45

This PR add's 14.41MB to the ACE repo.

dedmen
dedmen suggested changes Dec 2, 2018
View reviewed changes
addons/trenches/Cfg3DEN.hpp Outdated Show resolved Hide resolved
addons/trenches/config.cpp Outdated Show resolved Hide resolved
addons/trenches/functions/fnc_addDigger.sqf Outdated Show resolved Hide resolved
addons/trenches/functions/fnc_applyCamouflageAttribute.sqf Show resolved Hide resolved
addons/trenches/functions/fnc_canRemoveCamouflage.sqf Show resolved Hide resolved
addons/trenches/XEH_preInit.sqf Outdated Show resolved Hide resolved
addons/trenches/CfgVehicles.hpp Outdated Show resolved Hide resolved
addons/trenches/CfgVehicles.hpp Outdated Show resolved Hide resolved
addons/trenches/CfgEventHandlers.hpp Outdated Show resolved Hide resolved
addons/trenches/CfgEventHandlers.hpp Outdated Show resolved Hide resolved
@jonpas jonpas added the kind/enhancement Release Notes: **IMPROVED:** label Dec 7, 2018
@jonpas jonpas added this to the 3.13.0 milestone Dec 7, 2018
@jonpas jonpas modified the milestones: 3.13.0, 3.14.0 Dec 7, 2019
@jonpas jonpas removed the status/WIP label Jun 25, 2020
jonpas added a commit to Theseus-Aegis/ACE3 that referenced this pull request Jul 1, 2020
@jonpas
Merge Trench improvements from grad trenches (acemod#6712)
587c714 
Squashed commit of the following:

commit 6313cb6
Merge: c315493 b16ca5c
Author: jonpas <[email protected]>
Date:   Wed Jul 1 15:28:22 2020 +0200

    Merge branch 'master' into Trench-improvements-from-Grad-Trenches

commit c315493
Author: Salbei <[email protected]>
Date:   Sat Aug 31 14:33:36 2019 +0200

    fixed wrong indentations

commit cce03a2
Author: Salbei <[email protected]>
Date:   Sat Aug 31 14:15:11 2019 +0200

    removed a wrong check

commit d235d08
Author: Salbei <[email protected]>
Date:   Sat Aug 31 14:03:05 2019 +0200

    changed the for-loop to make it less ugly

commit 501f0ec
Author: Salbei <[email protected]>
Date:   Fri Aug 23 22:42:35 2019 +0200

    fix Spacing

commit 7fcb859
Author: Salbei <[email protected]>
Date:   Fri Aug 23 18:53:57 2019 +0200

    improved script & changed GVAR name

commit e6de0f2
Author: Salbei <[email protected]>
Date:   Fri Aug 23 18:20:32 2019 +0200

    added a space at commy2 wish

commit da0c1c0
Author: Salbei <[email protected]>
Date:   Fri Aug 23 18:12:51 2019 +0200

    fixed tabs

commit 147d140
Author: Salbei <[email protected]>
Date:   Fri Aug 23 18:09:34 2019 +0200

    fixed set mulit Gvar & added more maps

commit 40e1b1b
Author: Salbei <[email protected]>
Date:   Sat Aug 17 18:25:32 2019 +0200

    fixed linter issue

commit 55fa2af
Author: Salbei <[email protected]>
Date:   Sat Aug 17 18:19:38 2019 +0200

    fixed remaining issues

commit 5dd95e8
Author: Salbei <[email protected]>
Date:   Thu Jun 6 00:48:07 2019 +0200

    more wörk to do

commit 12faf79
Author: Salbei <[email protected]>
Date:   Wed Jun 5 21:43:09 2019 +0200

    minor adjustments

commit c9a7eea
Author: Salbei <[email protected]>
Date:   Wed Jun 5 00:06:07 2019 +0200

    fixed placement

commit ca424c2
Author: Salbei <[email protected]>
Date:   Tue Jun 4 17:22:32 2019 +0200

    Auto stash before merge of "Trench-improvements-from-Grad-Trenches" and "AdlerSalbei/Trench-improvements-from-Grad-Trenches"

commit 9628d43
Author: Salbei <[email protected]>
Date:   Mon Jun 3 12:25:54 2019 +0200

    fixed spacing

commit 1606749
Author: Salbei <[email protected]>
Date:   Mon Jun 3 12:05:09 2019 +0200

    Some changes

commit adef5d5
Merge: df304b5 e2f61a9
Author: Salbei <[email protected]>
Date:   Mon Jan 7 14:58:49 2019 +0100

    Merge remote-tracking branch 'AdlerSalbei/Trench-improvements-from-Grad-Trenches' into Trench-improvements-from-Grad-Trenches

commit df304b5
Merge: dfdd3e1 160cc4c
Author: Salbei <[email protected]>
Date:   Mon Jan 7 14:58:26 2019 +0100

    Merge branch 'AdlerSalbei-Trench-improvements-from-Grad-Trenches' into Trench-improvements-from-Grad-Trenches

commit e2f61a9
Merge: 2a7ce51 c51e202
Author: Salbei <[email protected]>
Date:   Mon Jan 7 14:57:32 2019 +0100

    Merge pull request acemod#2 from AdlerSalbei/AdlerSalbei-Trench-improvements-from-Grad-Trenches

    Added Intercept macro,changed to CBA events

commit 2a7ce51
Merge: dfdd3e1 6690574
Author: Salbei <[email protected]>
Date:   Mon Jan 7 14:55:59 2019 +0100

    Merge pull request acemod#1 from acemod/AdlerSalbei-Trench-improvements-from-Grad-Trenches

    bring it up to speed

commit 160cc4c
Author: AdlerSalbei <[email protected]>
Date:   Mon Jan 7 14:49:27 2019 +0100

    Some fixes

commit c51e202
Author: Salbei <[email protected]>
Date:   Mon Jan 7 11:23:30 2019 +0100

    Added Intercept macro,changed to CBA events

commit 6690574
Author: commy2 <[email protected]>
Date:   Thu Dec 27 14:03:42 2018 +0100

    delete conditional PREP, remove spawn

commit f217af4
Author: commy2 <[email protected]>
Date:   Thu Dec 27 13:32:28 2018 +0100

    hide_trench animation

commit 3130f81
Merge: cd09c2b dfdd3e1
Author: commy2 <[email protected]>
Date:   Thu Dec 27 11:22:07 2018 +0100

    Merge branch 'Trench-improvements-from-Grad-Trenches' of https://github.com/AdlerSalbei/ACE3 into AdlerSalbei-Trench-improvements-from-Grad-Trenches

commit dfdd3e1
Author: Salbei <[email protected]>
Date:   Sat Dec 22 20:02:48 2018 +0100

    fixed some oversights

commit cb09624
Author: Salbei <[email protected]>
Date:   Fri Dec 21 10:46:18 2018 +0100

    fixed missing (

commit cd71131
Author: Salbei <[email protected]>
Date:   Fri Dec 21 10:44:34 2018 +0100

    change to the handling of multiple diggers

commit 003c301
Author: Salbei <[email protected]>
Date:   Wed Dec 19 23:08:45 2018 +0100

    Prototyped new multi dig (needs more testing)

commit 9b0591b
Author: Salbei <[email protected]>
Date:   Mon Dec 17 11:23:04 2018 +0100

    Improved placement & and fixed init issue

commit ccdbfd7
Author: Salbei <[email protected]>
Date:   Mon Dec 17 00:17:33 2018 +0100

    changed CfgWorldTextures

commit 6f81734
Author: Salbei <[email protected]>
Date:   Fri Dec 14 08:04:28 2018 +0100

    forgot the config.cpp

commit 4db5272
Author: Salbei <[email protected]>
Date:   Fri Dec 14 07:59:34 2018 +0100

    changed config name

commit 7c79240
Author: Salbei <[email protected]>
Date:   Fri Dec 14 07:47:46 2018 +0100

    bee bee

commit 3c10fe4
Author: Salbei <[email protected]>
Date:   Thu Dec 13 15:16:43 2018 +0100

    Fixed more suggestions

commit 8fca5ad
Author: Salbei <[email protected]>
Date:   Tue Dec 11 23:30:05 2018 +0100

    More fixes

commit 495f049
Author: Salbei <[email protected]>
Date:   Mon Dec 10 19:02:57 2018 +0100

    submitted test values

commit f33224a
Author: Salbei <[email protected]>
Date:   Mon Dec 10 18:58:08 2018 +0100

    Fixes

commit 95bc511
Author: jonpas <[email protected]>
Date:   Mon Dec 10 18:13:11 2018 +0100

    Apply suggestions from code review

    Co-Authored-By: AdlerSalbei <[email protected]>

commit ab5b1cf
Author: jonpas <[email protected]>
Date:   Mon Dec 10 18:01:13 2018 +0100

    Update addons/trenches/functions/fnc_canPlaceCamouflage.sqf

    Co-Authored-By: AdlerSalbei <[email protected]>

commit 5047df8
Author: jonpas <[email protected]>
Date:   Mon Dec 10 18:00:51 2018 +0100

    Update addons/trenches/functions/fnc_canPlaceCamouflage.sqf

    Co-Authored-By: AdlerSalbei <[email protected]>

commit cc1b2a7
Author: jonpas <[email protected]>
Date:   Mon Dec 10 18:00:28 2018 +0100

    Update addons/trenches/functions/fnc_canPlaceCamouflage.sqf

    Co-Authored-By: AdlerSalbei <[email protected]>

commit 5d1c6a9
Author: jonpas <[email protected]>
Date:   Mon Dec 10 17:59:56 2018 +0100

    Update addons/trenches/functions/fnc_canPlaceCamouflage.sqf

    Co-Authored-By: AdlerSalbei <[email protected]>

commit 1fad811
Author: jonpas <[email protected]>
Date:   Mon Dec 10 17:59:35 2018 +0100

    Update addons/trenches/functions/fnc_canHelpDiggingTrench.sqf

    Co-Authored-By: AdlerSalbei <[email protected]>

commit e05e216
Author: jonpas <[email protected]>
Date:   Mon Dec 10 17:59:14 2018 +0100

    Update addons/trenches/functions/fnc_canHelpDiggingTrench.sqf

    Co-Authored-By: AdlerSalbei <[email protected]>

commit 5dde8f6
Author: jonpas <[email protected]>
Date:   Mon Dec 10 17:58:54 2018 +0100

    Update addons/trenches/functions/fnc_canHelpDiggingTrench.sqf

    Co-Authored-By: AdlerSalbei <[email protected]>

commit 3ec4aa5
Author: jonpas <[email protected]>
Date:   Mon Dec 10 17:58:02 2018 +0100

    Update addons/trenches/functions/fnc_applyCamouflageAttribute.sqf

    Co-Authored-By: AdlerSalbei <[email protected]>

commit 550dcd1
Author: jonpas <[email protected]>
Date:   Mon Dec 10 17:57:37 2018 +0100

    Update addons/trenches/functions/fnc_applyCamouflageAttribute.sqf

    Co-Authored-By: AdlerSalbei <[email protected]>

commit e7426b4
Author: jonpas <[email protected]>
Date:   Mon Dec 10 17:56:21 2018 +0100

    Update addons/trenches/functions/fnc_addDigger.sqf

    Co-Authored-By: AdlerSalbei <[email protected]>

commit d1ee84f
Author: jonpas <[email protected]>
Date:   Mon Dec 10 17:51:54 2018 +0100

    Update addons/trenches/functions/fnc_addDigger.sqf

    Co-Authored-By: AdlerSalbei <[email protected]>

commit e0b7a87
Author: commy2 <[email protected]>
Date:   Mon Dec 10 17:34:10 2018 +0100

    return value no ;

commit 2962b86
Author: commy2 <[email protected]>
Date:   Sat Dec 8 17:33:08 2018 +0100

    formatting

commit 13fc4da
Author: Salbei <[email protected]>
Date:   Fri Dec 7 08:57:56 2018 +0100

    Fixed all open issues

commit a746708
Author: Salbei <[email protected]>
Date:   Mon Dec 3 08:12:11 2018 +0100

    Small fix

commit ec140f8
Author: Salbei <[email protected]>
Date:   Sun Dec 2 19:52:14 2018 +0100

    Fixed misspellings

commit 4200585
Author: Salbei <[email protected]>
Date:   Sun Dec 2 17:54:15 2018 +0100

    Fixed Texturing

commit 9b8d73f
Author: Salbei <[email protected]>
Date:   Sun Dec 2 14:19:19 2018 +0100

    Some more minor fixes

commit 5a00cdc
Author: Salbei <[email protected]>
Date:   Sun Dec 2 13:57:31 2018 +0100

    Fixed a lot of Issues

commit 08ff436
Author: Salbei <[email protected]>
Date:   Sat Dec 1 23:27:35 2018 +0100

    Missed 1

commit 2506d03
Author: Salbei <[email protected]>
Date:   Sat Dec 1 23:24:17 2018 +0100

    fixed \ issue

commit ae71061
Author: Salbei <[email protected]>
Date:   Sat Dec 1 21:08:49 2018 +0100

    Fixed Tabs

commit 30b524d
Author: Salbei <[email protected]>
Date:   Sat Dec 1 21:03:39 2018 +0100

    Made the validator happy

commit 69ea3d2
Author: Salbei <[email protected]>
Date:   Sat Dec 1 20:47:29 2018 +0100

    Made it more ace compatible

commit 17945ab
Author: Salbei <[email protected]>
Date:   Fri Nov 30 22:20:14 2018 +0100

    Some fixes

commit ec9b458
Author: Salbei <[email protected]>
Date:   Fri Nov 30 15:24:02 2018 +0100

    Merging newest Grad Trenches release
@jonpas jonpas dismissed commy2’s stale review July 1, 2020 14:20

Outdated

@jonpas jonpas dismissed their stale review July 1, 2020 14:20

Outdated

@jonpas
Copy link
Member

jonpas commented Jul 1, 2020

Merge appears to have broken something, reported trenches only build 50% and then cancel.

@Vdauphin Vdauphin mentioned this pull request Aug 2, 2020
Closed
@jonpas
Copy link
Member

jonpas commented Apr 20, 2021

@AdlerSalbei surfaceTexture command is now available, if you still feel like finishing this.

  • Remove any intercept-related code as it is not needed anymore.
  • Fix merge conflicts.

@AdlerSalbei
Copy link
Author

To be quite honest, the mod has a lot further since my last push to this PR. I'm not really interested in completing it, since the mod works perfectly fine and is much less work.

@Drofseh
Copy link
Contributor

Drofseh commented May 11, 2021

@AdlerSalbei Would you have objections to anyone else doing the work? I'd like to at least get the extra trench types into Ace.

@AdlerSalbei
Copy link
Author

@Drofseh Since those are the old models, no. They are just bad.

@jonpas jonpas removed this from the 3.15.0 milestone Oct 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Drofseh Drofseh Drofseh left review comments

@TrainDoctor TrainDoctor TrainDoctor left review comments

@jonpas jonpas jonpas left review comments

@commy2 commy2 commy2 left review comments

@BrettMayson BrettMayson BrettMayson left review comments

@dedmen dedmen dedmen requested changes

Assignees
No one assigned
Labels
kind/enhancement Release Notes: **IMPROVED:** status/needs-testing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@AdlerSalbei @jokoho48 @dedmen @jonpas @Blutze @commy2 @TrainDoctor @Drofseh @BrettMayson