ulteq
|
d2aa28715d
|
Merge pull request #874 from acemod/fragCleanup
Frag cleanup
|
2015-04-30 10:35:25 +02:00 |
|
ulteq
|
e77ddcf837
|
Added Sh_105mm_HEAT_MP frag config
|
2015-04-30 10:35:06 +02:00 |
|
ulteq
|
cf85a72a03
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-04-30 10:26:08 +02:00 |
|
ulteq
|
59017ed79d
|
Added more frag configs:
* R_Hydra_HE
* Sh_120mm_HE
* Sh_125mm_HE
* Missile_AGM_02_F
* M_Hellfire_AT
|
2015-04-30 10:26:00 +02:00 |
|
commy2
|
43c25690c5
|
Merge branch 'rlex-bugfix/ace_mrco_pip_compat'
|
2015-04-30 10:09:28 +02:00 |
|
commy2
|
ce08acae62
|
Merge branch 'bugfix/ace_mrco_pip_compat' of https://github.com/rlex/ACE3 into rlex-bugfix/ace_mrco_pip_compat
|
2015-04-30 09:47:37 +02:00 |
|
Glowbal
|
8f3d8707cc
|
Should be select
Should fix the new script error after last fix.
|
2015-04-30 08:53:43 +02:00 |
|
commy2
|
8e54e6ec13
|
fix setFWS locality issues, fix #892
|
2015-04-30 00:53:49 +02:00 |
|
Glowbal
|
1218ee78cb
|
Merge pull request #861 from acemod/medicalImprovements
Medical improvements and fixes round 3
|
2015-04-30 00:03:09 +02:00 |
|
PabstMirror
|
f90834eeab
|
Unused
|
2015-04-29 16:57:24 -05:00 |
|
PabstMirror
|
5fef446c00
|
EFUNC for dragging calls
|
2015-04-29 16:53:09 -05:00 |
|
PabstMirror
|
a39e869728
|
Fix extra {} wraped
Error position: <if ({[_unit] call ace_medical_fnc_setDea>
Error if: Type code, expected Bool
File z\ace\addons\medical\functions\fnc_handleDamage.sqf, line 50
|
2015-04-29 16:44:47 -05:00 |
|
Glowbal
|
581c64f66f
|
Implemented unloading from vehicles #740
|
2015-04-29 23:12:47 +02:00 |
|
Glowbal
|
943d2cbd72
|
Merge branch 'master' into medicalImprovements
|
2015-04-29 23:01:38 +02:00 |
|
Glowbal
|
aaa8171457
|
Implemented prevent instant death #839
|
2015-04-29 22:54:58 +02:00 |
|
Glowbal
|
614a93ef12
|
fixes #838
|
2015-04-29 22:04:46 +02:00 |
|
bux578
|
fce91279b5
|
add ace3 and banana insignia
`[this,"ACE_insignia_logo"] call BIS_fnc_setUnitInsignia;`
and
`[this,"ACE_insignia_banana"] call BIS_fnc_setUnitInsignia;`
|
2015-04-29 22:04:31 +02:00 |
|
Glowbal
|
87465b8b10
|
fixes #829
|
2015-04-29 21:49:24 +02:00 |
|
ulteq
|
4eec4da37c
|
Merge pull request #912 from acemod/explosiveFixAttachDeleteVehicleFix
Explosive fix attach delete vehicle fix
|
2015-04-29 21:32:28 +02:00 |
|
ulteq
|
608af39a67
|
Added proper dummy object cleanup code
|
2015-04-29 21:22:07 +02:00 |
|
PabstMirror
|
41bef1e58c
|
Merge pull request #903 from acemod/vehLockFix
Veh lock fix
|
2015-04-29 13:34:38 -05:00 |
|
PabstMirror
|
2beaf8ddeb
|
Merge pull request #905 from acemod/fixDragAnim
Fix Dragging StanceChange Anim
|
2015-04-29 13:34:16 -05:00 |
|
Lex Rivera
|
5a3b672f10
|
[compat_asdg] fix MRCO PiP compatibility
|
2015-04-29 21:15:32 +03:00 |
|
ulteq
|
00dc0ef01e
|
Added frag classes array for 82mm shell
|
2015-04-29 17:48:19 +02:00 |
|
ulteq
|
989332831f
|
Added frag configs for 82mm and 155mm shells
|
2015-04-29 17:42:37 +02:00 |
|
ulteq
|
4e171c2988
|
Merge pull request #916 from FreeZbe/master
French: update and fix stringtable
|
2015-04-29 16:46:49 +02:00 |
|
FreeZbe
|
ca7aeece90
|
French: update stringtable
|
2015-04-29 16:28:59 +02:00 |
|
FreeZbe
|
5ec6bea71d
|
French: update stringtable
|
2015-04-29 16:19:23 +02:00 |
|
Glowbal
|
dfbc9b74fd
|
Added arsenalScope #913
|
2015-04-29 15:14:37 +02:00 |
|
ulteq
|
2068eaea75
|
Added G_40mm_HE config, changed 40mm gurney_k values
|
2015-04-29 13:53:38 +02:00 |
|
ulteq
|
a8f37a4c72
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into fragCleanup
|
2015-04-29 13:33:07 +02:00 |
|
commy2
|
d149db61e8
|
ace insignia, #906
|
2015-04-29 13:01:08 +02:00 |
|
KoffeinFlummi
|
cec16d6a44
|
3 > 2
|
2015-04-29 12:58:02 +02:00 |
|
KoffeinFlummi
|
b263ac6847
|
Merge branch 'patch-5' of https://github.com/VyMajoris/ACE3 into portuguese-merge
Conflicts:
addons/common/stringtable.xml
|
2015-04-29 12:57:48 +02:00 |
|
KoffeinFlummi
|
c854d2208f
|
Merge branch 'patch-4' of https://github.com/VyMajoris/ACE3 into portuguese-merge
Conflicts:
addons/captives/stringtable.xml
|
2015-04-29 12:54:20 +02:00 |
|
KoffeinFlummi
|
a1e709047e
|
Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge
Conflicts:
AUTHORS.txt
addons/aircraft/stringtable.xml
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/disposable/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/fcs/stringtable.xml
addons/frag/stringtable.xml
addons/grenades/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/kestrel/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/logistics_uavbattery/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/markers/stringtable.xml
addons/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/movement/stringtable.xml
addons/nametags/stringtable.xml
addons/nightvision/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/parachute/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/respawn/stringtable.xml
addons/safemode/stringtable.xml
addons/switchunits/stringtable.xml
addons/vehiclelock/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
|
2015-04-29 12:52:55 +02:00 |
|
ulteq
|
87d1f7c281
|
Fixes: https://github.com/acemod/ACE3/pull/909#issuecomment-97377112
|
2015-04-29 12:24:56 +02:00 |
|
ulteq
|
0dd23df7dc
|
Merge pull request #911 from Bla1337/master
Russian localization update.
|
2015-04-29 10:47:35 +02:00 |
|
Glowbal
|
7ca35bf823
|
prevent multiple detonators of same type to be displayed #835
As per @CorruptedHeart suggestion.
> Just needs a
> if (getNumber (_config >> "ACE_Detonator") == 1 && {!(_x in _result)}) then {
|
2015-04-29 10:44:10 +02:00 |
|
Bla1337
|
cfbf3bd053
|
Localization update
|
2015-04-29 11:20:21 +03:00 |
|
bux578
|
95536f0a94
|
update authors.txt
|
2015-04-29 10:10:30 +02:00 |
|
Glowbal
|
0c702d6874
|
Merge pull request #907 from acemod/medicaldisplayNameProgress
Display Name Progress Text
|
2015-04-29 09:51:01 +02:00 |
|
PabstMirror
|
47d4446520
|
Don't check intersection if distance < 1m
Related to #869
|
2015-04-29 02:34:47 -05:00 |
|
ulteq
|
f83f8dad0e
|
Fixes: https://github.com/acemod/ACE3/issues/904
|
2015-04-29 09:27:49 +02:00 |
|
PabstMirror
|
d7d43ce3b1
|
#828 - Private Variables for Interact Menu
|
2015-04-29 01:26:13 -05:00 |
|
PabstMirror
|
e56838be36
|
Private Variables
|
2015-04-29 00:05:02 -05:00 |
|
PabstMirror
|
409851dd8c
|
Attach the real explosive
|
2015-04-28 23:57:11 -05:00 |
|
PabstMirror
|
3eb2bdfc84
|
Display Name Progress Text
|
2015-04-28 21:17:29 -05:00 |
|
ulteq
|
a80e11d025
|
Fixed some 7.62 tracer magazines:
*Made use of the ACE_20Rnd_762x51_Mag_Tracer magazine
*Fixed ACE_10Rnd_762x54_Tracer_mag (inheritance, stringtable, tracersEvery)
|
2015-04-29 01:33:26 +02:00 |
|
PabstMirror
|
414a50fb9b
|
Fix Dragging StanceChange Anim
|
2015-04-28 15:40:36 -05:00 |
|