Glowbal
6e42a10d47
Add selectionDamage implementation
2016-01-17 12:28:08 +01:00
Glowbal
ee9a620a63
Merge branch '340handledamage' into medical-focus-feature
2016-01-16 22:03:28 +01:00
Thomas Kooi
c8c91d2af7
Merge pull request #3138 from acemod/increaseTrainingInLocations
...
Medical Locations Boost Training
2016-01-16 21:59:45 +01:00
SilentSpike
dbcf94153d
Merge pull request #3155 from acemod/spectatorFix
...
Fix some spectator errors
2016-01-15 15:43:45 +00:00
Thomas Kooi
e38a80a712
Merge pull request #3119 from acemod/explosives_detonateAll
...
Add action to detonate all explosives on a detonator
2016-01-15 08:22:16 +01:00
PabstMirror
1affbd7d2f
Move littler syncedEH install to after settingInit
2016-01-14 17:06:46 -06:00
VKing
099648b6b6
Russian translation as suggested
2016-01-14 18:51:14 +01:00
SilentSpike
49c814ccb3
Merge branch 'master' into spectatorUpdates
2016-01-13 19:19:00 +00:00
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
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
c2f780e95f
#1259 - Medical Locations Boost Training
2016-01-09 23:54:48 -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
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
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
bux
0e8eb5fac4
Remove obsolete hotkey entries
2015-12-30 11:23:52 +01:00
bux
d6c5643790
improve code style
2015-12-30 09:43:19 +01:00
bux
2a6042bf61
add interaction position and defuse object position
...
and reduce interaction distance
2015-12-30 09:11:57 +01:00
PabstMirror
72fe95c797
Add "isNotInZeus" to canInteractWith
...
Re-fix #1951 (CTRL+V from climb blocking paste in zeus)
2015-12-30 01:48:43 -06:00
