Commit Graph

3806 Commits

Author SHA1 Message Date
ulteq
a42dec6760 Added more missing privates 2015-05-01 17:40:30 +02:00
ulteq
5dcb45bd33 Finds the corresponding weapon class for each magazine type. 2015-05-01 17:39:38 +02:00
KoffeinFlummi
e46eba673f Merge branch 'master' into german-translation
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
2015-05-01 17:36:40 +02:00
KoffeinFlummi
954e4ef549 Merge branch 'master' of https://github.com/acemod/ACE3
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
2015-05-01 17:32:19 +02:00
KoffeinFlummi
e96f23c197 Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge
Conflicts:
	addons/atragmx/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/respawn/stringtable.xml
2015-05-01 17:30:59 +02:00
ulteq
6dc28f026f Added missing private 2015-05-01 17:15:49 +02:00
Felix Wiegand
526b0a2d59 Merge pull request #931 from gienkov/master
PL translation
2015-05-01 17:15:22 +02:00
KoffeinFlummi
5f60321a69 Merge https://github.com/Legolasindar/ACE3 into spanish-merge
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
2015-05-01 17:12:00 +02:00
KoffeinFlummi
761e23001f Merge https://github.com/Dimaslg/ACE3 into spanish-merge
Conflicts:
	addons/medical/stringtable.xml
	addons/missileguidance/stringtable.xml
	addons/optionsmenu/stringtable.xml
2015-05-01 16:51:20 +02:00
ulteq
800ccc07f3 Removed duplicate code 2015-05-01 16:24:16 +02:00
Nicolás Badano
65dcbce25e Merge pull request #945 from acemod/revert-937-fcsMuzzleVelocityCorrection
Revert "Takes negative initSpeed values into account"
2015-05-01 11:07:57 -03:00
ulteq
3ad668605a Fix for last fcs change 2015-05-01 16:02:34 +02:00
jaynus
e4567fb59f Merge remote-tracking branch 'origin/master' into guidanceClassFixes
Conflicts:
	addons/javelin/functions/fnc_onOpticDraw.sqf
2015-05-01 06:59:28 -07:00
jaynus
9997b6d464 action is select 1 2015-05-01 06:57:49 -07:00
Nicolás Badano
cde80b2901 Revert "Takes negative initSpeed values into account" 2015-05-01 10:38:41 -03:00
commy2
b255d1040b scope 1 for ACE_Comanche_Test, #943 2015-05-01 15:30:11 +02:00
FreeZbe
68d62b0005 Update stringtable.xml 2015-05-01 14:20:21 +02:00
FreeZbe
518614ec0b Update stringtable.xml 2015-05-01 14:20:03 +02:00
FreeZbe
79ac41bd95 Update stringtable.xml 2015-05-01 14:19:43 +02:00
bux578
bfb68fe368 fix spelling errors 2015-05-01 14:19:30 +02:00
FreeZbe
80ae016021 Update stringtable.xml 2015-05-01 14:19:15 +02:00
FreeZbe
acf74dd2ae Update stringtable.xml 2015-05-01 14:13:32 +02:00
FreeZbe
7a397459ae Update stringtable.xml 2015-05-01 14:13:08 +02:00
FreeZbe
371aa381ec Update stringtable.xml 2015-05-01 14:12:45 +02:00
FreeZbe
820c841b35 Update stringtable.xml 2015-05-01 14:12:10 +02:00
FreeZbe
53be70f661 French : update stringtable 2015-05-01 14:07:08 +02:00
ulteq
a6f4c68ef4 Removed obsolete comment 2015-05-01 13:50:01 +02:00
ulteq
6d0e2cc464 Merge pull request #936 from acemod/explosivesSleepReplacement
Replaced sleep with waitAndExecute
2015-05-01 12:55:14 +02:00
Glowbal
f0efba09e5 Merge pull request #814 from acemod/basic-med-options
Basic medical module options
2015-05-01 12:27:22 +02:00
ulteq
a9cde188ea Merge pull request #937 from acemod/fcsMuzzleVelocityCorrection
Takes negative initSpeed values into account
2015-05-01 12:24:22 +02:00
bux578
2acc10ba70 meh 2015-05-01 12:19:42 +02:00
Glowbal
e9a86da8e0 Should be in same order as the module 2015-05-01 12:18:21 +02:00
bux578
aa2e5077e4 missing german translation 2015-05-01 12:17:28 +02:00
ulteq
4c0bed609e Fixed a typo 2015-05-01 11:53:53 +02:00
Glowbal
5beca63ae2 Added missing private 2015-05-01 11:51:23 +02:00
ulteq
940f8e8349 Cleanup++:
*Removed spawn
*Added, moved and renamed some privates
2015-05-01 11:38:09 +02:00
commy2
a97c934688 fix ubc, fix #938 2015-05-01 11:01:07 +02:00
ulteq
d3b36c2b56 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-05-01 10:26:48 +02:00
ulteq
723ffc21d1 Removed unneeded TODO 2015-05-01 10:26:37 +02:00
ulteq
2219339e24 Fixed a typo 2015-05-01 10:25:59 +02:00
ulteq
965e45a53c Takes negative initSpeed values into account 2015-05-01 10:25:33 +02:00
commy2
b859956604 rename category ace <blank> to ace common 2015-05-01 10:19:47 +02:00
PabstMirror
0f736ae684 GetDeathAnim 2015-05-01 03:13:26 -05:00
ulteq
e8264110bb Replaced sleep with waitAndExecute 2015-05-01 10:12:41 +02:00
commy2
c52278c11f Merge branch 'feature/laserpointer-3rdparty' of https://github.com/11thmeu/ACE3 into 11thmeu-feature/laserpointer-3rdparty 2015-05-01 09:52:03 +02:00
esteldunedain
a0923aa5c3 Tweak the position for rally point actions. Fix #837 2015-05-01 01:57:37 -03:00
esteldunedain
324b9510e3 Allow positions for actions to be computed dynamically. Also leverage that for the position of the "Weapon" action, instead of hard coding an exception for that. 2015-05-01 01:56:39 -03:00
esteldunedain
fc02bb4e06 Stylistic changes 2015-05-01 00:32:16 -03:00
esteldunedain
aa4a5539d4 Merge branch 'master' into interactMoreOptions
Conflicts:
	addons/interact_menu/functions/fnc_renderIcon.sqf
