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

Agm interaction port #2

Merged
merged 8 commits into from
Jan 12, 2015
Merged

Agm interaction port #2

merged 8 commits into from
Jan 12, 2015

Conversation

nicolasbadano
Copy link
Contributor

Port of AGM_Interaction:

  • Macros for all global variables
  • Functions loaded with PREP
  • Main variables and stringtables have the ACE prefix instead of AGM

jaynus added a commit that referenced this pull request Jan 12, 2015
@jaynus
Merge pull request #2 from KoffeinFlummi/agmInteractionPort
cc987c2 
Agm interaction port
@jaynus jaynus merged commit cc987c2 into master Jan 12, 2015
@nicolasbadano nicolasbadano deleted the agmInteractionPort branch January 12, 2015 19:02
bux added a commit that referenced this pull request Mar 24, 2015
@bux
fix authors #2
7744d5b
bux pushed a commit that referenced this pull request Apr 9, 2015
@kh-jda
lowercase page #2
4209fbc
bux added a commit that referenced this pull request Apr 14, 2015
@bux
lowercase missionmaker #2
bec4e20
nicolasbadano pushed a commit that referenced this pull request Apr 14, 2015
@gienkov
Merge pull request #2 from acemod/master
97c9c9f 
Update original
@jaynus jaynus mentioned this pull request Apr 17, 2015
Closed
KoffeinFlummi pushed a commit that referenced this pull request Apr 20, 2015
@gienkov
PL fix #2
8530684
KoffeinFlummi pushed a commit that referenced this pull request May 1, 2015
@Dimaslg
Merge pull request #2 from acemod/master
e394a1a 
Update to current version of ace 3
bux added a commit that referenced this pull request May 5, 2015
@bux
adjust margins on mobile #2
5090888
thojkooi pushed a commit that referenced this pull request May 14, 2015
@gienkov
Some small errors fixed #2
ed1acd8 
Mainly tabs and wrong italian strings (got those from newest master)
KoffeinFlummi pushed a commit that referenced this pull request May 14, 2015
@alganthe
Merge pull request #2 from alganthe/documentation
ea6f3ad 
Documentation pass
bux added a commit that referenced this pull request May 22, 2015
@bux
finish searchpage #2
8c67cf3
@Bummeri Bummeri mentioned this pull request Jun 13, 2015
Closed
nicolasbadano pushed a commit that referenced this pull request Jun 14, 2015
@Legolasindar
Merge pull request #2 from acemod/master
4d598d2 
update my master fork
MikeMatrix pushed a commit to MikeMatrix/ACE3 that referenced this pull request Aug 3, 2015
@jokoho48
Merge pull request acemod#2 from MikeMatrix/codeCleanup
f02a6de 
Code Cleanup
@MagielBruntink MagielBruntink mentioned this pull request Aug 9, 2015
Closed
voiperr added a commit to voiperr/ACE3 that referenced this pull request Aug 11, 2015
@voiperr
Git fix acemod#2.
e0ed81d
bux added a commit that referenced this pull request Sep 17, 2015
@bux
ACEREP #2
9c511d1
bux pushed a commit that referenced this pull request Nov 18, 2015
@dudakov
Merge pull request #2 from acemod/master
16792fe 
Fork update from master
thojkooi pushed a commit that referenced this pull request Nov 20, 2015
@GitHawk
Merge pull request #2 from jonpas/rearmFixes
f741624 
Rearm Fixes & Additions & Cleanup
thojkooi pushed a commit that referenced this pull request Feb 27, 2016
@BaerMitUmlaut
Merge pull request #2 from gienkov/translatefastrop
a7a157d 
translate fastroping
thojkooi pushed a commit that referenced this pull request Feb 27, 2016
Merge pull request #2 from acemod/master
e5308fb 
Update Fork
PabstMirror pushed a commit that referenced this pull request Feb 11, 2017
Merge pull request #2 from NorXAengell/master
66a321d 
French translation of "Advanced fatigue" and "Advanced throwing"
@gienkov gienkov mentioned this pull request May 3, 2017
Closed
jonpas pushed a commit that referenced this pull request Oct 7, 2017
@shukari @jonpas
German stringtable updates (#5539)
22c8ef1 
* advanced_fatigue stringtable german

* cargo stringtable german

* cookoff stringtable german

* fastroping stringtable german

* hellfire stringtable german

* nlaw stringtable german

* overpressure stringtable german

* quickmount stringtable german

* refuel stringtable german

* repair stringtable german

* scopes stringtable german

* slideshow stringtable german

* spectator stringtable german

* zeus stringtable german

* cookoff stringtable german #2

* hellfire stringtable german #2

* nlaw stringtable german #2

* overpressure stringtable german #2

* quickmount stringtable german#2

* refuel stringtable german #2

* scopes stringtable german #2

* slideshow stringtable german #2

* zeus stringtable german #2

* tiny fix

* tiny fix

* quickmount stringtable german #3

* fastroping stringtable german #2

* captives stringtable german

* cargo stringtable german

* cookoff stringtable german

* tiny change

* cargo stringtable german

* fcs stringtable german

* Fix german strings for scopes
commy2 pushed a commit that referenced this pull request Oct 9, 2018
@Drofseh
Revert "Update from acemod master (#1)" (#2)
5e396a3 
This reverts commit 4d1a519.
@Jaaxxxxon Jaaxxxxon mentioned this pull request Jun 6, 2019
Open
BaerMitUmlaut pushed a commit that referenced this pull request Aug 5, 2019
@Drofseh
Revert "Update from acemod master (#1)" (#2)
5ead6c0 
This reverts commit 4d1a519.
commy2 pushed a commit that referenced this pull request Dec 1, 2019
@dfr1238
Merge pull request #2 from acemod/master
77179fb 
Merge pull request #7287 from dfr1238/master
dgibso29 referenced this pull request in dgibso29/ACE3 Jun 3, 2020
@dgibso29
PR Feedback #2
5473c72 
- Increased reopen coefficient upper limit from 2 to 5.
PabstMirror pushed a commit that referenced this pull request Jun 13, 2020
@dgibso29
Medical - Add Global Wound Reopen Chance Modifer (#7747)
185c15d 
* Added Bandage Reopening Chance Modifier

* Added Wound Reopen Chance Addon Setting

* Fixed dumb error in localization setup

* Credit!

* Resolved issue with Addon Settings definition & removed testing values.

* PR Feedback #1

- Removed unnecessary whitespace on LN 46
- Call global var directly at LN 87
- Updated Wound Reopen Chance localized name & description

* PR Feedback #2

- Increased reopen coefficient upper limit from 2 to 5.

* Changed author credit to reflect GitHub email.
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 <jonpas33@gmail.com>
Date:   Wed Jul 1 15:28:22 2020 +0200

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

commit c315493
Author: Salbei <salbei@gruppe-adler.de>
Date:   Sat Aug 31 14:33:36 2019 +0200

    fixed wrong indentations

commit cce03a2
Author: Salbei <salbei@gruppe-adler.de>
Date:   Sat Aug 31 14:15:11 2019 +0200

    removed a wrong check

commit d235d08
Author: Salbei <salbei@gruppe-adler.de>
Date:   Sat Aug 31 14:03:05 2019 +0200

    changed the for-loop to make it less ugly

commit 501f0ec
Author: Salbei <salbei@gruppe-adler.de>
Date:   Fri Aug 23 22:42:35 2019 +0200

    fix Spacing

commit 7fcb859
Author: Salbei <salbei@gruppe-adler.de>
Date:   Fri Aug 23 18:53:57 2019 +0200

    improved script & changed GVAR name

commit e6de0f2
Author: Salbei <salbei@gruppe-adler.de>
Date:   Fri Aug 23 18:20:32 2019 +0200

    added a space at commy2 wish

commit da0c1c0
Author: Salbei <salbei@gruppe-adler.de>
Date:   Fri Aug 23 18:12:51 2019 +0200

    fixed tabs

commit 147d140
Author: Salbei <salbei@gruppe-adler.de>
Date:   Fri Aug 23 18:09:34 2019 +0200

    fixed set mulit Gvar & added more maps

commit 40e1b1b
Author: Salbei <salbei@gruppe-adler.de>
Date:   Sat Aug 17 18:25:32 2019 +0200

    fixed linter issue

commit 55fa2af
Author: Salbei <salbei@gruppe-adler.de>
Date:   Sat Aug 17 18:19:38 2019 +0200

    fixed remaining issues

commit 5dd95e8
Author: Salbei <salbei@gruppe-adler.de>
Date:   Thu Jun 6 00:48:07 2019 +0200

    more wörk to do

commit 12faf79
Author: Salbei <salbei@gruppe-adler.de>
Date:   Wed Jun 5 21:43:09 2019 +0200

    minor adjustments

commit c9a7eea
Author: Salbei <salbei@gruppe-adler.de>
Date:   Wed Jun 5 00:06:07 2019 +0200

    fixed placement

commit ca424c2
Author: Salbei <salbei@gruppe-adler.de>
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 <salbei@gruppe-adler.de>
Date:   Mon Jun 3 12:25:54 2019 +0200

    fixed spacing

commit 1606749
Author: Salbei <salbei@gruppe-adler.de>
Date:   Mon Jun 3 12:05:09 2019 +0200

    Some changes

commit adef5d5
Merge: df304b5 e2f61a9
Author: Salbei <salbei@gruppe-adler.de>
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 <salbei@gruppe-adler.de>
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 <salbei@gruppe-adler.de>
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 <salbei@gruppe-adler.de>
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 <salbei@gruppe-adler.de>
Date:   Mon Jan 7 14:49:27 2019 +0100

    Some fixes

commit c51e202
Author: Salbei <salbei@gruppe-adler.de>
Date:   Mon Jan 7 11:23:30 2019 +0100

    Added Intercept macro,changed to CBA events

commit 6690574
Author: commy2 <commy-2@gmx.de>
Date:   Thu Dec 27 14:03:42 2018 +0100

    delete conditional PREP, remove spawn

commit f217af4
Author: commy2 <commy-2@gmx.de>
Date:   Thu Dec 27 13:32:28 2018 +0100

    hide_trench animation

commit 3130f81
Merge: cd09c2b dfdd3e1
Author: commy2 <commy-2@gmx.de>
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 <salbei@gruppe-adler.de>
Date:   Sat Dec 22 20:02:48 2018 +0100

    fixed some oversights

commit cb09624
Author: Salbei <salbei@gruppe-adler.de>
Date:   Fri Dec 21 10:46:18 2018 +0100

    fixed missing (

commit cd71131
Author: Salbei <salbei@gruppe-adler.de>
Date:   Fri Dec 21 10:44:34 2018 +0100

    change to the handling of multiple diggers

commit 003c301
Author: Salbei <salbei@gruppe-adler.de>
Date:   Wed Dec 19 23:08:45 2018 +0100

    Prototyped new multi dig (needs more testing)

commit 9b0591b
Author: Salbei <salbei@gruppe-adler.de>
Date:   Mon Dec 17 11:23:04 2018 +0100

    Improved placement & and fixed init issue

commit ccdbfd7
Author: Salbei <salbei@gruppe-adler.de>
Date:   Mon Dec 17 00:17:33 2018 +0100

    changed CfgWorldTextures

commit 6f81734
Author: Salbei <salbei@gruppe-adler.de>
Date:   Fri Dec 14 08:04:28 2018 +0100

    forgot the config.cpp

commit 4db5272
Author: Salbei <salbei@gruppe-adler.de>
Date:   Fri Dec 14 07:59:34 2018 +0100

    changed config name

commit 7c79240
Author: Salbei <salbei@gruppe-adler.de>
Date:   Fri Dec 14 07:47:46 2018 +0100

    bee bee

commit 3c10fe4
Author: Salbei <salbei@gruppe-adler.de>
Date:   Thu Dec 13 15:16:43 2018 +0100

    Fixed more suggestions

commit 8fca5ad
Author: Salbei <salbei@gruppe-adler.de>
Date:   Tue Dec 11 23:30:05 2018 +0100

    More fixes

commit 495f049
Author: Salbei <salbei@gruppe-adler.de>
Date:   Mon Dec 10 19:02:57 2018 +0100

    submitted test values

commit f33224a
Author: Salbei <salbei@gruppe-adler.de>
Date:   Mon Dec 10 18:58:08 2018 +0100

    Fixes

commit 95bc511
Author: jonpas <jonpas33@gmail.com>
Date:   Mon Dec 10 18:13:11 2018 +0100

    Apply suggestions from code review

    Co-Authored-By: AdlerSalbei <salbei@gruppe-adler.de>

commit ab5b1cf
Author: jonpas <jonpas33@gmail.com>
Date:   Mon Dec 10 18:01:13 2018 +0100

    Update addons/trenches/functions/fnc_canPlaceCamouflage.sqf

    Co-Authored-By: AdlerSalbei <salbei@gruppe-adler.de>

commit 5047df8
Author: jonpas <jonpas33@gmail.com>
Date:   Mon Dec 10 18:00:51 2018 +0100

    Update addons/trenches/functions/fnc_canPlaceCamouflage.sqf

    Co-Authored-By: AdlerSalbei <salbei@gruppe-adler.de>

commit cc1b2a7
Author: jonpas <jonpas33@gmail.com>
Date:   Mon Dec 10 18:00:28 2018 +0100

    Update addons/trenches/functions/fnc_canPlaceCamouflage.sqf

    Co-Authored-By: AdlerSalbei <salbei@gruppe-adler.de>

commit 5d1c6a9
Author: jonpas <jonpas33@gmail.com>
Date:   Mon Dec 10 17:59:56 2018 +0100

    Update addons/trenches/functions/fnc_canPlaceCamouflage.sqf

    Co-Authored-By: AdlerSalbei <salbei@gruppe-adler.de>

commit 1fad811
Author: jonpas <jonpas33@gmail.com>
Date:   Mon Dec 10 17:59:35 2018 +0100

    Update addons/trenches/functions/fnc_canHelpDiggingTrench.sqf

    Co-Authored-By: AdlerSalbei <salbei@gruppe-adler.de>

commit e05e216
Author: jonpas <jonpas33@gmail.com>
Date:   Mon Dec 10 17:59:14 2018 +0100

    Update addons/trenches/functions/fnc_canHelpDiggingTrench.sqf

    Co-Authored-By: AdlerSalbei <salbei@gruppe-adler.de>

commit 5dde8f6
Author: jonpas <jonpas33@gmail.com>
Date:   Mon Dec 10 17:58:54 2018 +0100

    Update addons/trenches/functions/fnc_canHelpDiggingTrench.sqf

    Co-Authored-By: AdlerSalbei <salbei@gruppe-adler.de>

commit 3ec4aa5
Author: jonpas <jonpas33@gmail.com>
Date:   Mon Dec 10 17:58:02 2018 +0100

    Update addons/trenches/functions/fnc_applyCamouflageAttribute.sqf

    Co-Authored-By: AdlerSalbei <salbei@gruppe-adler.de>

commit 550dcd1
Author: jonpas <jonpas33@gmail.com>
Date:   Mon Dec 10 17:57:37 2018 +0100

    Update addons/trenches/functions/fnc_applyCamouflageAttribute.sqf

    Co-Authored-By: AdlerSalbei <salbei@gruppe-adler.de>

commit e7426b4
Author: jonpas <jonpas33@gmail.com>
Date:   Mon Dec 10 17:56:21 2018 +0100

    Update addons/trenches/functions/fnc_addDigger.sqf

    Co-Authored-By: AdlerSalbei <salbei@gruppe-adler.de>

commit d1ee84f
Author: jonpas <jonpas33@gmail.com>
Date:   Mon Dec 10 17:51:54 2018 +0100

    Update addons/trenches/functions/fnc_addDigger.sqf

    Co-Authored-By: AdlerSalbei <salbei@gruppe-adler.de>

commit e0b7a87
Author: commy2 <commy-2@gmx.de>
Date:   Mon Dec 10 17:34:10 2018 +0100

    return value no ;

commit 2962b86
Author: commy2 <commy-2@gmx.de>
Date:   Sat Dec 8 17:33:08 2018 +0100

    formatting

commit 13fc4da
Author: Salbei <salbei@gruppe-adler.de>
Date:   Fri Dec 7 08:57:56 2018 +0100

    Fixed all open issues

commit a746708
Author: Salbei <salbei@gruppe-adler.de>
Date:   Mon Dec 3 08:12:11 2018 +0100

    Small fix

commit ec140f8
Author: Salbei <salbei@gruppe-adler.de>
Date:   Sun Dec 2 19:52:14 2018 +0100

    Fixed misspellings

commit 4200585
Author: Salbei <salbei@gruppe-adler.de>
Date:   Sun Dec 2 17:54:15 2018 +0100

    Fixed Texturing

commit 9b8d73f
Author: Salbei <salbei@gruppe-adler.de>
Date:   Sun Dec 2 14:19:19 2018 +0100

    Some more minor fixes

commit 5a00cdc
Author: Salbei <salbei@gruppe-adler.de>
Date:   Sun Dec 2 13:57:31 2018 +0100

    Fixed a lot of Issues

commit 08ff436
Author: Salbei <salbei@gruppe-adler.de>
Date:   Sat Dec 1 23:27:35 2018 +0100

    Missed 1

commit 2506d03
Author: Salbei <salbei@gruppe-adler.de>
Date:   Sat Dec 1 23:24:17 2018 +0100

    fixed \ issue

commit ae71061
Author: Salbei <salbei@gruppe-adler.de>
Date:   Sat Dec 1 21:08:49 2018 +0100

    Fixed Tabs

commit 30b524d
Author: Salbei <salbei@gruppe-adler.de>
Date:   Sat Dec 1 21:03:39 2018 +0100

    Made the validator happy

commit 69ea3d2
Author: Salbei <salbei@gruppe-adler.de>
Date:   Sat Dec 1 20:47:29 2018 +0100

    Made it more ace compatible

commit 17945ab
Author: Salbei <salbei@gruppe-adler.de>
Date:   Fri Nov 30 22:20:14 2018 +0100

    Some fixes

commit ec9b458
Author: Salbei <salbei@gruppe-adler.de>
Date:   Fri Nov 30 15:24:02 2018 +0100

    Merging newest Grad Trenches release
@OverlordZorn OverlordZorn mentioned this pull request Apr 7, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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
@nicolasbadano @jaynus