SilentSpike
d870a1f448
Fix nil spectator Draw3D event handler index
...
Minor oversight introduced in pabst's fix for #2989 , the icon handler is a mission event handler that isn't self terminating so the index needs to be preserved until after it is removed via `removeMissionEventHandler`. It is safe to let the `onUnload` event take care of that (and preferable so that icons disappear while temporarily closed).
2016-01-13 19:03:24 +00:00
SilentSpike
65e981373b
Store spectator display in a uiNamespace variable
...
This allows me to explicitly close the right display and hopefully fix the interface staying open upon mission end.
@Commy2's theory is that perhaps the main display `46` is killed upon mission end, meaning that `findDisplay` can't find the spectator display to close it because the game thinks it doesn't exist.
2016-01-13 18:38:51 +00: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
VKing
4fc7c3065e
Rename to fnc_scriptedExplosive
2016-01-11 23:41:33 +01:00
VKing
01dd663337
Add fnc_detonateExplosiveTrigger
2016-01-11 23:36:34 +01:00
PabstMirror
abe936065e
Python tool to validate configs (using MakePbo)
2016-01-10 14:46:45 -06:00
bux
ec0ece059f
use Killed event, fix missing public setVar
...
add more text, don't delete dead unit
2016-01-10 20:58:54 +01:00
bux
09e4a6a76e
cleanup SwitchUnits
2016-01-10 19:08:28 +01:00
PabstMirror
c2f780e95f
#1259 - Medical Locations Boost Training
2016-01-09 23:54:48 -06:00
PabstMirror
0397b3f9f4
Merge branch 'release'
2016-01-09 15:25:09 -06:00
PabstMirror
63a79b9920
Use Function Caching in CBA
2016-01-09 01:36:19 -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
PabstMirror
9d14ff8b03
Merge branch 'master' into deterministicOverheatingX
2016-01-06 23:25:24 -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
VKing
9985988987
Change ACE_Player to _unit
2016-01-06 18:05:06 +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
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