2015-05-01 00:04:22 -03:00
KoffeinFlummi
984a1fe337 Rename breakLine to break_line 2015-05-01 02:14:23 +02:00
KoffeinFlummi
e06e1a2f89 Make preventDeath work 2015-05-01 01:38:36 +02:00
KoffeinFlummi
cb82b20464 Let setUncon handle AI unconsciousness 2015-05-01 01:38:16 +02:00
KoffeinFlummi
48770f77d2 Rename caching variables in basic HD 2015-05-01 01:37:58 +02:00
KoffeinFlummi
67bd2b4e2f Reduce animation forcing delay 2015-05-01 01:36:09 +02:00
KoffeinFlummi
98e44e86d8 Offload ejecting to unloadPerson 2015-05-01 01:35:50 +02:00
KoffeinFlummi
f7f416c8d3 Proper privates and alignment 2015-05-01 01:34:38 +02:00
KoffeinFlummi
aa9f1c53c7 Whoops 2015-05-01 01:34:18 +02:00
KoffeinFlummi
53835605ea Merge remote-tracking branch 'origin/master' into basic-med-options
Conflicts:
	addons/medical/functions/fnc_getBloodLoss.sqf
	addons/medical/functions/fnc_handleDamage_basic.sqf
2015-05-01 01:25:16 +02:00
Kavinsky
f301491c7a changed variable name to use QGVAR macro 2015-04-30 23:18:45 +02:00
Grzegorz
3f932c0a93 Update stringtable.xml 2015-04-30 22:55:51 +02:00
Grzegorz
1e0eaa1971 Update stringtable.xml 2015-04-30 22:55:43 +02:00
Grzegorz Sikora
03973f3dcf PL translation 2015-04-30 22:54:15 +02:00
Glowbal
eb48048a58 Merge pull request #930 from acemod/keybindingCategories
Split keybindings into different sub-categories
2015-04-30 22:51:39 +02:00
commy2
2ae5538df5 change wrong strings 2015-04-30 22:46:08 +02:00
Glowbal
131468f0d8 plurals 2015-04-30 22:39:33 +02:00
PabstMirror
090062153c Merge branch 'master' into interactMoreOptions
Conflicts:
	addons/interact_menu/config.cpp
