PabstMirror
53d6d4578b
Explosives - Fix UBC
...
Updating base class PipeBombBase->IEDUrbanBig_Remote_Ammo, by
z\addons\ace\explosives\config.cpp/CfgAmmo/IEDLandBig_Remote_Ammo/
Updating base class PipeBombBase->IEDUrbanSmall_Remote_Ammo, by
z\addons\ace\explosives\config.cpp/CfgAmmo/IEDLandSmall_Remote_Ammo/
2015-05-17 17:21:31 -05:00
jonpas
ce8d6b683c
Prettified Explosive's CfgAmmo and CfgMagazines
2015-05-16 17:49:31 +02:00
jonpas
c95ecca6a8
Added IED Pressure Plates, closes #1191
2015-05-16 17:44:35 +02:00
PabstMirror
297cbaef08
#1212 - Add PREP for explosive's module function
2015-05-14 18:49:11 -05:00
SAM
31adb5a9fc
Second batch of settings files
2015-05-14 20:59:25 +02:00
GieNkoV
bc72c71e8e
Fix small errors inside stringtables
2015-05-12 19:11:56 +02:00
Grzegorz Sikora
44466e8be8
Remove tabs and repair errors @Glowbal found
...
Conflicts:
addons/map/CfgVehicles.hpp
addons/medical/CfgVehicles.hpp
Conflicts:
addons/map/CfgVehicles.hpp
addons/medical/CfgVehicles.hpp
addons/optionsmenu/stringtable.xml
2015-05-12 18:27:27 +02:00
Grzegorz Sikora
156bba3321
Yes/No to BOOL
...
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/hearing/CfgVehicles.hpp
addons/hearing/stringtable.xml
addons/interaction/stringtable.xml
addons/map/CfgVehicles.hpp
addons/map/stringtable.xml
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
addons/switchunits/CfgVehicles.hpp
addons/switchunits/stringtable.xml
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/hearing/stringtable.xml
addons/interaction/stringtable.xml
addons/map/CfgVehicles.hpp
addons/map/stringtable.xml
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
addons/switchunits/CfgVehicles.hpp
addons/switchunits/stringtable.xml
2015-05-12 18:26:24 +02:00
Grzegorz Sikora
6a821715a0
Stringtable modules
...
Conflicts:
addons/missionmodules/CfgVehicles.hpp
addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02:00
Alessandro Foresi
2dd06babec
Added: Italian translations completed.
...
Fixed: BOM markers where missing
2015-05-10 11:44:46 +02:00
Alessandro Foresi
643df71932
Added: Italian translation from Blackedsoul p#20
2015-05-10 11:05:16 +02:00
KoffeinFlummi
1e786d4a92
Merge https://github.com/FreeZbe/ACE3 into french-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
2015-05-01 17:45: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
FreeZbe
371aa381ec
Update stringtable.xml
2015-05-01 14:12:45 +02:00
ulteq
a6f4c68ef4
Removed obsolete comment
2015-05-01 13:50:01 +02:00
ulteq
940f8e8349
Cleanup++:
...
*Removed spawn
*Added, moved and renamed some privates
2015-05-01 11:38:09 +02:00
ulteq
e8264110bb
Replaced sleep with waitAndExecute
2015-05-01 10:12:41 +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
Dimaslg
f8d5c423ae
Merge conflicts resolved
2015-04-29 21:15:22 +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
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
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
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
NukeDev
db82df6214
Italian's Translation's Changes v2
2015-04-28 18:10: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
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
Dimaslg
274663e1b9
Spanish Translation
...
Minor fixes and spelling mistakes.
2015-04-25 18:53:45 +02:00
Nicolás Badano
1bfb13abac
Revert "remove author from items inheriting ACE_ItemCore"
2015-04-21 19:07:42 -03:00
bux578
3897b73d56
remove author from items inheriting ACE_ItemCore
2015-04-21 19:16:54 +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
Tachii
e62a476a90
Update stringtable.xml
2015-04-19 01:37:08 +03:00
FreeZbe
f55bd5a629
French: updates / fixes stringtable
2015-04-18 18:49:46 +02:00
PabstMirror
9c9136ae91
Stringtable cleanup
2015-04-16 02:54:50 -05:00
KoffeinFlummi
1b67b2df26
Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge
...
Conflicts:
addons/disposable/stringtable.xml
addons/explosives/stringtable.xml
addons/fcs/stringtable.xml
addons/frag/stringtable.xml
addons/hearing/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/javelin/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/markers/stringtable.xml
addons/microdagr/stringtable.xml
addons/movement/stringtable.xml
2015-04-15 22:20:47 +02:00
ruPaladin
252fb67119
Update stringtable.xml
2015-04-15 19:50:32 +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
Marco
45fec0409d
Update stringtable.xml
...
Italian
2015-04-15 10:51:26 +02:00
KoffeinFlummi
63fe4118d4
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +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
Grzegorz Sikora
ac886828b0
Fixes
2015-04-13 18:02:48 +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
45f3300967
Update stringtable.xml
...
Added: Missing french translation.
2015-04-12 18:20:32 +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
KoffeinFlummi
59952441d8
Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge
2015-04-12 06:22:17 +02:00
