Nicolás Badano
|
ddc6688d03
|
Merge pull request #1505 from alganthe/strobe-intensity
strobe light more bearable
|
2015-06-04 15:34:20 -03:00 |
|
Josuan Albin
|
70e83707c4
|
strobe light more bearable
changed the intensity of the strobe light, it's still VERY visible on a
very long distance, (around 1.6k maybe more)
|
2015-06-04 17:40:49 +02:00 |
|
jonpas
|
541f1010a7
|
Merge branch 'master' into macroSTR
Conflicts:
addons/attach/functions/fnc_attach.sqf
addons/captives/functions/fnc_moduleSurrender.sqf
addons/common/CfgVehicles.hpp
addons/explosives/CfgModule.hpp
addons/hearing/CfgVehicles.hpp
addons/interaction/CfgVehicles.hpp
addons/map/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
addons/mk6mortar/CfgVehicles.hpp
addons/nametags/CfgVehicles.hpp
addons/nightvision/functions/fnc_changeNVGBrightness.sqf
addons/respawn/CfgVehicles.hpp
addons/switchunits/CfgVehicles.hpp
addons/vehiclelock/CfgVehicles.hpp
addons/winddeflection/stringtable.xml
|
2015-06-02 22:14:32 +02:00 |
|
PabstMirror
|
f57427ec96
|
switch waitAndExecute with 0 delay to execNextFrame
Should Fix #1463
|
2015-06-01 13:14:05 -05:00 |
|
jonpas
|
763cb07629
|
Macro STRING to LSTRING
|
2015-05-28 21:59:04 +02:00 |
|
jonpas
|
0b0f7274d7
|
Applied ESTRING and ECSTRING macros
|
2015-05-27 22:04:41 +02:00 |
|
jonpas
|
87db721d4f
|
Stringtable fixes up to medical
|
2015-05-27 21:19:14 +02:00 |
|
jonpas
|
6072e14077
|
Changed all strings to macros (except external)
|
2015-05-27 19:04:25 +02:00 |
|
Kavinsky
|
8e9b35c757
|
Fixed Capitalized folders on include paths
|
2015-05-20 23:28:10 +02:00 |
|
Alessandro Foresi
|
643df71932
|
Added: Italian translation from Blackedsoul p#20
|
2015-05-10 11:05:16 +02:00 |
|
Alessandro Foresi
|
6695a8793b
|
Added: Some italian translastions
|
2015-05-09 23:43:03 +02:00 |
|
ToasterBR
|
021b00c722
|
Translation to Portuguese
Done all remaining portuguese translations, including some minor
corrections
|
2015-05-02 03:38:53 -03: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 |
|
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 |
|
NukeDev
|
0b4bb6e4c9
|
Italian's Translation fixes
atragmx, attach, ballistics, captives languages fixes
|
2015-04-28 19:40:36 +02:00 |
|
KoffeinFlummi
|
06a4f3d10e
|
Remove tabler comments.
|
2015-04-20 15:48:50 +02:00 |
|
Grzegorz Sikora
|
8530684fa6
|
PL fix #2
|
2015-04-19 23:09:11 +02:00 |
|
KoffeinFlummi
|
592e0d2dd3
|
Merge https://github.com/ruPaladin/ACE3 into russian-merge
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
|
2015-04-19 00:51:09 +02:00 |
|
FreeZbe
|
f55bd5a629
|
French: updates / fixes stringtable
|
2015-04-18 18:49:46 +02:00 |
|
ruPaladin
|
af876e3370
|
attach
|
2015-04-17 15:27:53 +03:00 |
|
PabstMirror
|
638433614c
|
Some missing private defines.
|
2015-04-16 12:36:16 -05:00 |
|
Tachii
|
dca11e523b
|
Update stringtable.xml
|
2015-04-16 18:08:58 +03:00 |
|
KoffeinFlummi
|
2ffbccbf20
|
Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge
|
2015-04-15 12:59:56 +02:00 |
|
KoffeinFlummi
|
63fe4118d4
|
Merge https://github.com/FreeZbe/ACE3 into french-merge
|
2015-04-14 14:48:13 +02:00 |
|
KoffeinFlummi
|
96319c8799
|
Merge https://github.com/ruPaladin/ACE3 into russian-merge
|
2015-04-14 12:50:14 +02:00 |
|
commy2
|
804079cfae
|
manual merge
|
2015-04-13 20:20:55 +02:00 |
|
Harakhti
|
3c3f6ba4c3
|
Translation: A to I
Some parts filled out, other parts corrected or stylized.
|
2015-04-13 19:28:58 +02:00 |
|
KoffeinFlummi
|
f6c7d444e1
|
Merge https://github.com/Anthariel/ACE3 into french-merge
|
2015-04-13 13:31:48 +02:00 |
|
KoffeinFlummi
|
118b5509ea
|
Merge https://github.com/gienkov/ACE3 into polish-merge
|
2015-04-13 13:00:59 +02:00 |
|
Anthariel
|
3ee421a233
|
Update stringtable.xml
Wrong french translation for the line 173.
|
2015-04-12 18:08:06 +02:00 |
|
KoffeinFlummi
|
614afa8537
|
Merge https://github.com/Kllrt/ACE3 into czech-merge
Conflicts:
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/goggles/stringtable.xml
addons/grenades/stringtable.xml
addons/hearing/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/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/nametags/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
|
2015-04-12 14:27:59 +02:00 |
|
FreeZbe
|
45ff6c7ce9
|
French: (Nearly) Complete French translations
Some entries (3 or 4) are still missing.
I dont understand what you mean / what the input is related to.
|
2015-04-12 14:15:45 +02:00 |
|
EpMAK
|
21abff3713
|
Revert "Revert "Russian Translation""
This reverts commit ea04f4ab3e.
|
2015-04-11 21:33:34 +03:00 |
|
EpMAK
|
ea04f4ab3e
|
Revert "Russian Translation"
This reverts commit 17a552bb80.
|
2015-04-11 21:33:07 +03:00 |
|
Kllrt
|
38adfbcb70
|
Added missing CZ strings and made little revision
|
2015-04-11 16:33:00 +02:00 |
|
ruPaladin
|
9c8c38aaae
|
Update stringtable.xml
|
2015-04-10 20:28:05 +03:00 |
|
EpMAK
|
17a552bb80
|
Russian Translation
Russian translation of stringtables: new lines + old lines fixed a bit,
realistic names for armory are not yet filled.
|
2015-04-10 19:55:57 +03:00 |
|
EpMAK
|
68d08b8c7b
|
Revert "Translation"
This reverts commit fab5605ad5.
|
2015-04-10 19:46:18 +03:00 |
|
EpMAK
|
fab5605ad5
|
Translation
Russian translation of the texts
|
2015-04-10 17:51:48 +03:00 |
|
Jo David
|
33a14076fc
|
Merge branch 'master' of https://github.com/acemod/ACE3 into translations
Conflicts:
addons/captives/stringtable.xml
addons/medical/stringtable.xml
|
2015-04-10 09:01:24 +02:00 |
|
Kavinsky
|
a118cae13d
|
unified ACE_Attachable config entry now ACE_Attachable its a string and hold the effect for the item
|
2015-04-10 04:36:28 +02:00 |
|
Kavinsky
|
b49fec58e6
|
Updated stringtable
|
2015-04-10 04:35:21 +02:00 |
|
Kavinsky
|
adaee74a57
|
removed config redundancy
|
2015-04-10 04:00:26 +02:00 |
|
Kavinsky
|
999ad49fd0
|
removed duplicated debugging error
|
2015-04-10 03:58:14 +02:00 |
|
Grzegorz
|
3ffd7ac8c7
|
attach PL translation
|
2015-04-10 03:57:55 +02:00 |
|
Kavinsky
|
049edd1483
|
Added ACE Attach posibility to add more types of attachable items
|
2015-04-10 03:49:50 +02:00 |
|
VyMajoris
|
f0a97bd855
|
Added - Portuguese translation to Attach Failed
|
2015-04-09 20:20:08 -03:00 |
|
Legolasindar
|
7b4d62c46c
|
Update stringtable.xml
Fixed spanish terms
|
2015-04-10 00:05:47 +02:00 |
|
bux578
|
92da20ce62
|
translations
#367
|
2015-04-07 10:02:33 +02:00 |
|
jaynus
|
1bb6be5654
|
Cleaning up of all tabs in source code files.
|
2015-04-06 09:22:43 -07:00 |
|