2015-04-30 15:36:00 -05:00
KoffeinFlummi
d59436c588 Only force animation when necessary 2015-04-30 22:19:31 +02:00
KoffeinFlummi
8fda984903 Fix missing semicolon 2015-04-30 22:17:25 +02:00
KoffeinFlummi
965a976daf Reorganize AI unconsciousness 2015-04-30 22:16:45 +02:00
KoffeinFlummi
f28a806938 Remove max unconsciousness time again 2015-04-30 22:15:40 +02:00
Glowbal
7106093f1c Merge pull request #929 from acemod/medical-lowercase
Convert Medical stringtable key names to lowercase
2015-04-30 22:10:54 +02:00
commy2
bc0d95765a Merge pull request #849 from acemod/menuonclick
add option to only use action when clicking
2015-04-30 22:08:37 +02:00
KoffeinFlummi
270c3adc1e Do it again, but properly this time 2015-04-30 22:06:10 +02:00
Glowbal
1ca0d66f30 Initial categories 2015-04-30 22:02:20 +02:00
KoffeinFlummi
85669a9e92 Convert Medical stringtable key names to lowercase 2015-04-30 22:01:09 +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
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
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
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
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
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
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
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
Legolasindar
1c8137a7e5 fixed spanish translate for opened pull #893
fixed spanish translate for opened pull #893
2015-04-29 12:46:32 +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
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
Glowbal
a854b90b00 Increased level at which a lot of blood message gets shown in basic medical 2015-04-28 22:19:30 +02:00
PabstMirror
1512e4c367 isClientSettable spelling 2015-04-28 14:09:26 -05:00
PabstMirror
9e8b13cd2b Merge branch 'master' into altSelfInteract
Conflicts:
	addons/interact_menu/functions/fnc_renderIcon.sqf
	addons/interact_menu/functions/fnc_renderSelector.sqf
	addons/interact_menu/stringtable.xml
2015-04-28 14:02:03 -05:00
Dimaslg
956b5e3558 Spanish Translation
Minor fixes and some things at the Medical system translated.
2015-04-28 21:01:48 +02:00
Glowbal
f606c24854 fixes #901 2015-04-28 20:47:11 +02:00
Glowbal
dbf748ba93 Merge branch 'master' into medicalImprovements 2015-04-28 20:33:39 +02:00
Glowbal
c06caa7209 Only add JIP event for player clients 2015-04-28 20:33:01 +02:00
Glowbal
ebbb88deff Join in progress players will now be initialized 2015-04-28 20:32:29 +02:00
Glowbal
95d83554da Added local treatment through remoteExec for basic 2015-04-28 20:32:02 +02:00
PabstMirror
9e0932eb56 Opps 2015-04-28 13:31:47 -05:00
PabstMirror
270f9f3662 Fix init order problem 2015-04-28 13:26:52 -05:00
bux578
621e1513a0 ballistic stringtable fixes 2015-04-28 20:24:59 +02:00
bux578
4cc6db47de fix merge conflic 2015-04-28 20:15:56 +02:00
ulteq
85ce5e3729 Unified spacing 2015-04-28 19:43:36 +02:00
NukeDev
0b4bb6e4c9 Italian's Translation fixes
atragmx, attach, ballistics, captives languages fixes
2015-04-28 19:40:36 +02:00
simon84
b119c85c57 found some errors 2015-04-28 19:36:31 +02:00
ulteq
4cc2d072e6 Merge pull request #898 from simon84/german-translations
German translations fixes
2015-04-28 19:36:29 +02:00
ulteq
e759989d33 Removed debug output 2015-04-28 19:33:00 +02:00
ulteq
76393f31db Fixes: https://github.com/acemod/ACE3/issues/896 2015-04-28 19:31:38 +02:00
Glowbal
c38fe384e3 added default values for getvar's 2015-04-28 19:30:35 +02:00
simon84
a244660930 German translation fixes
Unified some translations in "ballistics"
e.g. unit mm, Schuss->Patronen, decimal seperator
2015-04-28 19:25:45 +02:00
ulteq
2a759aba70 Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
2015-04-28 18:55:23 +02:00
ulteq
d0c7a37841 Minor stringtable fix 2015-04-28 18:31:14 +02:00
ulteq
908c204893 Replaced Tabs with Spaces 2015-04-28 18:24:24 +02:00
ulteq
236fc10a0f Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master
Conflicts:
	addons/medical/stringtable.xml
