Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,745 Commits 73 Branches 88 Tags 752 MiB
c4393862aa
Commit Graph

4745 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Harakhti
4e165e2572 Update Hungarian translations 
Let us match the current revision. At the time of making, the Ballistics
XML was broken.
 2015-04-30 13:25:25 +02:00
ulteq
ad4ee7310a Merge branch 'NukeDev-master' 2015-04-30 13:20:42 +02:00
ulteq
2c97b20781 Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master 
Conflicts:
	addons/atragmx/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/medical/stringtable.xml
	addons/missileguidance/stringtable.xml
	addons/overheating/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/vehiclelock/stringtable.xml
 2015-04-30 13:20:31 +02:00
Bla1337
5d1478b733 interact and medical system localization upd 2015-04-30 14:01:22 +03:00
ulteq
50a8a89b28 Added missing privates 2015-04-30 10:50:49 +02:00
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
PabstMirror
48f7455ef1 Opps2 2015-04-30 01:23:23 -05:00
PabstMirror
d71bba0359 opps 2015-04-30 01:21:41 -05:00
PabstMirror
eb5af0cd89 Medical Private Variables 2015-04-30 01:17:26 -05:00
PabstMirror
11aafe013b Localization 2015-04-29 23:53:00 -05:00
PabstMirror
9aa2e3130a Options for Shadow/Outline and Text Size 2015-04-29 23:37:52 -05:00
PabstMirror
e40a2a524d Merge branch 'master' into interactMoreOptions 2015-04-29 22:57:35 -05: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
Grzegorz Sikora
d11b11ba7b Merge branch 'master' of https://github.com/gienkov/ACE3 2015-04-29 23:38:53 +02: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
Dimaslg
864c3ea03b Conflicts resolve again 
Conflicts resolve again
 2015-04-29 21:23:32 +02:00
ulteq
608af39a67 Added proper dummy object cleanup code 2015-04-29 21:22:07 +02:00
Dimaslg
f8d5c423ae Merge conflicts resolved 2015-04-29 21:15:22 +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
NukeDev
d4dc5e6d85 Other Fixes 2 2015-04-29 17:22:20 +02:00
ulteq
4e171c2988 Merge pull request #916 from FreeZbe/master 
French: update and fix stringtable
 2015-04-29 16:46:49 +02:00
NukeDev
73772d9de1 Other Fixes 2015-04-29 16:44:42 +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
jaynus
283e34779f Don't inherit 2015-04-29 07:05:48 -07: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