ulteq
a1ee99cc8a
Remove debug code
2015-12-28 16:04:53 -06:00
ulteq
7858b65fde
Fixed misspelled function name
2015-12-28 16:04:53 -06:00
ulteq
0a27c309cb
Added missing variable definitions
2015-12-28 16:04:52 -06:00
commy2
f83206353d
jamming
2015-12-28 16:04:52 -06:00
Nicolás Badano
4264789631
Refactored code so the weapon temperature is correctly updated when checking it
2015-12-28 16:04:52 -06:00
Nicolás Badano
ac67e45098
overheating: sync weapon temperature across the net, deterministic pseudo-random bullet dispersion
2015-12-28 16:04:51 -06:00
Nicolás Badano
932e17cea4
fix
2015-12-28 16:04:51 -06:00
Nicolás Badano
fb56350217
small fixes
2015-12-28 16:04:51 -06:00
Nicolás Badano
de902ca4fd
Modify setVariablePublic so it published inmediately if the variable hasn't being publishes recently. Then establish an embargo time before it can be published again.
2015-12-28 16:04:50 -06: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
Thomas Kooi
8e88740730
Merge pull request #2924 from acemod/woundReopeningArray
...
Don't update openWounds if not bandaged
2015-12-05 11:28:56 +01:00
ProfessorCZ
cf41ac5fba
Czech Translations - Update
2015-12-04 22:28:10 -06:00
licht-im-Norden87
291f4df072
Update German Stringtables
...
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
kommas...........................................................................................................................................................
Rallypoint
Update stringtable.xml
slideshow, not finished yet
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
What does Curator mean in this context?
l. 294, l 302
cargo
Update stringtable.xml
Update stringtable.xml
I left a few things out. I'd like if someone gives me advice
Z.698 Pionier oder Instandsetzer o.Ä. Was genau ist die deutsche Bezeichung der Klasse in ACE bzw Arma?
Z.707 Ich habe mich einfach mal auf Mechatroniker festgelegt, da Reperaturspezialist sich doch ein wenig ungelenk anhört...
Update stringtable.xml
Habe engineer als Pionier übersetzt (halte es selbst für etwas unpassend) Der specialist ist bei mir zum Mechatroniker geworden.
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Fix Mistakes from merge
Fix Empty Entries
Fix Mistake
Fix
2015-12-04 22:06:44 -06:00
PabstMirror
f5aae81465
MicroDagr - Add #undef to config for pboProject
...
#2936
2015-12-04 20:08:30 -06:00
PabstMirror
43a168f0b9
Flashbangs - Make event radius match effect radius
2015-12-04 15:16:17 -06:00
commy2
e418cfcf11
Merge pull request #2935 from acemod/fixbinoculars2
...
Fix binocular related bugs
2015-12-04 21:27:53 +01:00
commy2
5d43fa93c6
fix FUNC(binocularMagazine), fix #2916 , fix #2917 , fix #2918 , fix #2922 , fix #2928 , fix #2933
2015-12-04 19:37:37 +01:00
PabstMirror
875b3980ac
Don't update openWounds if not bandaged
...
Fix #2921
2015-12-03 15:23:38 -06:00
PabstMirror
91ace4fc9b
Fix whitelist string -> array error in checkPbo
...
Fix #2913
Use splitString instead of call compile to convert string into an array
2015-12-02 23:58:41 -06:00
PabstMirror
c928a0d6cb
Remove Sleep/WaitUntil from checkPBO
...
Fix #2910
2015-12-01 22:50:28 -06:00
PabstMirror
46c43b56db
Merge branch 'release'
2015-12-01 15:54:57 -06:00
PabstMirror
419af195e9
#2902 - Remove error and don't exit if veh has no hit points
...
B_UAV_01_F has no hitpoints and would throw error
Don't exit so "fullRepair" action still gets added
2015-12-01 13:43:27 -06:00
Glowbal
dacfe4d6cb
Bump version to 3.4.0
2015-12-01 17:05:08 +01:00
commy2
861262e41c
revert false captitalization change
2015-11-30 17:56:25 +01:00
commy2
411a8d58f3
fix more setVariable and getVariable capitalization
2015-11-30 17:53:57 +01:00
commy2
5a1aae6028
manual merge
2015-11-30 17:44:15 +01:00
commy2
e422388484
fix waitUntil capitalization
2015-11-30 17:28:01 +01:00
commy2
a9ebcf8543
fix setVariable and getVariable capitalization
2015-11-30 17:27:09 +01:00
commy2
d037f00a92
fix forEachIndex capitalization
2015-11-30 17:25:16 +01:00
commy2
b3950bd7f0
fix forEach capitalization
2015-11-30 17:23:48 +01:00
commy2
a8228f60c2
fix configFile capitalization
2015-11-30 17:23:02 +01:00
commy2
2b05f6f451
fix isNil capitalization
2015-11-30 17:22:16 +01:00
commy2
5e41643cff
fix pushBack capitalization
2015-11-30 17:21:28 +01:00
commy2
d9b90258bc
fix typeOf capitalization
2015-11-30 17:19:57 +01:00
commy2
34d351c652
fix exitWith capitalization
2015-11-30 17:14:05 +01:00
commy2
0b84bb514b
fix Cfg capitalization
2015-11-30 17:09:26 +01:00
commy2
dcf0a68b80
Revert "fix Cfg capitalization"
...
This reverts commit 43bda9c462
2015-11-30 17:00:32 +01:00
commy2
43bda9c462
fix Cfg capitalization
2015-11-30 16:52:20 +01:00
commy2
ca9b909e75
fix CBA_fnc capitalization
2015-11-30 16:45:20 +01:00
Thomas Kooi
02eee05cf4
Merge pull request #2884 from acemod/speedLimiterUGVFix
...
fix that in UGV dont work speedLimiter
2015-11-29 12:41:13 +01:00
Thomas Kooi
081106d6a3
Merge pull request #2892 from acemod/TheHidden
...
Remove nametags and actions on hidden units
2015-11-29 12:38:27 +01:00
bux578
35ecef454f
Merge pull request #2825 from gienkov/pl-translation
...
pl translation
2015-11-29 07:35:04 +01:00
PabstMirror
8d2b612570
Remove nametags and actions on hidden units
...
Fix #2596
2015-11-28 21:35:25 -06:00
SilentSpike
c426bfc9c1
Merge pull request #2888 from acemod/repairPositions
...
Define custom repair points for a few vehicles
2015-11-28 20:09:37 +00:00
Thomas Kooi
5282e95668
Merge pull request #2876 from acemod/medicalTranslateHP
...
Medical Fixes
2015-11-28 20:58:08 +01:00
Thomas Kooi
ced94d73a7
Merge pull request #2797 from ColdEvul/RoadBarrierRoadCone
...
[REMADE] RoadCone_F and its inhered RoadBarrier_F intractable
2015-11-28 20:51:39 +01:00
Thomas Kooi
d7a19cf0a6
Merge pull request #2882 from acemod/fixUGVNametag
...
fix UGV Nametag issue
2015-11-28 20:50:23 +01:00
Thomas Kooi
7dd0af33b4
Merge pull request #2871 from acemod/cleanupLaserpointer
...
cleanup laserpointer
2015-11-28 20:43:31 +01:00
Thomas Kooi
c132ef86cf
Merge pull request #2133 from jonpas/dynamicViewDistance
...
Mk 1 eyeballs Integration
2015-11-28 20:40:29 +01:00
Thomas Kooi
e669f3e2cb
Merge pull request #2699 from BaerMitUmlaut/disable-nvgs-in-sight
...
Disable nvgs in sight
2015-11-28 20:37:30 +01:00
gienkov
f25a181d8e
fix my error
2015-11-28 20:37:29 +01:00
Thomas Kooi
cef01baf0b
Merge pull request #2856 from acemod/isEqualTypeRepalcement
...
1.54 - Replace typeName with isEqualType
2015-11-28 20:36:07 +01:00
Thomas Kooi
b807d1db48
Merge pull request #2886 from acemod/bandageReopen
...
Add all wound types to bandage treatment configs
2015-11-28 20:32:13 +01:00
SilentSpike
a8cf9c6f48
Fix missing boolean inversion
2015-11-28 13:58:56 +00:00
gienkov
2c83fe4a11
refuel translation fixes
2015-11-28 13:45:59 +01:00
gienkov
a906c180ce
remove alpha entries
2015-11-28 13:34:54 +01:00
PabstMirror
a42c2153cc
Error handling for bad setting values array
2015-11-28 01:57:15 -06:00
PabstMirror
f676e6d9c9
Add some more typeNames replacements
2015-11-27 21:23:27 -06:00
PabstMirror
5850f78c1f
Merge branch 'master' into isEqualTypeRepalcement
2015-11-27 21:08:21 -06:00
gienkov
adae379445
fixes
2015-11-27 21:55:05 +01:00
gienkov
b091b73e24
fixes
2015-11-27 21:54:04 +01:00
gienkov
3250245587
3.4.0 translations and fixes
2015-11-27 21:50:57 +01:00
PabstMirror
6031eb8c6e
Add all wound types to bandage treatment configs
...
Fix by adding all config entries;
instead of trying to modify classname
2015-11-27 14:19:26 -06:00
gienkov
7eecff4296
Merge remote-tracking branch 'origin' into pl-translation
...
Conflicts:
addons/captives/stringtable.xml
addons/map_gestures/stringtable.xml
addons/zeus/stringtable.xml
2015-11-27 21:19:25 +01:00
SilentSpike
0ffb9ea5ad
Define custom repair points for a few vehicles
...
Some helicopters have the main rotor point on the tip of a single blade which can be problematic depending on the orientation of the helicopter so those have been moved to the center (to match others). The tail rotor is also in the complete wrong position for some.
2015-11-27 20:06:57 +00:00
ViperMaul
8d4364350c
Fix for "double semicolon detected" error
2015-11-27 10:43:30 -08:00
jokoho48
76435ec228
posible fix for overlapping Speedlimiters
2015-11-27 15:48:03 +01:00
PabstMirror
e51f658ce0
Try base wound class in bandage treatment configs
...
Gets the correct wound for the bandage treatment config
Used for selecting most effective bandage and reopening
_className was something like "velocityWoundMedium"
but configs only had base class "velocityWound"
2015-11-26 23:18:39 -06:00
jokoho48
f364c2a5c3
fix some stuff i mixed up
2015-11-26 23:44:42 +01:00
jokoho48
5f2840bf39
fix that in UGV dont work speedLimiter
2015-11-26 23:39:17 +01:00
jokoho48
5df7eba1eb
remove debug Code
2015-11-26 22:27:46 +01:00
jokoho48
59708ec2f7
fix UGV Nametag RPT Issue #2873
2015-11-26 22:24:06 +01:00
jokoho48
52a6eddb44
fix missing PBOPREFIX
2015-11-26 20:53:14 +01:00
PabstMirror
4aeeefdfe8
Fix UBC and increase Heli_04 Pod interaction distance
2015-11-26 11:47:25 -06:00
PabstMirror
a5c45c137f
Medical - addDamageToUnit Helper
2015-11-26 09:53:12 -06:00
Thomas Kooi
581f71f8a1
Merge pull request #2141 from GitHawk/refuel
...
Adding vehicle refueling
2015-11-26 16:16:13 +01:00
Thomas Kooi
bba0e999ff
Merge pull request #2164 from GitHawk/rearm
...
Adding vehicle rearming
2015-11-26 16:15:09 +01:00
Thomas Kooi
81ab280cb4
Merge pull request #2670 from acemod/simplifyFragConfig
...
Simplify frag config
2015-11-26 16:13:21 +01:00
Thomas Kooi
15267c0433
Merge pull request #2219 from acemod/handSignals
...
Hand signals enhancement
2015-11-26 16:04:41 +01:00
PabstMirror
ca0cfc9bbf
Merge pull request #2861 from acemod/repairRebass
...
Repair Overhaul
2015-11-25 17:00:32 -06:00
PabstMirror
988a5c76bb
Medical - 1.54 Changes
...
1.54 Armor
Translate selectiosn to hitpoints
Calc newDamage using hitIndex (because sel is translated)
Fix isFalling never being reset
Cache hitpointIndex to reset damage
Normalize Limb Armor to 1.54
Cleanup
Cleanup
2015-11-25 11:49:20 -06:00
PabstMirror
0b9044e3c7
Merge pull request #2753 from acemod/showHudSetter
...
Showhud setter
2015-11-25 11:16:21 -06:00
PabstMirror
ac6390c0b3
Add array info to header
2015-11-25 11:07:56 -06:00