2015-04-28 18:15:05 +02:00
NukeDev
db82df6214 Italian's Translation's Changes v2 2015-04-28 18:10:35 +02:00
Grzegorz
feeb897fb6 Update stringtable.xml 2015-04-28 18:05:43 +02:00
Grzegorz
b88618563d Update stringtable.xml 2015-04-28 18:05:27 +02:00
Grzegorz Sikora
bcda77c5c7 PL translation 2015-04-28 18:03:35 +02:00
Josuan Albin
b5524fb3ee French pass
* fixed ramp in /aircraft
* added aragmx entry
* added multiple medical entries
* translated missileguidance
* completed mk6mortar
* changed Sanitaire to Médical in realisticnames also fixed some typos
in there and had to rename some of the explosives (weren't fitting in
boxes in game)
* added myself to contributors
2015-04-28 18:00:09 +02:00
NukeDev
1d434949de Some Italian Translation's Changes 2015-04-28 17:46:35 +02:00
ulteq
dc09c554c0 Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master
Conflicts:
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
2015-04-28 17:44:58 +02:00
Ivan Navarro Cabello
8a55c69cd7 added spanish translation
added spanish translation
2015-04-28 17:03:49 +02:00
ulteq
2e8070facb Merge pull request #886 from simon84/german-translations
German translations
2015-04-28 16:54:39 +02:00
PabstMirror
f8b8d7dd16 Set Lock on postInit so spawned vehicles are set 2015-04-28 00:08:28 -05:00
simon84
8ac6f61fcf added some translations
added some translations
2015-04-28 00:36:37 +02:00
ulteq
79a5077941 Merge pull request #878 from Brisse89/patch-1
Less fictional weapon names
2015-04-28 00:02:55 +02:00
PabstMirror
7e0fa18ce7 #770 - Hopefully fix LOS check on flashbang 2015-04-27 16:07:31 -05:00
ulteq
416a914253 More vector math replacements 2015-04-27 22:14:08 +02:00
ulteq
0d6d96e76c Cleanup++:
* Added missing privates
* Removed unused privates
* Replaced some old vector calculations with new vector commands
2015-04-27 22:04:35 +02:00
ruPaladin
59aba3fb34 Update stringtable.xml 2015-04-27 19:33:22 +03:00
ulteq
fa6a2566e3 Fixed a syntax error 2015-04-27 17:48:06 +02:00
Glowbal
450e324f7b adjusted damage handling (adv medical) 2015-04-27 16:42:12 +02:00
Glowbal
e4db44d73c adjusted damage parsing 2015-04-27 16:36:00 +02:00
Josuan Albin
e8dec708bc Some french entries and a german duplicate
Added some french entries and removed a german duplicate
2015-04-27 16:18:28 +02:00
Glowbal
b520a1072b Merge branch 'master' into medicalImprovements 2015-04-27 15:41:20 +02:00
Brisse89
26bd75084d Update stringtable.xml
Khaybar -> Sama
2015-04-27 14:56:57 +02:00
ulteq
3c92cab7af Reverted the addBlackList function 2015-04-27 14:02:59 +02:00
ulteq
f54f0cd1fa Renamed init functions 2015-04-27 13:58:18 +02:00
Brisse89
4ebdd88369 Less fictional weapon names
ACP-C2 -> Custom Covert II
KT2002 Katiba -> KH2002 Khaybar
2015-04-27 13:55:50 +02:00
ulteq
1b5756d33c Added weather update interval module setting 2015-04-27 12:47:26 +02:00
ulteq
79ff3146b5 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-27 12:40:28 +02:00
ulteq
04d3a31b5b Fixed a typo 2015-04-27 12:34:21 +02:00
ulteq
3c91f6abe3 Added ace/module settings for ace_weather:
*enableServerController // weather propagation on the server
*useACEWeather // disable ace weather
*syncRain
*syncWind
*syncMisc
2015-04-27 12:28:56 +02:00
ulteq
135157419e Merge pull request #876 from Brisse89/patch-2
Realistic weapon names: Update stringtable.xml
2015-04-27 12:20:43 +02:00
Brisse89
ecaa23ada2 Update stringtable.xml
Removed the space in HK121
2015-04-27 12:17:36 +02:00
Brisse89
faa17d0e56 Update stringtable.xml
Noreen Bad News -> Noreen "Bad News" ULR
2015-04-27 12:13:09 +02:00
Brisse89
3339759321 Update stringtable.xml
Is this better? 
SIG 762 -> SIG 556
HK 122 -> HK 121
2015-04-27 11:58:39 +02:00
ulteq
579936c781 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into fragCleanup 2015-04-27 11:22:49 +02:00
ulteq
b0876ca394 Enables: d64783fca1 2015-04-27 11:06:16 +02:00
ulteq
d6f757e096 Enabled scope adjustments for the Khalia (old) optic 2015-04-27 11:04:12 +02:00
Brisse89
db553644aa Update stringtable.xml
Is this okay? 
MAR-10 -> Noreen Bad news
EMR-1 -> SIG 762
Navid -> HK 122
2015-04-27 10:24:42 +02:00
commy2
d64783fca1 remove the calibers from the weapon names 2015-04-27 02:40:04 +02:00
ulteq
1fc044dfa9 Cleanup++:
*Moved GVAR(enabled) into ACE_Settings.hpp
*Replaced BIS_fnc_magnitude with vectorMagnitude
*Renamed Nou_GBU12
*Added G_40mm_HE config data
2015-04-26 23:14:54 +02:00
ulteq
6170ef0d50 Code cleanup 2015-04-26 23:05:58 +02:00
Grzegorz
3b9019e363 Update stringtable.xml 2015-04-26 23:01:42 +02:00
Grzegorz
3d5f7b1bf0 Update stringtable.xml 2015-04-26 23:01:31 +02:00
Grzegorz
78329110a1 Update stringtable.xml 2015-04-26 23:01:18 +02:00
Grzegorz
5add444026 Update stringtable.xml 2015-04-26 23:01:10 +02:00
Grzegorz
cfd9c6b3e9 Update stringtable.xml 2015-04-26 23:01:02 +02:00
Grzegorz Sikora
a272258500 PL translation 2015-04-26 22:59:20 +02:00
ulteq
3e5462f3d4 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-26 22:50:54 +02:00
ulteq
af2dc62705 Improved a module setting description 2015-04-26 22:44:18 +02:00
Grzegorz Sikora
0f47d8bfb2 PL translation 2015-04-26 22:33:25 +02:00
ulteq
9bd32f5797 Fixed an incorrect module setting description 2015-04-26 22:33:11 +02:00
KoffeinFlummi
365f1e025b Merge remote-tracking branch 'origin/GermanMedicalTranslation' into german-merge
Conflicts:
	addons/medical/stringtable.xml
