6915 Commits

Author SHA1 Message Date
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
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
dd979676fd Remove use of CAManBase for all mans
End use of bandaid from #1294
2016-01-09 22:05:40 -06:00
PabstMirror
82179636f3 Cache hearing firedNear 2016-01-09 18:51:41 -06:00
PabstMirror
63a79b9920 Use Function Caching in CBA 2016-01-09 01:36:19 -06:00
PabstMirror
a161008eb7 Fix count/forEach 2016-01-09 01:15:09 -06:00
PabstMirror
ed4cc42897 Cleanup Interaction Menu 2016-01-08 23:29:32 -06:00
PabstMirror
066976766f Show beaufort dots on wind display -for color Blind
Show dots on the wind display so color blind can still determine wind
level
Replace PR #1308
2016-01-07 10:34:31 -06: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
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
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
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
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
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
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
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
bux
23bec6d9a8 Merge master into branch 2015-12-31 10:20:47 +01:00
PabstMirror
2e211c5a04 Fix Medical Triagecard Macro
Fix #3087
2015-12-31 01:46:24 -06:00
PabstMirror
f11c2af921 Update XEH_clientInit.sqf 2015-12-30 14:55:25 -06:00
PabstMirror
d372111d3f Sitting Cleanup
- Add modern privates
- Don't add actions, canInteractWith, or EH if not enabled
2015-12-30 12:23:35 -06:00