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
PabstMirror
1e29c0286f
Remove Keybinds/Events for Zeus now handeld in CBA
...
Close #2937
2015-12-30 01:07:55 -06:00
bux
112c002b0b
remove ace_offset entry
...
Ported from AGM and simply renamed. It wasn't even used in AGM.
2015-12-29 20:57:55 +01:00
PabstMirror
dc60860421
Fix Third Person Goggle Effect Not Displaying
...
#3074
2015-12-26 23:31:49 -06:00
Githawk
2432ac3319
Changed scope for carried objects
2015-12-22 17:54:16 +01:00
Githawk
d16417a00b
Changed scope on nozzle
2015-12-22 17:49:58 +01:00
Githawk
ebb28177b1
More fixes to make jerryCan work
2015-12-21 17:54:52 +01:00
Glowbal
c1fa81f28b
Fix tabs in sqf files
2015-12-21 17:05:48 +01:00
Githawk
d9e7a43bf7
Fixes error with new interact_menu
2015-12-21 16:53:25 +01:00
jokoho48
0addb592d3
remove Unused Varaible in AB
...
fix private in AB
2015-12-21 02:29:10 +01:00
freghar
a383da5b2d
fix inverted isTurnedOut for map lighting
...
According to the comment, the idea is to provide unobscured map when
inside an enclosed vehicle (!isTurnedOut).
Signed-off-by: freghar <freghcz@gmail.com>
2015-12-20 11:53:08 +01:00
PabstMirror
9b0641c06f
Add nil return for count
2015-12-19 21:17:36 -06:00
PabstMirror
74aec45921
Fix medical menu not closing on range, litter dir
...
- Medical Menu didn't close when target moved out of range
- Litter was always created in the same direction
2015-12-19 20:50:57 -06:00
PabstMirror
4d041c3c94
Merge pull request #3049 from acemod/fixlaserdesignator
...
Remove undefined laser selfdesignate macro
2015-12-18 12:09:04 -06:00
Jonathan Pereira
ad48f51ec7
Added PT-BR translations
...
All remaining translations of gestures, hearing, interact_menu,
interaction, nightvision, rearm, refuel, viewdistance were done!
2015-12-18 15:14:19 -02:00
PabstMirror
c53a0541a4
Add support for non local Zeus RC in common-isPlayer
2015-12-18 11:08:10 -06:00
Jonathan Pereira
db7074b6cf
Removed duplicated German entry
2015-12-18 14:45:20 -02:00
commy2
e3ecc64771
remove undefined macro
2015-12-18 13:53:25 +01:00
PabstMirror
43a9865fa2
Use isNil for better future compatiblity
2015-12-16 12:10:53 -06:00
PabstMirror
360bdcb50e
Optics - Don't modify camera for ThreeDen Editor
...
Fix broken ThreeDen Camera when returning to editor from preview.
PIP will still work in preview.
Will have to take a look at 1.56 RC to see if command exists and
eventually cleanup.
2015-12-16 11:28:43 -06:00
PabstMirror
ff3ddbe287
Building Interact - Dummy object instead of hiding
...
Fix #3038
InteractiMenu now checks `isObjectHidden`,
So now use dummy object instead of hiding a real one
2015-12-15 12:04:03 -06:00
PabstMirror
7258a0084a
Merge pull request #2995 from acemod/repairThreshholdToolkit
...
Fix PostRepairDamage and toolkit consumtion setting
2015-12-14 19:30:19 -06:00
PabstMirror
f2bcd66784
Toolkit also consumed on fullRepair
2015-12-14 19:28:31 -06:00
PabstMirror
886c13f6a9
Merge pull request #3013 from acemod/bloodyLitter
...
Fix litter for adv - Add bloody p3d for Pack/qClot
2015-12-14 19:23:51 -06:00
PabstMirror
0b5b11c966
Merge pull request #3014 from acemod/fixNameSanatize
...
Sanitize less/greater-than symbol to square
2015-12-14 19:23:07 -06:00
PabstMirror
e5abb59f1d
Merge pull request #3011 from acemod/rhsMergeERA
...
RHS Compat - Combine all ERA Hitpoints
2015-12-14 19:22:51 -06:00
commy2
e6be1537cd
replace more private with private keyword in common
2015-12-14 13:17:48 +01:00
commy2
bfa29246be
replace private with private keyword in other half of common
2015-12-14 13:08:19 +01:00
PabstMirror
9064579a65
Send string to serverLog instead of strucText
...
Fix `Performance warning: SimpleSerialization::Read
'ace_common_remoteFnc' is using type of ,'TEXT' which is not optimized
by simple serialization, falling back to generic serialization, use
generic type or ask for optimizations for these types`
2015-12-13 13:27:46 -06:00
commy2
bd3c79f739
add function to retrieve the control of the stamina bar
2015-12-12 20:25:42 +01:00
commy2
7f63d51ccb
add event for placing units in body bags
2015-12-12 18:21:11 +01:00
commy2
2839cff753
common code fixes
2015-12-12 17:26:47 +01:00
commy2
3d5ea74c7e
replace private with private keyword in first half of common
2015-12-12 16:48:54 +01:00
PabstMirror
a501c7e1c3
Remove new models and just combine existing litter
2015-12-11 19:47:40 -06:00
PabstMirror
24d77d1b7c
Fix Typo
2015-12-11 12:17:05 -06:00
PabstMirror
db50b5313d
getName can return raw or sanatized html tags
2015-12-11 12:01:50 -06:00
commy2
ff95aab100
remove helmets from items filter
2015-12-11 15:05:43 +01:00
commy2
ee7f8f82f5
remove debug
2015-12-11 14:24:54 +01:00
commy2
5d9a057165
add more filters to ammo boxes
2015-12-11 14:18:11 +01:00
commy2
2b63b2efa8
add more filters to ammo boxes
2015-12-11 13:14:58 +01:00
PabstMirror
c7b6375092
Sanitize less/greater-than symbol to square
...
Fix #2912
The raw `<` showed up in nametags and anything besides strucText
`[ / ]` is fairly close and will work in either text mode.
2015-12-10 23:29:05 -06:00
PabstMirror
e9be05209a
Fix litter for adv - Add bloody p3d for Pack/qClot
...
Fix #2950
Get correct bloodLossOnSelection for both basic and advanced
Adds bloody versions of packing bandage and quickClot
2015-12-10 22:58:44 -06:00
PabstMirror
ee0812ad15
RHS Compat - Combine all ERA Hitpoints
...
Put all ERA hitpoints (up to 46 of them) onto a single point
and put that point on the main interaction point
2015-12-10 20:57:23 -06:00
commy2
68388bc976
add more filters to ammo boxes
2015-12-11 01:02:15 +01:00
bux
8e6a057f52
fix common stringtable
2015-12-10 18:48:00 +01:00
kaban
fd06472f4d
Russian Translations - Update
2015-12-10 20:32:16 +03:00
[OMCB]kaban
aec2c3fef2
HotFix: removed duplicated key.
...
Removed duplicated German key for STR_ACE_Common_DoNotForce.
It caused Tabler.exe couldn't read stringtable files.
2015-12-10 18:24:28 +03:00
PabstMirror
f3b7b3b94f
Merge pull request #2994 from acemod/microDagrListBoxKeyblock
...
MicroDagr - Prevent Home Key being blocked
2015-12-10 09:20:06 -06:00
PabstMirror
a71cce1981
Merge pull request #2987 from acemod/gesturesCleanup
...
Setting For Gestures - Fix BI* gestures
2015-12-10 09:19:35 -06:00
commy2
077b9827e8
code cleanup fcs
2015-12-10 16:00:14 +01:00
commy2
7748131e73
code cleanup markers
2015-12-10 15:32:31 +01:00
commy2
a08cf69149
tweak size of laserpointer, fix #2975
2015-12-09 22:56:14 +01:00
havena
6f0568c370
fix Unexpected stringtable format
...
Unexpected stringtable format inside <Text ID="STR_ACE_Common_CheckPBO_Action_WarnPerm"><German>
2015-12-09 20:18:15 +01:00
PabstMirror
3ae7cd15bd
cleanup stringtable phrasing
2015-12-09 12:27:47 -06:00
PabstMirror
3d560108a3
Setting For Gestures - Fix BI* gestures
2015-12-08 23:08:09 -06:00
PabstMirror
0eed4799af
MicroDagr - Prevent Home Key being blocked
...
Fix #2974
2015-12-08 21:31:03 -06:00
PabstMirror
e964b2c135
Fix PostRepairDamage and toolkit consumtion setting
...
Fix #2982
2015-12-08 20:31:40 -06:00
PabstMirror
cae9f436f6
Merge branch 'release'
2015-12-08 15:14:33 -06:00
Glowbal
0599b35fc6
Bump version to 3.4.1
2015-12-08 14:47:48 +01:00
PabstMirror
38bf869f07
Also Fix Rearm
2015-12-07 14:07:03 -06:00
PabstMirror
cd68f9b320
Fix refuel unconc error - Man unloading for air
2015-12-07 13:54:41 -06:00
Thomas Kooi
05c56f73b5
Change disable NVG with sights by default
...
As discussed on Slack, we are changing the default behaviour infavor of excepted gameplay.
2015-12-07 18:33:20 +01:00
PabstMirror
39edd205f0
Merge pull request #2942 from acemod/CzechTables
...
Czech Translations - Update
2015-12-07 09:32:00 -06:00
bux578
fbde1dd794
Merge pull request #2941 from acemod/DieStringtables
...
Update German Stringtables
2015-12-07 10:27:11 +01:00
bux578
821ccf5726
fix medical menu stringtable name
2015-12-07 10:21:48 +01:00
bux578
af31d43567
fix german typos
2015-12-07 10:20:35 +01:00
PabstMirror
358228f5bb
Cleanup De Stringtables
2015-12-06 15:03:15 -06:00
commy2
9fa62c6d2a
clean up vehicles config
2015-12-06 11:18:07 +01:00
gienkov
f6e7cad678
remove Original entries
2015-12-05 22:08:39 +01:00
PabstMirror
b13656e54b
addDamageToUnit - Disable debug / testing code
2015-12-05 12:19:34 -06:00
Thomas Kooi
761d6e28d8
Merge pull request #2939 from acemod/fixMicroDagrDefines
...
MicroDagr - Add #undef to config for pboProject
2015-12-05 11:29:25 +01:00