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,920 Commits 73 Branches 88 Tags 752 MiB
697710d40d
Commit Graph

4920 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bux578
b52906800f add translation guide 2015-04-30 21:20:41 +02:00
Glowbal
e7290feaa2 disabled radial option, so it isn't server selectable either 2015-04-30 21:20:04 +02:00
Glowbal
2f763a2310 Disabled client setting for menu style 2015-04-30 21:17:33 +02:00
Glowbal
1bee48214e Merge branch 'master' into medicalMenuClientSetting 
Conflicts:
	addons/medical/ACE_Medical_Actions.hpp
	addons/medical/CfgVehicles.hpp
	addons/medical/stringtable.xml
 2015-04-30 21:08:46 +02:00
PabstMirror
ba18f8b430 Handle Scaling 2015-04-30 14:07:19 -05:00
commy2
8c8e310d66 handle cursor mode 2015-04-30 21:00:30 +02:00
Glowbal
349d723fea Merge pull request #928 from acemod/AdjustUnloadPerson 
Adjust unload person
 2015-04-30 20:55:17 +02:00
Glowbal
67370f3340 Handles waking up 2015-04-30 20:49:38 +02:00
Glowbal
8d358f3ab5 can only carry/drag units that are not in a vehicle 2015-04-30 20:44:59 +02:00
Glowbal
432a0102e8 Improved unloadPerson function 
Removed caller parameter.
 2015-04-30 20:44:43 +02:00
commy2
5ec8b6d36c Merge branch 'master' of https://github.com/acemod/ACE3 into menuonclick 2015-04-30 20:01:58 +02:00
PabstMirror
a46d4e11ab Remove linebreak from teamManagement, fix leaveteam 2015-04-30 12:38:19 -05:00
bux578
367da1f4bf cleaned up insignias 2015-04-30 19:36:35 +02:00
PabstMirror
5ca75f9973 Action names Join->Assign 2015-04-30 12:20:01 -05:00
PabstMirror
ca57a4e168 Merge branch 'master' into group 
Conflicts:
	addons/interaction/CfgVehicles.hpp
	addons/interaction/stringtable.xml
 2015-04-30 11:59:53 -05:00
Kavinsky
b9c1936efc changed laserpointer to allow 3rd party laser pointers. now there is a new config option for CfgWeapons called ace_laserpointer, number with value 0 no laser, 1 red laser, 2 green laser 2015-04-30 18:51:30 +02:00
KoffeinFlummi
fd152c580b Merge branch 'master' into basic-med-options 
Conflicts:
	addons/medical/ACE_Settings.hpp
	addons/medical/functions/fnc_setUnconscious.sqf
 2015-04-30 18:39:33 +02:00
PabstMirror
9c02f915ec Merge pull request #922 from acemod/medicalPrivates 
Medical Private Variables
 2015-04-30 11:34:33 -05:00
jaynus
21cc0db28f Correctly look up configs. 2015-04-30 09:04:29 -07:00
jaynus
7568773ece class localize and disable all guidance/locking. 2015-04-30 09:00:09 -07:00
bux578
0f135c5dab fix ballistics stringtable 2015-04-30 15:23:52 +02:00
ulteq
ac33ad109f Merge pull request #923 from Bla1337/master 
Localization update (Russian)
 2015-04-30 13:44:54 +02:00
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