PabstMirror
a3443cae43
Merge pull request #2780 from acemod/fixTimeInComments
...
Changed ACE_time back to time in comments where appropriate
2015-11-04 13:04:05 -06:00
PabstMirror
cfba7c01e8
Merge branch 'master' into settingsErrorChecking
...
Conflicts:
addons/map_gestures/stringtable.xml
2015-11-03 12:09:36 -06:00
PabstMirror
50ab2aa904
MicroDagr - move drawEH array define to preInit
...
Fix load order problems (init.sqf can be before postInit)
2015-11-02 15:21:34 -06:00
Glowbal
ac22ca3637
Merge pull request #2813 from acemod/medical-hitpoints-fix
...
Add method to deal with new hitpoints
2015-11-02 20:20:23 +01:00
Joko
bd97c1ee96
fix Docu in waitUntilAndExecute
2015-11-02 12:05:43 +01:00
ColdEvul
03b82e5859
Adjusted interaction nod, changed carrying height for he barrier.
2015-11-01 22:38:55 +01:00
Broström.A | Evul
100c20fc83
Fixed missing strings
...
XEH_ENABLED
carryPosition
carryDirection
dragPosition
dragDirection
2015-11-01 20:33:18 +01:00
Glowbal
8f6e9be636
Add method to deal with new hitpoints
...
This addition tries to deal with the new hitpoints introduced in Arma3 v1.50 and above. It converts new selection names to by the current medical system usable selection names.
This is only a temporarily patch, while we are still working on a larger overhaul to account both the new hitpoints and any potential new features / polishing.
2015-11-01 16:35:25 +01:00
bux578
03d3d1c764
Merge pull request #2789 from ToasterBR/translation02
...
Remaining PT-BR translations
2015-10-31 06:14:37 +01:00
jonpas
998f3e996c
Cleanup macro definitions
2015-10-30 21:59:46 +01:00
BaerMitUmlaut
8f473b4a27
Removed all assignTeam occurrences
2015-10-30 16:50:13 +01:00
ColdEvul
b82350baa2
Made ``RoadCone_F` and its inhered `RoadBarrier_F`` dragable, carryable and storeable.
...
I remade it and removed comments and unnecessary strings. I also removed the unworking one from the last version.
2015-10-28 21:33:00 +01:00
PabstMirror
10d17a8117
Merge pull request #2783 from acemod/captivesStuff
...
Captives Fix duplicate animEH and add handcuffing module
2015-10-28 14:09:13 -05:00
commy2
7d69b7a3f4
fix merkava, patria tracer color
2015-10-28 19:48:49 +01:00
commy2
97999cde04
Merge pull request #2708 from acemod/amvGunSmoke
...
- Fix gun smoke on AMV
2015-10-28 19:33:47 +01:00
commy2
d424eadd48
delete superfluous space ocd
2015-10-28 19:25:59 +01:00
commy2
09ba2c8216
Merge pull request #2793 from ColdEvul/CargoFixForTheAutonomus
...
Fixed small UAV carrying allot of cargo.
2015-10-28 19:10:56 +01:00
commy2
049d40b96e
change description in function header
2015-10-28 19:02:54 +01:00
commy2
a0bfcdd04c
Revert "rename hasHatch to canTurnOut, change description in function header"
...
This reverts commit 932f09ce60f7b3d060b2e6b79ce75614bcaa8dc4.
2015-10-28 19:01:47 +01:00
commy2
932f09ce60
rename hasHatch to canTurnOut, change description in function header
2015-10-28 18:57:47 +01:00
BaerMitUmlaut
7d7aa5b67f
!hasHatch condition part 2
2015-10-28 17:15:46 +01:00
BaerMitUmlaut
a1d72b81bf
Switch to unit namespace, added !hasHatch condition
2015-10-28 17:13:05 +01:00
ColdEvul
6ac1d8361d
Fixed small UAV carrying allot of cargo.
2015-10-28 16:00:24 +01:00
commy2
643f4d36dc
add FUNC(hasHatch)
2015-10-28 08:01:25 +01:00
Jonathan Pereira
ce5364d7af
Added PT-BR translations
...
Added all remaining translations, including dagr, dragging, map,
map_gestures, medical, repair, tacticalladder and zeus.
2015-10-26 22:04:03 -02:00
PabstMirror
2c995f9c2c
Minor Cleanup
2015-10-26 10:49:39 -05:00
PabstMirror
fefe24b7eb
Disable debug in parachute
2015-10-24 19:07:23 -05:00
Glowbal
b5539db27f
Merge pull request #2767 from acemod/canTreatLocation
...
Fix medical location check when set to disabled for PAK/Surgical
2015-10-24 00:55:51 +02:00
PabstMirror
1c26f6c9f5
Captives - Module to set handcuffing
...
also add player check for GVAR(requireSurrender) in canApplyHandcuffes
2015-10-23 14:17:31 -05:00
PabstMirror
ef681e4332
Captives - Fix adding duplicate animEH
2015-10-23 13:11:11 -05:00
PabstMirror
e340f5164c
Wirecutters - Update Fence Configs, Use faster getModelInfo
2015-10-22 20:54:09 -05:00
VKing
069169cc72
Changed ACE_time back to time in comments where appropriate
2015-10-21 22:52:21 +02:00
VKing
a899c74133
ace_fcs_ace_time -> ace_fcs_time
2015-10-21 22:17:28 +02:00
VKing
0936238862
Fix lead calculation for vehicle FCS
2015-10-21 21:52:48 +02:00
PabstMirror
554c303be0
InteractionMenu - Auto Expand First Level
2015-10-20 13:31:09 -05:00
PabstMirror
7db5a34b24
Interaction Menu - Add setting for animation speed
2015-10-20 13:26:42 -05:00
jonpas
349447c5ea
Readd prone down optics removal
2015-10-20 19:37:49 +02:00
BaerMitUmlaut
c227f05f8a
Deprecated isWater
2015-10-19 23:28:50 +02:00
Glowbal
57abe3b885
Merge pull request #2743 from acemod/medicalStuff
...
Medical Menu Fixes
2015-10-19 22:47:13 +02:00
PabstMirror
acc3504d7b
Merge branch 'master' into fixFlashlightPrivates
...
Conflicts:
addons/map/stringtable.xml
2015-10-19 13:59:15 -05:00
PabstMirror
cfde11d2fa
Fix medic treatment location check as well
2015-10-19 01:45:30 -05:00
PabstMirror
aad6cab896
#2765 - Fix location check when set to disabled
2015-10-19 01:20:11 -05:00
bux578
602832cc0c
adjust german translations
2015-10-19 07:29:02 +02:00
bux578
f7b717db64
Merge branch 'patch-11' of git://github.com/licht-im-Norden87/ACE3 into licht-im-Norden87-patch-11
2015-10-19 07:23:51 +02:00
PabstMirror
af80635a3f
ST Map Gesture Force Color Settings
2015-10-18 23:59:40 -05:00
PabstMirror
64de91ed06
Add warning for duplicate setting modules.
2015-10-18 23:34:11 -05:00
PabstMirror
16180686d2
PV GVAR(settings) after modules, add error debug
2015-10-18 18:49:03 -05:00
PabstMirror
26c051d397
Sitting - Fix missing semicolon
2015-10-18 11:48:21 -05:00
IngoKauffmann
1804215dbb
Readded caliber for ACE_Hydra70_DAGR
2015-10-18 13:21:20 +02:00
IngoKauffmann
f02c57b599
Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm
...
Conflicts:
addons/missileguidance/CfgAmmo.hpp
2015-10-18 13:19:27 +02:00
