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
VKing
9985988987
Change ACE_Player to _unit
2016-01-06 18:05:06 +01:00
jokoho48
daf2fc2669
remove ccp issue in settings
...
prevent setCaptive if unit is wake up
2016-01-06 18:01:24 +01:00
jokoho48
6d49bbda28
add delay to Unconsciousness Captivity(posible fix for #3121 )
2016-01-06 17:46:59 +01:00
commy2
abf516aeb1
manual merge
2016-01-06 15:57:09 +01:00
PabstMirror
4c229c92f5
Add Stringtable Entry
2016-01-05 17:29:01 -06:00
PabstMirror
b6dce03c90
Fix Header
2016-01-05 17:16:47 -06:00
VKing
1706ca0adc
Move detonate actions from "Detonate" layer to "Explosives" layer.
...
Remove inconsistent ">>" from explosive actions.
2016-01-06 00:06:06 +01:00
VKing
cc8ac69feb
Add function and action to detonate all explosives on a detonator
2016-01-05 23:47:01 +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
PabstMirror
175624620c
Fix inverting wind direction each sync update
...
Fix #1052 (and maybe #1708 )
2016-01-05 15:29:52 -06: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
e2c08d2c26
Privates, Headers, Merge 4 PFEH into one
2016-01-05 01:39:29 -06:00
PabstMirror
46cb90254a
Add ACE_HashLocation to common
2016-01-04 21:48:26 -06:00
Luigi
7f9c766770
Fixed and added French Translation
2016-01-04 16:47:15 +01:00
Luigi
a079f213c0
Fix French translation
...
Fix an error in a French translation
2016-01-04 16:19:23 +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
Alessandro Foresi
bafde22c71
Fix: Indentation
2016-01-03 16:47:41 +01: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
jonpas
b93183fef9
Shorten if check
2016-01-03 14:05:50 +01:00
Alessandro Foresi
2d152675fc
Add: IT small translations, DE removed duplicate
2016-01-03 13:02:01 +01:00
Alessandro Foresi
c16d97cad0
Merge branch 'master' into translation/15bn/alef
2016-01-03 12:23:27 +01:00
Braxton Williams
ce069c8f3c
Change Sandbag category
2016-01-02 18:25:48 -06:00
jonpas
6edd7ab093
Change ACE_HeadlessClientJoined event to be global and always triggered
2016-01-02 14:42:05 +01:00
jonpas
971d8d1e02
Add @System98 to AUTHORS.txt
2016-01-02 14:35:39 +01:00
jonpas
a1866a561b
Add Headless
2016-01-02 14:23:14 +01:00
bux
977bda83e5
add 2 new events, add unit to place event
...
defuse and explodeOnDefuse
2016-01-01 21:47:39 +01:00
Braxton Williams
99e2ee6110
Add sandbag to editor
2016-01-01 13:09:11 -06: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
76c9e1560d
Frag - only run addPfhRound on ammo that will frag
...
If spall is not enabled (default) then calculate which ammo types will
actually cause a frag event, cache and then only track those.
2016-01-01 02:33:08 -06: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
jonpas
33f91b2ee7
Remove duplicated line caused by merge
2016-01-01 03:52:37 +01:00
jonpas
ebf1321c0b
Merge branch 'release' into fixFuelHoseExceededAfterDisconnect
2016-01-01 03:51:44 +01: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
VKing
222b15634f
Increase prep time for guided projectiles
2015-12-31 22:26:04 +01:00
