Commit Graph

187 Commits

Author SHA1 Message Date
PabstMirror
b15716860d Remove VehicleLock Items from Virtual Arsenal
Close #3215
2016-01-25 14:29:27 -06:00
PabstMirror
0ea1c0c03f Cleanup non-working code, and documentation 2016-01-19 08:31:52 -06:00
PabstMirror
48a1ddd401 #3166 - Fix Vehicle inventory is not locked 2016-01-16 21:58:59 -06:00
PabstMirror
5850f78c1f Merge branch 'master' into isEqualTypeRepalcement 2015-11-27 21:08:21 -06:00
IngoKauffmann
cbe8d98f86 Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel 2015-11-23 19:29:05 +01:00
PabstMirror
69b53af1d3 1.54 - Replace typeName with isEqualType 2015-11-20 11:40:31 -06:00
PabstMirror
64de91ed06 Add warning for duplicate setting modules. 2015-10-18 23:34:11 -05:00
IngoKauffmann
b5568ca0db Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel
Conflicts:
	optionals/compat_bwa3/config.cpp
2015-10-10 13:13:30 +02:00
jokoho48
c5eb6e0070 posible fix for #2495 2015-09-18 04:12:18 +02:00
KoffeinFlummi
c2ffe7cad0 Merge branch 'release' into russian 2015-09-10 21:05:32 +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
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
KoffeinFlummi
a7f2a7fefc Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3 2015-08-30 00:35:11 +02:00
jonpas
5a0a3a53e0 Uppercased 2 readme files 2015-08-19 04:19:00 +02:00
jonpas
de033f0ff2 README.md files added to all modules 2015-08-19 04:18:33 +02:00
PabstMirror
a9ed1052dd vehLock - debug trace / type checking 2015-08-07 13:24:47 -05:00
Michael Braun
2423798753 Updated parameterization in Vehiclelock module. 2015-08-04 23:18:29 +02:00
Harakhti
b2aa5eee45 Row 3
BINGO FUEL
2015-07-30 16:28:50 +02:00
Harakhti
2b23958fd1 Row 2
It gets tedious after a while, especially if your language lacks
technical terms. That or my B2 language exam isn't good enough.
2015-07-30 16:06:32 +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
ProfessorCZ
531372b2a3 CZ - Translation
Already in README
2015-06-12 14:50:50 +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
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
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
jonpas
0b0f7274d7 Applied ESTRING and ECSTRING macros 2015-05-27 22:04:41 +02:00
jonpas
6f6f2a55f0 Stringtable fixes except medical 2015-05-27 21:43:30 +02: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
Macusercom
7eeddfbd65 German translations
Added a lot of German translations and fixed even more typos.
2015-05-26 17:04:53 +02:00
BullHorn
c05e7fb046 Documentation: Vehiclelock - 1st iteration
Add feature\Vehiclelock.md and add relevant info for players
Edit addons\Vehiclelock\readme.md for typos and errors
Edit missionmaker\modules.md for additional info
2015-05-16 23:42:54 +03:00
SAM
021679208b First batch of settings files
Separating ACE_Settings.hpp from config.cpp
2015-05-14 20:46:35 +02:00
Grzegorz Sikora
63c5308cd9 Missed one Yes/no to BOOL 2015-05-12 18:26:41 +02:00
Grzegorz Sikora
6a821715a0 Stringtable modules
Conflicts:
	addons/missionmodules/CfgVehicles.hpp
	addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02:00
ViperMaul
4e1370cbc3 Merge pull request #1093 from acemod/fixDisarming
Fix disarming
2015-05-11 08:38:56 -07:00
KoffeinFlummi
2bb3a0f139 Cleanup #1095
- Fix tabs
- Remove tabler comments
- Restore one removed Russian string
2015-05-10 16:19:46 +02:00
Alessandro Foresi
643df71932 Added: Italian translation from Blackedsoul p#20 2015-05-10 11:05:16 +02:00
PabstMirror
2da2794e20 ACE_isUnique config for mags instead of static list 2015-05-09 17:08:47 -05:00
Alessandro Foresi
7e7c3ed053 Added: More italian translations 2015-05-10 00:04:42 +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
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
PabstMirror
41bef1e58c Merge pull request #903 from acemod/vehLockFix
Veh lock fix
2015-04-29 13:34:38 -05:00
NukeDev
d4dc5e6d85 Other Fixes 2 2015-04-29 17:22: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
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
PabstMirror
f8b8d7dd16 Set Lock on postInit so spawned vehicles are set 2015-04-28 00:08:28 -05: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
PabstMirror
00f26144ec More Privates 2015-04-17 15:45:00 -05:00
KoffeinFlummi
20e4858a0d Merge https://github.com/ramius86/ACE3 into italian-merge 2015-04-17 15:44:50 +02:00
EpMAK
c2214efeb1 Russian stringtables finished
Filled all the missing lines, little errors fixed.
2015-04-17 14:54:28 +03:00
Marco
5e7fb0fb64 Update stringtable.xml
IT
2015-04-16 10:18:49 +02: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
Harakhti
e7e46b3b59 Translation: S to W
That's all I've found so far.
2015-04-14 00:05:39 +02:00
Grzegorz Sikora
ac886828b0 Fixes 2015-04-13 18:02:48 +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
PabstMirror
db5861da52 #428 - GJ Git 2015-04-10 13:05:39 -05:00
PabstMirror
33570c94e4 #428 - Only work on locked vehicles. 2015-04-10 13:05:39 -05:00
commy2
5ea35a01bb sorting out required addons for modularity 2015-04-09 13:23:29 +02:00
bux578
60c50e0daf Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons 2015-03-24 19:12:23 +01:00
PabstMirror
8346de8150 vehLock disable debug rpt spam 2015-03-24 04:01:20 -05:00
bux578
ba42ec831b second batch of icons 2015-03-23 20:02:35 +01:00
PabstMirror
d4624982f6 Update readme.md 2015-03-15 13:13:13 -05:00
PabstMirror
f101d40450 Readme cleanup 2015-03-15 13:10:06 -05:00
PabstMirror
726bf8d407 Headers, Formating, Fixes, Lock Inventory Option 2015-03-15 11:27:21 -05:00
commy2
b5f307919e replace canInteract with canInteractWith 2015-03-15 13:00:10 +01:00
Nicolás Badano
716eb72d16 Prevent ace_vehiclelock from overwritting mainaction distance 2015-03-01 19:35:18 -03:00
Nicolás Badano
f7d5d615ee allow actions to be defined for different selections 2015-02-19 15:36:27 -03:00
PabstMirror
fb3a610649 Fix bad STR_ACE_Common_ACETeam 2015-02-14 00:39:09 -06:00
Nicolás Badano
74d0ae95ff Change ACE_Settings from modules 2015-02-03 02:53:02 -03: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
c14514a3f9 VehLock - canInteract check 2015-01-27 20:11:06 -06:00
PabstMirror
5bfaf7da7d VehLock - new progessBar 2015-01-27 19:49:21 -06:00
PabstMirror
0ca2cb34ea setVariable names 2015-01-24 12:58:01 -06:00
PabstMirror
09eb5d6c65 Update readme.md 2015-01-24 12:48:28 -06:00
PabstMirror
04d4d5b9ec Readme 2015-01-24 12:45:11 -06:00
PabstMirror
4e31a4b57f First Pass 2015-01-23 16:40:39 -06:00
PabstMirror
5c8614f11c Port Vehicle Lock Inital 2015-01-23 16:14:22 -06:00