commy2
a9ebcf8543
fix setVariable and getVariable capitalization
2015-11-30 17:27:09 +01:00
commy2
d037f00a92
fix forEachIndex capitalization
2015-11-30 17:25:16 +01:00
commy2
b3950bd7f0
fix forEach capitalization
2015-11-30 17:23:48 +01:00
commy2
a8228f60c2
fix configFile capitalization
2015-11-30 17:23:02 +01:00
commy2
d9b90258bc
fix typeOf capitalization
2015-11-30 17:19:57 +01:00
commy2
0b84bb514b
fix Cfg capitalization
2015-11-30 17:09:26 +01:00
commy2
dcf0a68b80
Revert "fix Cfg capitalization"
...
This reverts commit 43bda9c462
2015-11-30 17:00:32 +01:00
commy2
43bda9c462
fix Cfg capitalization
2015-11-30 16:52:20 +01:00
commy2
ca9b909e75
fix CBA_fnc capitalization
2015-11-30 16:45:20 +01:00
PabstMirror
c91789f3c4
Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking
2015-11-06 20:30:12 -06:00
VKing
069169cc72
Changed ACE_time back to time in comments where appropriate
2015-10-21 22:52:21 +02:00
PabstMirror
64de91ed06
Add warning for duplicate setting modules.
2015-10-18 23:34:11 -05:00
commy2
2fe142032e
rework modifier key, cleanup sandbags, tripod, ladder, fix #2590
2015-09-26 03:16:55 +02:00
PabstMirror
ebcc540943
Merge pull request #2572 from acemod/fixClickExplosivePlace
...
Delay one frame when selecting explosives
2015-09-22 13:23:33 -05:00
PabstMirror
5add8d6789
#2537 - Delay one frame when selecting explosives
2015-09-22 11:31:58 -05:00
esteldunedain
a621a0c693
Fixes to spanish translations
2015-09-18 13:36:57 -03:00
Ivan Navarro Cabello
463e21dd91
330
2015-09-16 12:40:30 +02:00
Glowbal
7e5ab07e32
Merge pull request #2387 from acemod/FixHCPPE
...
Fix that PPEffects Throw a error on HC
2015-09-15 21:04:37 +02:00
Glowbal
478b618e4b
Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros
...
Feature/switch to log macros
2015-09-15 14:51:23 +02:00
Alessandro Foresi
bc4f928088
Add: IT translation up to flashlights
2015-09-12 09:41:43 +02:00
jokoho48
b7e02da1cc
remove if (!hasInterface) from PFH
...
move ! in ()
2015-09-11 16:58:26 +02:00
KoffeinFlummi
63c2712360
Merge branch 'release' into portuguese
2015-09-10 21:59:30 +02:00
KoffeinFlummi
c2ffe7cad0
Merge branch 'release' into russian
2015-09-10 21:05:32 +02:00
KoffeinFlummi
a5621604fd
Merge branch 'release' into czech
2015-09-10 20:51:33 +02:00
KoffeinFlummi
83aa2cc68c
Merge branch 'release' into french
2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be
Update French translations
2015-09-10 19:14:51 +02:00
Michael Braun
a5fb09a7e1
Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
...
Conflicts:
addons/repair/functions/fnc_moduleRepairSettings.sqf
2015-09-09 02:55:12 +02:00
Jonathan Pereira
7147891710
Added latest ACE3 PT-BR translations
2015-09-05 15:12:31 -03:00
kaban
08b7110e58
Russian Translations - Update
2015-09-03 04:54:52 +03:00
kaban
91cae690c0
Russian Translations - Update
2015-09-03 03:36:15 +03:00
ProfessorCZ
44fa520bdd
Czech Translations - Update
2015-09-03 01:20:24 +02:00
Michael Braun
035b3432c5
Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
...
Conflicts:
addons/common/XEH_postInit.sqf
2015-09-01 08:45:59 +02:00
gienkov
17f647f341
PL translation
2015-08-30 01:42:42 +02:00
KoffeinFlummi
a7f2a7fefc
Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3
2015-08-30 00:35:11 +02:00
Michael Braun
5047d4de1c
Switched to ACE_LOG<LEVEL>_# variation
2015-08-26 17:39:44 +02:00
Michael Braun
097506076f
Fixed format usage in macros requiring ARR_# for it to work
2015-08-26 16:48:55 +02:00
Michael Braun
9e10aa86d7
Standardize logging format through ACE_LOG macros
2015-08-26 15:32:54 +02:00
PabstMirror
05925ad7c2
Merge pull request #1902 from acemod/virtualExplosivesPlace
...
Virtual explosives place
2015-08-23 16:57:24 -05:00
gienkov
cf585790db
fixes done
2015-08-22 11:41:15 +02:00
PabstMirror
cc9eee5609
Typo
2015-08-21 09:42:23 -05:00
PabstMirror
4c14dc7684
#2208 - Use ACE Message Display instead of sideChat
2015-08-19 17:25:45 -05:00
PabstMirror
61bc40a650
Opps
2015-08-16 02:05:34 -05:00
PabstMirror
b9638f749b
SetPosition Event - Fix digging down ( #1991 )
2015-08-16 01:51:44 -05:00
PabstMirror
fc6cd34d33
params, cleanup
2015-08-15 14:35:33 -05:00
PabstMirror
7203bb2a3d
Cleanup Debug, Limit Satchel Mass
2015-08-05 12:22:43 -05:00
PabstMirror
a6292db1e8
#2018 - Dead Mans Switch / unconscious
2015-08-05 11:54:45 -05:00
PabstMirror
72273c5ad0
Merge branch 'master' into virtualExplosivesPlace
2015-08-05 11:36:58 -05:00
Harakhti
d0f91c5ebf
Row 1
...
Not a miracle, but it's something.
2015-07-30 14:40:51 +02:00
PabstMirror
214fda074a
Merge branch 'master' into virtualExplosivesPlace
2015-07-28 15:48:37 -05:00
PabstMirror
bfd3aa71c4
Manual Fix #1931
2015-07-28 15:25:52 -05:00
SilentSpike
16597515f0
Adding remaining missing English straings
2015-07-28 20:55:22 +01:00
PabstMirror
9b551e3fdf
#1931 - Fix Explosives Module Strings
2015-07-28 14:42:23 -05:00
PabstMirror
9f078d405b
Tweak Place when Prone
2015-07-25 02:10:33 -05:00
PabstMirror
bff629be9c
Fix PositionAsl / Update mouse hints
2015-07-25 01:42:17 -05:00
PabstMirror
bc953b32bc
More Stuff
2015-07-18 00:36:47 -05:00
Glowbal
0154dfc51e
Merge pull request #1799 from jokoho48/3DModelUpdate
...
Add and Update Some 3D Object and Textures
2015-07-17 08:17:42 +02:00
PabstMirror
df90c4b88e
More Attach Stuff
2015-07-16 23:59:31 -05:00
PabstMirror
1f4488253d
Only attach some triggers
2015-07-15 23:52:47 -05:00
Joko
9aa0285064
Revert LoD Changes
2015-07-15 21:13:05 +02:00
Joko
fd4d4abb73
Move UAV Battery form models to data
...
change LoD Distance
Fix IVBag names(my issue)
2015-07-15 20:51:06 +02:00
Joko
a72312738e
Add to all Objects a LoD with nothing in for "hiding" Objects in Distance
...
Remove Old Earplugs
Use 3 Object instead of 9 for IVBag with Using of Model Config
2015-07-15 20:34:35 +02:00
PabstMirror
7cc2628c53
Stuff
2015-07-15 03:18:19 -05:00
PabstMirror
104d1a1cc7
Attaching (Rotate to verticle)
2015-07-15 02:54:38 -05:00
PabstMirror
6130b5b373
Working Demo
2015-07-14 00:24:55 -05:00
Ivan Navarro Cabello
78529af60c
Update spanish translation
2015-07-08 20:57:46 +02:00
Joko
240b26b9ac
Add IRStrobe 3D Object to attach
...
Add M57 Clacker to explosives
Add New LowPoly Earplug to Hearing
Add WireCutter to logistics_wirecutter
Reduce UAVBattery Texture Size in logistics_uavbattery
Add MapTools to maptools
2015-07-04 19:56:54 +02:00
ProfessorCZ
89a9218e59
CZ Translation - Update
2015-07-04 15:56:00 +02:00
gienkov
70862c5de9
PL translation
2015-07-02 23:55:26 +02:00
ToasterBR
f4a51d57ef
Translation to Brazilian Portuguese (PT-BR)
...
Made all remaining translations, including new ones like the sitting
module, for example.
2015-06-27 15:48:39 -03:00
ulteq
241e8acdd9
Merge pull request #1541 from jonpas/sitting
...
Sitting
2015-06-26 21:34:34 +02:00
ulteq
474e694309
Enable interaction with explosives while swimming
2015-06-19 11:49:38 +02:00
AKALegman
c027db2e0e
final fixes
2015-06-15 20:55:49 +01:00
AKALegman
5915e24f5d
some fixes
2015-06-14 16:09:01 +01:00
AKALegman
0690e6f745
fixed conflicts
2015-06-14 09:36:03 +01:00
jonpas
670d23e14c
Fixed Black Cellphone Display after 1.46
2015-06-13 22:12:32 +02:00
jonpas
29ce8f635e
Merge branch 'master' into sitting
...
Conflicts:
addons/kestrel4500/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
2015-06-13 21:43:42 +02:00
esteldunedain
1237b1cb4a
Make claymores detonatable by MK16. Close #1603
2015-06-13 16:05:18 -03:00
ProfessorCZ
531372b2a3
CZ - Translation
...
Already in README
2015-06-12 14:50:50 +02:00
jonpas
332afb2174
Allow certain self-interactions while sitting
2015-06-09 16:17:05 +02:00
AKALegman
0e375075ea
improved explosives v2.1
2015-06-06 19:04:58 +01:00
AKALegman
46ed9416ed
improved explosives v2
2015-06-06 18:58:42 +01:00
AKALegman
f9a7ab5ae0
improved explosives
2015-06-06 10:11:00 +01:00
PabstMirror
32ce0aa6fd
Macroize all stringtables
2015-06-05 21:02:24 -05: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
Glowbal
1c0c73be54
Merge pull request #1433 from acemod/fixSettingsFromModules
...
Delay initialization of modules until settings are properly setup
2015-06-01 19:18:11 +02:00
KoffeinFlummi
fa73aec15b
Merge https://github.com/Macusercom/ACE3 into german-merge
2015-06-01 14:27:49 +02:00
Macusercom
038880cb01
Additional Translations for German + some corrections
2015-05-30 23:33:51 +02:00
PabstMirror
23d300df52
Merge pull request #1417 from acemod/localDefuseObjects
...
Explosives - Local defuse objects
2015-05-30 15:46:07 -05:00
jonpas
d934c25b78
Merge branch 'master' into macroSTR
...
Conflicts:
addons/interact_menu/ACE_Settings.hpp
2015-05-30 19:54:32 +02:00
AKALegman
3b01da6962
IED Class Inheritance Fixes
2015-05-30 16:57:50 +01:00
PabstMirror
84d940e69d
Fix circular dependency - ModuleDescription
2015-05-30 00:31:07 -05:00
esteldunedain
9d29aa2107
- Change all modules on ACE using settings to type ACE_Module, so we can guarantee that they wait for settings before initing.
...
- Make ace_common require ace_modules, so all ACE pbos are guaranteed to have it
2015-05-30 01:37:41 -03:00
jonpas
763cb07629
Macro STRING to LSTRING
2015-05-28 21:59:04 +02:00
Garth L-H de Wet
529e200a4c
Made explosives Zeus and AI compatible specifically in regards to Deadman's switches.
2015-05-28 17:56:45 +02:00
Macusercom
489751f5aa
More German string fixed
...
As recommended...
2015-05-28 16:21:53 +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
PabstMirror
5f2bee09e4
Create Defuse Helpers on demand
2015-05-27 14:09:06 -05:00
jonpas
6072e14077
Changed all strings to macros (except external)
2015-05-27 19:04:25 +02:00
Ivan Navarro Cabello
047a2ee736
added spansih translate
...
added spansih translate for (advanced_ballistics, ballistics, captives,
common, explosives, frag, hearing, interaction, map, medical, microdagr,
missileguidance, missionmodules, mk6mortar, nametags, optionsmenu,
respawn, switchunits, vehiclelock, weather, winddeflection).
I used the Pull request of #1251 for complete my commit, because #1251
is outdated now.
2015-05-27 15:27:04 +02:00
PabstMirror
adf29d75e3
Explosives - Local Defuse Helpers
2015-05-26 23:15:50 -05:00
Macusercom
7eeddfbd65
German translations
...
Added a lot of German translations and fixed even more typos.
2015-05-26 17:04:53 +02:00
jaynus
582ea318d4
Merge remote-tracking branch 'origin/superTime'
...
Conflicts:
addons/frag/functions/fnc_fired.sqf
addons/frag/functions/fnc_trackFragRound.sqf
2015-05-22 07:24:55 -07:00
PabstMirror
72020a43f1
Privates / Remove Debug
2015-05-21 17:53:15 -05:00
PabstMirror
4e92a51cf8
Create Defuse Helpers for spawned Explosives
2015-05-21 17:47:54 -05:00
jaynus
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
Garth L-H de Wet
8edeb45d6d
Changed the animation from medic to put when placing an explosive. Added a put animation when setting the trigger for an explosive.
2015-05-20 17:17:09 +02:00
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
KoffeinFlummi
c6efd4e546
Merge https://github.com/EpMAK/ACE3 into russian-merge
2015-04-12 05:39:46 +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
12f87013b2
Merge branch 'master' of https://github.com/acemod/ACE3
2015-04-11 19:38:28 +02:00
commy2
e1bf475355
Merge pull request #419 from acemod/cfgtriggers
...
rename cfgAce_Triggers to ACE_Triggers
2015-04-11 18:19:36 +02:00
Kllrt
38adfbcb70
Added missing CZ strings and made little revision
2015-04-11 16:33:00 +02:00
esteldunedain
d6e70cfe6b
Merge branch 'patch-3' of https://github.com/Legolasindar/ACE3 into Legolasindar-patch-3
...
Conflicts:
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/frag/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/medical/stringtable.xml
2015-04-10 16:20:18 -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
commy2
c7ad94efbf
renamed hpp to ACE_Triggers
2015-04-10 17:09:48 +02:00
commy2
5c12b22666
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into cfgtriggers
2015-04-10 17:07:47 +02: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
commy2
5fe33fb1db
rename cfgAce_Triggers to ACE_Triggers
2015-04-10 05:56:19 +02:00
PabstMirror
26d282c224
Explosives: Fix cursor interaction menu breaking
2015-04-09 22:46:19 -05:00
VyMajoris
4198a942b3
Added/Changed - explosives Portuguese Translation
...
Added "Dead Man's Switch" and "Explosives_Pickup" PT translation and corrected some stuff.
2015-04-09 22:42:21 -03:00
Grzegorz
d0787ab2d8
explosives PL translation
2015-04-10 03:40:03 +02:00
Legolasindar
df31442599
Update stringtable.xml
...
added spanish terms
2015-04-10 01:13:33 +02:00
licht-im-Norden87
2304b46e2f
Update stringtable.xml
2015-04-09 23:39:48 +02:00
PabstMirror
253614d442
Explosives: cancel placement when opening interact
...
"zoomtemp" doesn't work for me, so this gives an additional way to
cancel. It was also possible to start planting multiple explosives.
made a small change to make QGVAR(PlantingExplosive) always reset
2015-04-09 14:48:27 -05:00
esteldunedain
765ae4ee64
Merge branch 'master' into tabCleanup
...
Conflicts:
addons/explosives/functions/fnc_addClacker.sqf
addons/explosives/functions/fnc_detonateExplosive.sqf
addons/explosives/functions/fnc_getPlacedExplosives.sqf
addons/explosives/functions/fnc_openDetonateUI.sqf
addons/explosives/functions/fnc_openPlaceUI.sqf
addons/explosives/functions/fnc_openTransmitterUI.sqf
addons/explosives/functions/fnc_openTriggerSelectionUI.sqf
addons/explosives/functions/fnc_placeExplosive.sqf
addons/explosives/functions/fnc_place_Approve.sqf
addons/explosives/functions/fnc_setPosition.sqf
2015-04-07 15:00:56 -03:00
bux578
92da20ce62
translations
...
#367
2015-04-07 10:02:33 +02:00
Garth L-H de Wet
513ab25f54
Merge branch 'master' into explosiveInteraction
...
Conflicts:
addons/explosives/functions/fnc_placeExplosive.sqf
2015-04-06 22:30:27 +02:00
Garth L-H de Wet
9d7d71b1b1
Changed the tabs to 4 spaces. Hopefully.
2015-04-06 22:20:11 +02:00
Garth "L-H" de Wet
e0b4efd9f1
Merge pull request #280 from KoffeinFlummi/explosiveInteraction
...
Explosive interaction
2015-04-06 22:12:04 +02:00
Garth L-H de Wet
44c597f7c5
Explosives, 2 spaces to 4 space tab.
2015-04-06 22:10:00 +02:00
jaynus
1bb6be5654
Cleaning up of all tabs in source code files.
2015-04-06 09:22:43 -07:00
Nou
6541600d44
Switch everything to use modelToWorldVisual instead of modelToWorld.
2015-04-03 15:26:27 -07:00
Garth L-H de Wet
7c73f7479e
Used a more suitable icon for taking explosives.
2015-04-03 09:51:32 +02:00
Garth L-H de Wet
703bc24657
Made picking up explosives use the new AddToInventory function from common.
2015-04-02 21:44:33 +02:00
Garth L-H de Wet
452947148a
Random clean ups and explosive can now detonate with their object.
...
Defuse object doesn't get cleaned up on it's own. But if a player comes near it with interact menu on it will get cleaned up.
2015-04-01 20:43:18 +02:00
Garth L-H de Wet
7d5555a2e0
Renamed functions to be more inline with their purpose.
...
Removed legacy code.
2015-04-01 19:09:19 +02:00
Garth L-H de Wet
c020128f0e
Made explosives use children action points rather than the listbox at all points.
...
Added the ability to defuse on explosives. "on explosives", there is a helper object that handles defusing.
Known issue, it appears that the attachTo explosives don't detonate. This means the currently approach should be changed to a object variable method, instead of an attached object method.
2015-03-31 23:20:32 +02:00
Garth L-H de Wet
613257141b
Merge branch 'removedExpPlaceMenu' into explosiveInteraction
...
Conflicts:
addons/explosives/CfgVehicles.hpp
addons/explosives/functions/fnc_openPlaceUI.sqf
2015-03-31 19:29:09 +02:00
Garth L-H de Wet
8158a3e841
Fixed small errors caused by working blind.
2015-03-31 19:26:38 +02:00
Garth L-H de Wet
9c13a87d83
Merge branch 'master' into explosiveInteraction
2015-03-31 17:21:55 +02:00
Garth L-H de Wet
37fe824426
Added pickup action to put down explosives.
2015-03-31 17:12:12 +02:00
bux578
05896a55ea
fix authors
2015-03-24 19:40:48 +01:00
bux578
60c50e0daf
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons
2015-03-24 19:12:23 +01:00
Nicolás Badano
a823fb2dca
Tweaks on action names to:
...
- Remove >> for submenus
- Split long action names in two lines
2015-03-24 00:16:32 -03:00
PabstMirror
20362e8dc9
Cleanup exception names
2015-03-23 15:22:26 -05:00
bux578
ba42ec831b
second batch of icons
2015-03-23 20:02:35 +01:00
Nicolás Badano
386fee4694
Replace place list menu by dynamically created actions
2015-03-19 13:31:45 -03:00
PabstMirror
bed312dcee
Use MACRO_ADDITEM from main instead of redefining
2015-03-11 17:36:40 -05:00
Garth L-H de Wet
ece4c8e0bc
Merge branch 'master' into explosiveInteraction
2015-03-09 20:07:42 +02:00
Nicolás Badano
47eec69ebe
Removed old config entries
2015-03-01 01:33:38 -03:00
Nicolás Badano
2b0cfac8e4
Removed obsolote code from ace_interaction ( #109 )
2015-02-28 23:00:24 -03:00
Garth L-H de Wet
9d1b1e1b12
Explosives are now placed first and then the trigger is set afterwards.
2015-02-20 03:28:16 +02:00
Garth L-H de Wet
88af894f55
Added a SetTrigger action to placement items in preparation for changes over to a set trigger after place system as opposed to before.
2015-02-20 00:45:31 +02:00
Garth L-H de Wet
910a6a16ab
Split out the EPEContactStart code into its own function since it was quite long.
2015-02-20 00:44:54 +02:00
Garth L-H de Wet
96404bc42a
Fixed isNull check not working. Fixed audio not being found.
2015-02-19 15:59:14 +02:00
Garth L-H de Wet
f5a6f6f404
Fixed various points raised in the PR.
2015-02-19 15:30:01 +02:00
Garth L-H de Wet
89a81dbed1
Forgotten function added.
2015-02-19 12:40:21 +02:00
Garth L-H de Wet
00643c3c83
Ensured actual fuse time is used instead of simply 1.
2015-02-19 12:39:13 +02:00
Garth L-H de Wet
8c83320675
Separated dialing phone code into separate function to neaten up the original function.
2015-02-19 12:32:41 +02:00
Garth L-H de Wet
e592f233f3
Merge branch 'master' into IEDSupport
2015-02-19 12:26:38 +02:00
Garth L-H de Wet
4d38e19f8c
Should avoid potential conflicts of IED codes.
2015-02-04 02:19:56 +02:00
Garth L-H de Wet
749d068d2d
Added IED handling (for the player and support for AI). Can dial an IED and it will ring before exploding.
2015-02-04 02:16:47 +02:00
Garth L-H de Wet
f2ef53168b
Added the cellphone as a item.
2015-02-04 02:15:31 +02:00
Garth L-H de Wet
357927902d
Fixed incorrect variable getting in openPlaceUI function.
2015-02-04 02:14:55 +02:00
Nicolás Badano
18fa6f9850
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into aceSettings
2015-02-03 17:48:24 -03:00
Nicolás Badano
74d0ae95ff
Change ACE_Settings from modules
2015-02-03 02:53:02 -03:00
Garth L-H de Wet
c96882dd02
Fixed incorrect header comment for explosives.
2015-02-02 11:42:14 +02:00
Garth L-H de Wet
2440e4fa69
Fixed incorrect indenting with headers in explosives.
2015-02-02 10:35:17 +02:00
Garth L-H de Wet
eafc9e659c
Fixed the headers of the explosives system to be the correct style.
2015-02-01 20:38:15 +02:00
Nicolás Badano
981978d043
ACE_Settings: replace all ACE_Parameters
2015-01-30 19:06:25 -03:00
PabstMirror
9631154926
Set ADDON variable in XEH_preInit
2015-01-29 01:38:46 -06:00
PabstMirror
bf791e32c4
Merge pull request #93 from KoffeinFlummi/progresBarNew
...
#87 - New Progress Bar
2015-01-27 19:28:51 -06:00
Felix Wiegand
bf452b2c24
Create README.md
2015-01-26 13:42:07 +01:00
PabstMirror
5e932f8c71
Replace calls to progressBar
...
Mag repack
Defuse
Swap Barrel
2015-01-26 00:24:33 -06:00
PabstMirror
6e8c394903
Standardize Config Version Stuff
2015-01-18 01:32:07 -06:00
Nicolás Badano
4926b6970b
fixes typos
2015-01-17 13:45:56 -03:00
Nicolás Badano
fefb599a55
explosives: change addPerFrameHandler to waitAndExecute
2015-01-17 03:09:51 -03:00
Nicolás Badano
800e16edc5
explosives: fix timer in case the game pauses
2015-01-17 02:14:09 -03:00
Nicolás Badano
a4a4ca39f6
explosives: fixed timer #26
2015-01-15 17:06:38 -03:00
Nicolás Badano
f06da9a8c1
explosives: missing include
2015-01-15 16:57:27 -03:00
Nicolás Badano
1d5201c0d7
explosives: Fix #32
2015-01-15 16:13:12 -03:00
bux578
de8ca47e88
change some core to common
2015-01-14 14:28:04 +01:00
Nicolás Badano
c16c5e756c
explosives: fixes
2015-01-14 10:13:04 -03:00
Nicolás Badano
167497ec2f
small fixes for explosives and interaction
2015-01-14 10:11:46 -03:00
PabstMirror
2df8f4f1fb
Cleanup old AGM
2015-01-13 19:57:15 -06:00
Garth L-H de Wet
66eeba7df1
Fixed small errors that expressed themselves when getting explosives in game.
2015-01-13 23:49:27 +02:00
Garth L-H de Wet
0e09d5de67
Added the function's script_component.hpp that includes the correct file. To reduce potential pain areas if a rename occurs.
2015-01-13 23:21:31 +02:00
Garth L-H de Wet
6d8708618a
Wrapped BIS and CBA function calls in CALLSTACK.
...
Converted startTimer to CBA's perFrameEventHandler.
2015-01-13 12:13:43 +02:00
Garth L-H de Wet
43bac209d9
Changed EGVAR to not have spaces in macro call.
2015-01-13 12:12:59 +02:00
Garth L-H de Wet
fe056f10e1
Fixed errors in order to get explosives to load correctly without writing anything to config.
...
Will still need further testing once interaction is fully integrated.
2015-01-12 23:06:32 +02:00
Garth L-H de Wet
4926694bda
Changed all core external to common as the rename was done.
2015-01-12 22:39:37 +02:00
Garth L-H de Wet
57b766b48b
Updated to use CBA's ARR_2 macro.
2015-01-12 22:20:42 +02:00
Garth L-H de Wet
bfd9aedfa0
Updated pathing for script_component.hpp and updated images to use PATHTOF.
2015-01-12 19:11:43 +02:00
Garth L-H de Wet
f5772371bd
Added $PBOPREFIX$ for explosives.
2015-01-12 13:42:02 +02:00
Garth L-H de Wet
5e67de4d66
Ported AGM_Explosives to ace.
...
Marked locations where Scheduled Delay Execution will probably need to be used.
2015-01-12 11:48:26 +02:00