2015-04-26 22:04:39 +02:00
commy2
aabe532829 manual merge 2015-04-26 21:26:57 +02:00
KoffeinFlummi
b472292b20 Remove tabler comments.
sed is awesome.
2015-04-26 21:05:41 +02:00
KoffeinFlummi
1bb8628109 Merge https://github.com/simon84/ACE3 into german-merge 2015-04-26 21:00:22 +02:00
commy2
ac51d45f11 Merge pull request #848 from acemod/recoiltweaks
tweaking recoil
2015-04-26 20:59:27 +02:00
commy2
f5d7331847 no team management on the dead or unconscious units, fix #803 2015-04-26 20:57:55 +02:00
commy2
9b8e130b1f Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-26 19:33:23 +02:00
commy2
5320f4c6b7 fix broken parse text cache in some cases 2015-04-26 19:33:08 +02:00
commy2
6aea424f6d Merge pull request #872 from acemod/muteuncon
mute unconsious units
2015-04-26 17:40:51 +02:00
commy2
7319a3dbc6 remove obsolete config entries 2015-04-26 17:38:48 +02:00
commy2
31ae05dd6e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-26 17:26:16 +02:00
commy2
90f1d1f3fa those damn mine detectors, also fix advanced medical box not showing up in zeus 2015-04-26 17:25:56 +02:00
Glowbal
4612298917 Merge pull request #864 from acemod/Add-translations-for-adv.-medical
Add translations for adv. medical
2015-04-26 17:06:36 +02:00
commy2
d6f2ac95dd fix ace ammo box doesn't show up in zeus 2015-04-26 17:04:49 +02:00
commy2
8976b6983d mute unconsious units 2015-04-26 16:47:36 +02:00
bux578
28a8fbc4fe fix vector name
it's the vector 21 not the vector IV
2015-04-26 15:36:47 +02:00
bux578
6cc4f48eb2 Uppercase Injuries 2015-04-26 14:19:28 +02:00
bux578
67dc600cae Merge branch 'master' of https://github.com/acemod/ACE3 into Add-translations-for-adv.-medical 2015-04-26 14:02:47 +02:00
bux578
b3c461b9da last few translations 2015-04-26 14:02:14 +02:00
commy2
f96deadd20 imenu: remove shadow, fix caching 2015-04-26 12:41:15 +02:00
bux578
b2dd065429 remove comment 2015-04-26 12:27:06 +02:00
Glowbal
b266734f6e Merge branch 'master' into medicalImprovements 2015-04-26 11:20:04 +02:00
Glowbal
fc08ebb0a5 added "isNotInside" exception to unload 2015-04-26 11:19:25 +02:00
bux578
dec47dade8 ups, remove test code 2015-04-26 09:38:56 +02:00
bux578
0aa2b31dd4 gj git 2015-04-26 09:37:02 +02:00
bux578
171cea998e add most of the translations 2015-04-26 09:36:51 +02:00
ulteq
5ed7cee6fd Fixed a copy&paste typo 2015-04-26 09:22:04 +02:00
VyMajoris
ba89bc8faa Added - Myself to AUTHORS.txt 2015-04-26 03:15:25 -03:00
VyMajoris
523cb49ff1 Added - Portuguese translation to lots of things.
Also fixed a typo the english key for STR_ACE_microdagr_configure.
2015-04-26 03:09:16 -03:00
KoffeinFlummi
9a8dd5ee41 Merge branch 'patch-4' of https://github.com/ruPaladin/ACE3 into russian-merge
Conflicts:
	addons/medical/stringtable.xml
