VKing
058ea4e8f4
Actual editor mines
2016-01-13 01:03:50 +01:00
VKing
f90dd9fed8
Allow SLAMs to use long range transmitter
2016-01-13 00:14:17 +01:00
VKing
46643d44d0
Add editor/zeus modules for different trigger options
2016-01-13 00:13:56 +01:00
VKing
a07d456476
Change small IEDs to use smaller pressure plates
2016-01-12 23:17:10 +01:00
VKing
61f288c9cc
Rename custom classes with ACE_ prefix
2016-01-12 23:16:49 +01:00
Thomas Kooi
cd23228fbc
Merge pull request #3148 from acemod/nerfReflectedBackblast
...
Nerf the amount of backblast received by the firer via reflection
2016-01-12 18:03:39 +01:00
esteldunedain
455c53a084
Nerf the amount of backblast received by the firer via reflection. Fix #2890 .
2016-01-12 13:09:41 -03:00
PabstMirror
8cbf31a375
Fix undefined variable error in FUNC(debug)
...
possibly related to #2677 - threw error from switchToGroupSide
2016-01-11 23:37:44 -06:00
PabstMirror
0397b3f9f4
Merge branch 'release'
2016-01-09 15:25:09 -06:00
Thomas Kooi
1ee4c12a21
Merge pull request #3060 from acemod/abVerticleCentripetal
...
Ab - Fix Eotvos effect
2016-01-08 13:06:04 +01:00
Thomas Kooi
45986c0efa
Merge pull request #3128 from acemod/rhs-m69-UBCfix
...
Fix M69 Grenade UBC in RHS Compat
2016-01-07 10:04:15 +01:00
PabstMirror
b731232719
Fix M69 Grenade UBC in RHS Compat
2016-01-07 00:59:31 -06:00
PabstMirror
71d4afcace
Merge pull request #3127 from acemod/resetCacheOnNewVersion
...
Reset make.py Cache on new build version
2016-01-06 23:39:20 -06:00
commy2
39156e160c
Merge pull request #3125 from acemod/privatekeywordcleanup
...
Code cleanup 1.54, 2
2016-01-06 23:43:01 +01:00
commy2
de13518177
explode macro to params
2016-01-06 22:49:22 +01:00
commy2
e56e18bff3
Code cleanup 1.54
2016-01-06 22:42:02 +01:00
commy2
0bc540305d
Merge pull request #3020 from acemod/privatekeyword
...
Common code cleanup 1.54
2016-01-06 21:31:42 +01:00
commy2
abf516aeb1
manual merge
2016-01-06 15:57:09 +01:00
Glowbal
c042703786
Merge branch 'release'
2016-01-05 22:55:34 +01:00
Glowbal
509e142de8
bump version 3.4.2
2016-01-05 22:42:37 +01:00
commy2
7eaa55f9df
Merge pull request #3022 from acemod/bodybagevent
...
add event for placing units in body bags
2016-01-05 21:59:47 +01:00
commy2
74f78c2dd1
Merge pull request #3010 from acemod/cargoboxfilters
...
Add more filters to ammo boxes
2016-01-05 21:55:24 +01:00
commy2
279b48f112
Merge pull request #3110 from acemod/gogglesfiredBIS
...
fix usage of deprectated fired XEH, fix #3088
2016-01-05 21:52:53 +01:00
commy2
3854a5c989
Merge pull request #3109 from acemod/ThingX
...
fix ThingX capitalization, fix #3076
2016-01-05 21:52:42 +01:00
PabstMirror
a72e07fcaa
Goggles - change some events to be client only
...
all these events have `if (_unit != ACE_player) exitWith {true};`
2016-01-03 11:01:14 -06:00
commy2
3974c255a0
fix usage of deprectated fired XEH, fix #3088
2016-01-03 15:27:16 +01:00
commy2
427628045c
fix ThingX capitalization, fix #3076
2016-01-03 15:21:38 +01:00
commy2
ecad63e34d
integrate filters pbo into inventory pbo
2016-01-03 14:47:37 +01:00
SilentSpike
776f9352fe
Merge pull request #3099 from acemod/specFixScriptError
...
Kill Spectator PFEH when exiting spectator
2016-01-01 17:19:41 +00:00
PabstMirror
79a7bb54aa
Kill Spectator PFEH when exiting spectator
...
Should fix #2989
There is a race condition between these 4 PFEH and the "onUnload" event
in handleInterface.
If the PFEHs run first they will use nil variables and throw a script
error.
This sets them to nil immediately when exiting spectator
2016-01-01 00:14:48 -06:00
PabstMirror
5f74daec42
Fix dupe german stringtable entry
2015-12-31 22:28:35 -06:00
PabstMirror
fb0738bd30
Merge branch 'master' into release
2015-12-31 20:27:26 -06:00
PabstMirror
32b4416c29
Merge pull request #3064 from GitHawk/refuel
...
Adaptation of fnc_makeJerryCan to new interact_menu
2015-12-31 20:12:43 -06:00
PabstMirror
40e85f832b
Merge pull request #3097 from acemod/fixStringtablesMerge
...
Fix stringtables merge
2015-12-31 20:10:09 -06:00
PabstMirror
070ca489b4
Merge pull request #3098 from acemod/RHS_compat_fix3040
...
RHS Compat. Fix M113 inheritance
2015-12-31 17:50:37 -06:00
VKing
0fb2fa1b8f
Fix style
2015-12-31 23:39:09 +01:00
VKing
f28e0920c4
Fix inheritance from #3040
2015-12-31 23:38:49 +01:00
PabstMirror
586449eef9
Merge pull request #3084 from acemod/cbaZeusIntegration
...
CBA zeus integration
2015-12-31 15:15:23 -06:00
PabstMirror
19f54071f1
Merge pull request #3052 from acemod/isPlayerRemoteZeus
...
Add support for non local Zeus RC in common-isPlayer
2015-12-31 15:14:44 -06:00
PabstMirror
0c9cba0896
Merge pull request #3050 from acemod/rhs_compat_fixSpottingRifleOP
...
RHS Compat fix for SMAW spotting rifle backblast
2015-12-31 14:59:23 -06:00
PabstMirror
8ac3a09a3b
Merge pull request #3045 from sargken/master
...
RHS Compat Enhancement for Weapons and Grenades
2015-12-31 14:58:29 -06:00
PabstMirror
749cfa07d4
Merge pull request #3040 from FadiCBB/master
...
RHS Compat fix for RU Sprut turret + Disabling FCS for M113 family
2015-12-31 14:55:32 -06:00
PabstMirror
62a94759c4
Merge pull request #3092 from acemod/minorSittingCleanup
...
Sitting Cleanup
2015-12-31 14:50:31 -06:00
PabstMirror
8bdd5d0597
Merge remote-tracking branch 'brGuy/Translations-December' into fixStringtablesMerge
2015-12-31 14:30:29 -06:00
licht-im-Norden87
2d64d54d98
Update German Stringtable
...
Iam sure there was a translation some time ago. Someone must have deleted it.
spelling mistake
Update Stringtable
100% some of them already existed in german language
Update stringtable.xml
spelling mistake
Update stringtable.xml
Iam not sure if SSWT is a Scharfschützenzweibein. However, it was used before, i just adpated it.
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Handelt es sich bei dem Modell den auch um das Produkt von Sharpshooters® http://shop.centermassinc.com/Sharpshooters-Sniper-Weapon-Tripod-Kit-764737932766.htm bzw ist ads erkennbar. Ich persönlich halte die Bezeichnung SSWT-Kit für ein wenig ungünstig.
Update stringtable.xml
2015-12-31 14:17:13 -06:00
PabstMirror
cf27571b5a
Merge pull request #3007 from dudakov/master
...
Russian Translations - Update
2015-12-31 14:11:45 -06:00
PabstMirror
7b077c5f19
Merge pull request #3078 from acemod/fixGoggles3rd
...
Fix Third Person Goggle Effect Not Displaying
2015-12-31 10:24:23 -06:00
Thomas Kooi
40afa45417
Merge pull request #3058 from freghar/isturnedout
...
fix inverted isTurnedOut for map lighting
2015-12-31 13:03:42 +01:00
Thomas Kooi
aa1c48e8e7
Merge pull request #3094 from acemod/fixTriageMacro
...
Fix Medical Triagecard Macro
2015-12-31 12:17:59 +01:00
Garth "L-H" de Wet
5f7bbd823f
Merge pull request #3085 from acemod/tripwireEnhancement
...
Explosive enhancements
2015-12-31 11:37:43 +02:00