2015-04-26 01:03:29 +02:00
KoffeinFlummi
9ac662ea7c Lowercase curator ammo frag entries 2015-04-26 00:01:48 +02:00
KoffeinFlummi
59bdc23a95 Merge branch 'master' into curatorFragmentation 2015-04-25 23:55:29 +02:00
commy2
986d2ee168 fix c&p error 2015-04-25 23:41:20 +02:00
PabstMirror
ca980379c8 Minor captive cleanup 2015-04-25 16:03:21 -05:00
PabstMirror
898d6c74a8 #854 - No canInteractWith check for Ace_MainAction
Was preventing subactions from showing.
2015-04-25 16:02:59 -05:00
Glowbal
11d86248a7 Reorganised module and settings #809 2015-04-25 22:20:28 +02:00
ulteq
ca6a559557 Fixed a typo 2015-04-25 21:18:09 +02:00
Felix Wiegand
057c060212 Merge pull request #822 from acemod/frag-lowercase
Convert frag config entry names to lowercase
2015-04-25 20:46:59 +02:00
Felix Wiegand
dc7c7fcaf5 Merge pull request #811 from gienkov/master
PL translation
2015-04-25 20:46:47 +02:00
PabstMirror
2d3606302f Merge pull request #464 from acemod/fixFiredNear
Hearing: Fix firedNear not working in vehicles
2015-04-25 13:34:18 -05:00
Felix Wiegand
6b5fa25ba9 Merge pull request #334 from acemod/mk6tweaks
Vanilla Mortars - Rangetables/Tweaks
2015-04-25 20:27:20 +02:00
Dimaslg
4b7daaa840 Spanish translation
Minor fixes and spelling mistakes.
2015-04-25 19:18:04 +02:00
ulteq
78eba4e703 Moved weather randomization back to postInit 2015-04-25 18:56:55 +02:00
Dimaslg
274663e1b9 Spanish Translation
Minor fixes and spelling mistakes.
2015-04-25 18:53:45 +02:00
ulteq
71df545d52 Improved the Mk248 muzzle velocity shift table 2015-04-25 18:30:58 +02:00
PabstMirror
f0477b8e95 Make PARAM/Explode_X faster
skips the IS_ARRAY check normaly found in EXPLODE_1_SYS
2015-04-25 10:25:08 -05:00
ulteq
4a8153b757 Replaced EXPLODE_4_PVT macro inside of ABs PFH 2015-04-25 17:19:43 +02:00
Nicolás Badano
74867230d6 Merge pull request #853 from acemod/cacheparsetext
cache ctrlSetStructedText parseText
2015-04-25 10:54:15 -03:00
esteldunedain
fc49814689 Use FUNC(ctrlSetParsedTextCached) for the selector too. Eliminates glitches 2015-04-25 10:52:52 -03:00
Glowbal
8d12f57d0f Merge pull request #687 from acemod/streamlinedBasicDiagnosis
Streamlined basic diagnosis
2015-04-25 15:19:29 +02:00
Grzegorz
3427bc5bbb Update stringtable.xml 2015-04-25 14:37:03 +02:00
Grzegorz
a7e1d1c1c8 Update stringtable.xml 2015-04-25 14:36:53 +02:00
Grzegorz
f3d360d3d8 Update stringtable.xml 2015-04-25 14:36:42 +02:00
commy2
b7763331d6 the index 2015-04-25 14:34:09 +02:00
ulteq
eca7657ffa Removed a bunch of obsolete code:
*Obsolete, as of: 6fdaf4c400
2015-04-25 13:34:47 +02:00
commy2
73b17efa2f cache ctrlSetStructedText parseText 2015-04-25 13:28:21 +02:00
ulteq
b053a641d9 Improved bullet trace visibility check 2015-04-25 13:15:54 +02:00
ulteq
d8eee168aa Improved onlyActiveForLocalPlayers abort condition check:
*Fixed alwaysSimulateForSnipers abort condition
2015-04-25 12:59:26 +02:00
Glowbal
6799903e4b Also display different color for advanced 2015-04-25 12:45:04 +02:00
ulteq
2d14ae61f9 Simplified muzzle velocity shift calculation:
*Also added some missing privates
2015-04-25 12:36:04 +02:00
Glowbal
1415adc2bd removed local diagnose action. Added localization 2015-04-25 12:35:07 +02:00
Glowbal
4cef2a1fa4 Merge branch 'master' into streamlinedBasicDiagnosis 2015-04-25 12:12:24 +02:00
ulteq
d414e5a3a1 Removed unused define 2015-04-25 12:08:31 +02:00
commy2
73f387d3e3 outline interaction menu text 2015-04-25 11:55:39 +02:00
ulteq
6fdaf4c400 Completely removed the SQF version of the advanced ballistics PFH 2015-04-25 10:59:48 +02:00
ulteq
f645672281 At least set GVAR(extensionAvailable) to true 2015-04-25 10:38:28 +02:00
Nou
7c857a5a7e Make sure load spawns the function, not calls it. 2015-04-25 00:52:51 -07:00
Nou
c8e6e7018c Moved infinite spawned loop to Loaded event for handing save game loads. Events for the win! diag_activeSQFScripts as of this build returns empty on a bare mission. 2015-04-25 00:49:47 -07:00
Glowbal
55529d0396 Added support for switching from 3d selections to radial menu 2015-04-25 09:41:55 +02:00
commy2
664d08d4aa add option to only use action when clicking 2015-04-25 08:23:54 +02:00
commy2
12280bbcad revive tmr camshake 2015-04-25 07:21:11 +02:00
commy2
d7d0f00592 tweaking recoil 2015-04-25 05:51:44 +02:00
KoffeinFlummi
d7b961043b Remove animation reset before falling unconscious
This caused the unit to briefly move to the default animation,
which looked shite.
2015-04-24 22:20:16 +02:00
Grzegorz
aa0b1ecba0 PL translation fix 2015-04-24 21:35:20 +02:00
PabstMirror
3b9b09a7af UpdateFiringTable-ChangesFromWeather 2015-04-24 13:26:09 -05:00
Glowbal
7dc8a08b89 Replaced _currentshooter by _this
Fixes script error `Error Undefined variable in expression: _currentshooter`
2015-04-24 20:03:04 +02:00
commy2
e207a11851 fix: Cannot zero when looking through optics of static weapons and vehicle mg/gmg, fix #836 2015-04-24 19:02:29 +02:00
ulteq
b405f17df2 Added missing ; 2015-04-24 17:19:18 +02:00
ulteq
6361bda3e9 Removed unused function 2015-04-24 13:01:11 +02:00
ulteq
eb88f94cf7 Removed unused privates 2015-04-24 11:53:06 +02:00
ulteq
b3bf44fa1e Code cleanup 2015-04-24 10:58:55 +02:00
ulteq
b3f4bf306d Moved the global weather controls into preInit 2015-04-24 10:46:33 +02:00
ulteq
66e4c742b4 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-24 10:25:47 +02:00
ulteq
062aeae6e6 Fixed several bugs in the rain simulation:
*Added missing rain initialization based on overcast value
*Added proper fade out when the overcast changes from >=0.7 to <0.7
*Removed duplicate code
2015-04-24 10:25:31 +02:00
ulteq
50546646fa Added missing rain_period_count reset to 0 2015-04-24 10:05:13 +02:00
ulteq
5a90ef6207 Added global variables (syncRain, syncWind, syncMisc) which give some control over the weather module:
*Removed duplicate debug output
2015-04-24 10:03:48 +02:00
ulteq
709fdcdd08 Merge pull request #821 from Brisse89/master
Added realistic tracer burn times for several ammo types
2015-04-24 08:28:43 +02:00
Glowbal
0146439925 increasing the text box height #834
Temporary solution until we get something properly done.

Ideally we would calculate the height of the box through the amount of characters. For that we would need a font with a consistent width across each character, or figure out the width for each character ourselves.
2015-04-24 07:46:01 +02:00
esteldunedain
e3a06999c3 Reduce MainActions distance for CAManBase from 5m to 4m 2015-04-24 00:57:49 -03:00
esteldunedain
c8563ce484 Add LOS check for actions points. Close #785 2015-04-24 00:57:22 -03:00
Grzegorz
e8a48fa81c PL translation fix
Apparently mini-spike AT still wants to shoot down planes and choppers :)
2015-04-24 01:54:36 +02:00
PabstMirror
aa7de84783 Merge branch 'master' into mk6tweaks 2015-04-23 13:34:25 -05:00
PabstMirror
55732d4262 Text Shadow should have been black. 2015-04-23 13:33:38 -05:00
ulteq
ddf62b6db4 Added missing privates 2015-04-23 16:08:02 +02:00
KoffeinFlummi
24efbf731d Convert frag config entry names to lowercase 2015-04-23 15:46:50 +02:00
ulteq
b0eadf83c7 Fixed incorrect typicalSpeed 2015-04-23 14:04:01 +02:00
Brisse89
91dfd9802a Update CfgAmmo.hpp 2015-04-23 13:58:42 +02:00
Brisse89
8d4fff6359 Update CfgAmmo.hpp 2015-04-23 13:56:46 +02:00
Brisse89
5bfa97f490 Update CfgAmmo.hpp 2015-04-23 13:55:26 +02:00
Brisse89
f0a1900ad4 Update CfgAmmo.hpp 2015-04-23 13:53:42 +02:00
Brisse89
ae8a512e8f Update CfgAmmo.hpp 2015-04-23 13:47:25 +02:00
Brisse89
0001609791 Update CfgAmmo.hpp
Added realistic tracer burn times for several ammo types: 
B_556x45_Ball (parent for several tracer rounds)
ACE_545x39_Ball_7T3M
B_762x51_Ball (parent for several tracer rounds)
ACE_762x54_Ball_7T2
ACE_762x39_Ball_57N231P

Also changed color on russian tracer rounds from yellow to green, which is what they are in the real world.
2015-04-23 13:44:55 +02:00
ulteq
b1521345c2 Added magazines for the new AP rounds:
*Fixed some stringtable inconsistencies
*Removed some obsolete stringtable entries
2015-04-23 13:35:57 +02:00
ulteq
dd72fced36 Added M955, M993, MK316 Mod 0, 127x99mm API ammo classes:
*Recalculated the vanilla calibers based on (6.5mm ~ 1.0)
2015-04-23 12:42:01 +02:00
ulteq
be595d9c9e Made the wind speed change less often during good weather 2015-04-23 11:54:24 +02:00
KoffeinFlummi
d1c95ba8a1 Add maximum unconsciousness time option 2015-04-23 11:31:27 +02:00
ulteq
e9bb1eea4c Minor muzzle velocity correction for the 6.5mm Creedmor 2015-04-23 11:27:43 +02:00
Brisse89
c975213579 Update CfgAmmo.hpp
Added missing data to 40mm grenades.
2015-04-23 11:11:38 +02:00
KoffeinFlummi
84e1937515 Add damage threshold to basic 2015-04-22 23:50:37 +02:00
ulteq
860b4a446a Updated the 6.5mm Creedmor airFriction:
*Also added it to the ATRagMX gun list
2015-04-22 22:48:38 +02:00
KoffeinFlummi
d10f4d543d Enable unit specific bleeding coefficient 2015-04-22 22:38:48 +02:00
KoffeinFlummi
74ca85cbd9 Change getBloodLoss to expect an array 2015-04-22 22:36:41 +02:00
KoffeinFlummi
f6eeb5e3ba Add pain coefficient 2015-04-22 22:29:31 +02:00
ulteq
09ff217e93 Improved the init process 2015-04-22 21:16:01 +02:00
ulteq
74888b4fff Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into windWeatherOverhaul 2015-04-22 19:47:06 +02:00
ulteq
a9726d2b60 Simplified the wind direction change calculation 2015-04-22 19:46:27 +02:00
ulteq
caf2f12eb9 Improved the wind direction selection based on the probability array 2015-04-22 19:46:09 +02:00
jaynus
0c6786a138 use the vehicle of the player for variables, not the player. allows static optics. FIxes #808 2015-04-22 08:07:58 -07:00
jaynus
d63de3a09e restart PFH on optic reload. Fixes #812 2015-04-22 07:49:18 -07:00
Grzegorz Sikora
1063d4bb2c PL translation 2015-04-22 13:17:43 +02:00
ulteq
ac5d593271 Switched to an improved version of the old getWind function 2015-04-22 12:56:07 +02:00