Commit Graph

222 Commits

Author SHA1 Message Date
licht-im-Norden87
5e0f109b4c Update stringtable.xml 2016-02-21 21:15:38 +01:00
licht-im-Norden87
00c8f7bdef mk6 2016-02-21 20:30:57 +01:00
ChairborneIT
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
VKing
74d410688f Add check so vanilla magazines can't be unloaded 2016-02-14 14:10:28 +01:00
VKing
560c509a3a Changed to using playerVehicleChanged. 2016-02-14 13:51:44 +01:00
VKing
f652db1d2f Add Loadout box for easy conversion 2016-02-04 20:35:00 +01:00
Glowbal
376b611b89 Merge branch 'master' into Mortar_interact 2016-02-04 20:21:03 +01:00
ProfessorCZ
61611d0ec7 Czech Translation - Update
Update
2016-02-03 18:31:31 +01:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
VKing
222b15634f Increase prep time for guided projectiles 2015-12-31 22:26:04 +01:00
VKing
38fb97aeac Fixed init problem; added mortar ammo boxes 2015-12-20 20:51:44 +01:00
VKing
73720f9313 Too hasty 2015-12-20 18:20:34 +01:00
VKing
b7bd468fdd That ought to not have worked before 2015-12-20 18:18:33 +01:00
VKing
450a18e13a Forgot to disable in case the setting's set to "no" (but why would you ever want to 2015-12-19 21:29:37 +01:00
VKing
f75311917c Upped mortar round mass 2015-12-19 20:49:09 +01:00
VKing
b4cb5c2ba7 Changed mortar initialization to getIn; Zeus-controlled AI will not trigger the init. 2015-12-19 19:54:45 +01:00
VKing
85270e4521 Fix init issue 2015-12-19 18:22:54 +01:00
VKing
a37d97103f Erk 2015-12-19 16:37:30 +01:00
VKing
a336707623 Fixed initialization, added exclude variable to prevent initialization of individual guns (for e.g. AI mortars) 2015-12-19 16:30:01 +01:00
VKing
dfe7c07936 Fix fnc_mortarInit, fnc_loadMagazine, some other stuff 2015-12-19 12:10:12 +01:00
VKing
2c4a25a6c0 Mortar init functions 2015-12-19 02:18:35 +01:00
VKing
579f861b8f Unload to player inventory 2015-12-17 19:25:22 +01:00
VKing
27890a8dab First try at some module control 2015-12-17 11:00:46 +01:00
VKing
a0fdc58ed7 Remove unused variables, spaces 2015-12-17 09:13:23 +01:00
VKing
d8c8d02177 Port inventory picture and model 2015-12-17 00:21:54 +01:00
VKing
e0a21ce144 Completed code porting and interaction 2015-12-16 23:47:14 +01:00
VKing
3e6fc52733 First working iteration.
Todo:
Implement in module (Choose new or old/don't break old missions)
Magazine UI+model
Add preparing delay
Fix function readmes
Cleanup in functions?
Credits
MP Testing
2015-12-16 20:22:18 +01:00
VKing
170095ae35 Initial commit for mortar ammunition handling. 2015-12-13 18:27:13 +01:00
commy2
a9ebcf8543 fix setVariable and getVariable capitalization 2015-11-30 17:27:09 +01:00
commy2
34d351c652 fix exitWith capitalization 2015-11-30 17:14:05 +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
PabstMirror
d3c2420381 Merge branch 'master' into miscFixNilFunctions
Conflicts:
	addons/common/functions/fnc_doAnimation.sqf
2015-09-21 15:08:43 -05:00
Grzegorz
29db26eb58 Add missing english string 2015-09-21 00:40:14 +02:00
PabstMirror
c62ea5e406 Fix some nil functions 2015-09-18 13:47:19 -05:00
PabstMirror
f419762653 Fix time of flight display 2015-09-14 23:33:32 -05: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
[OMCB]kaban
f69b94af98 Fix due to review 2015-09-05 04:53:30 +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
KoffeinFlummi
a7f2a7fefc Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3 2015-08-30 00:35:11 +02:00
jonpas
de033f0ff2 README.md files added to all modules 2015-08-19 04:18:33 +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
Harakhti
d0f91c5ebf Row 1
Not a miracle, but it's something.
2015-07-30 14:40:51 +02:00
PabstMirror
4f9dba61ee Mk6 - Misc cleanup 2015-07-26 16:45:34 -05:00
PabstMirror
14eae93f4b #1814 - Save and restore last mortar charge setting 2015-07-13 19:09:55 -05:00
PabstMirror
78d0767051 #1838 - Remove base airFriction test (broke smokes) 2015-07-13 18:42:59 -05:00
PabstMirror
061ddbd8de Remove debug testing code 2015-07-12 14:09:27 -05:00
PabstMirror
ba8c9186bb Show leveled azimuth/elevation 2015-07-08 01:00:43 -05:00
PabstMirror
1c6b12126e Merge branch 'master' into mk6-fixBISleveling 2015-07-02 22:03:25 -05: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
PabstMirror
bb414dd10f Redo Some UI - Try to fix vectorUp problems 2015-06-14 00:52:30 -05: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
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
ulteq
cfc23fe3e7 Removed some dead code 2015-06-06 10:01:30 +02:00
jonpas
3206e3b537 Fixed a syntax error, Fixed nametags module order as per last pull request 2015-06-02 22:36:06 +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
Macusercom
038880cb01 Additional Translations for German + some corrections 2015-05-30 23:33:51 +02: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
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
Kavinsky
8e9b35c757 Fixed Capitalized folders on include paths 2015-05-20 23:28:10 +02:00
SAM
31adb5a9fc Second batch of settings files 2015-05-14 20:59:25 +02:00
ulteq
7474d7f313 Merge pull request #1193 from acemod/getTemperatureAtHeight
Moved all temperature calculations into the weather module.
2015-05-14 16:41:16 +02:00
ulteq
cf487b544e Moved all temperature calculations into the weather module. 2015-05-14 16:07:41 +02:00
GieNkoV
1610221a70 Remove duplicated strings 2015-05-12 20:01:10 +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
6a821715a0 Stringtable modules
Conflicts:
	addons/missionmodules/CfgVehicles.hpp
	addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02: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
2dd06babec Added: Italian translations completed.
Fixed: BOM markers where missing
2015-05-10 11:44:46 +02:00
KoffeinFlummi
d0c7fce7f3 Merge https://github.com/adam3adam/ACE3 into czech-merge
Conflicts:
	addons/interaction/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
2015-05-02 23:29:45 +02:00
adam3adam
05a6389acd Czech translation v2
mk6mortar and some medical translation
2015-05-02 12:46:28 +02:00
ToasterBR
021b00c722 Translation to Portuguese
Done all remaining portuguese translations, including some minor
corrections
2015-05-02 03:38:53 -03:00
Grzegorz
c9cf1d2455 Update CfgVehicles.hpp
another typo few lines below
2015-05-02 01:26:54 +02:00
Grzegorz
5b9e6de6f1 Update CfgVehicles.hpp
missing "s"
2015-05-02 01:21:49 +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
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
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
FreeZbe
79ac41bd95 Update stringtable.xml 2015-05-01 14:19:43 +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
Bla1337
cfbf3bd053 Localization update 2015-04-29 11:20:21 +03:00
ulteq
908c204893 Replaced Tabs with Spaces 2015-04-28 18:24:24 +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
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
simon84
8ac6f61fcf added some translations
added some translations
2015-04-28 00:36:37 +02:00
Grzegorz
3d5f7b1bf0 Update stringtable.xml 2015-04-26 23:01:31 +02:00
Grzegorz Sikora
a272258500 PL translation 2015-04-26 22:59:20 +02:00
KoffeinFlummi
b472292b20 Remove tabler comments.
sed is awesome.
2015-04-26 21:05:41 +02:00
PabstMirror
3b9b09a7af UpdateFiringTable-ChangesFromWeather 2015-04-24 13:26:09 -05:00
PabstMirror
eaeda54f8c Remove Dialog Check so it works inside veh 2015-04-07 19:41:48 -05:00
PabstMirror
656fa8868a Module Icons 2015-04-07 19:37:46 -05:00
PabstMirror
71d609f8e0 Private Variables 2015-04-07 19:30:07 -05:00
PabstMirror
65d61ad1e3 opps 2015-04-07 19:22:33 -05:00
PabstMirror
b9341033d7 Rangetable for vanilla ballistics 2015-04-07 19:19:08 -05:00
PabstMirror
d295ee6980 Localization / Headers 2015-04-06 01:05:28 -05:00
PabstMirror
2ada87e3ac Rangetable Item 2015-04-05 18:05:23 -05:00
PabstMirror
a8b000c159 Some Headers 2015-04-05 17:50:07 -05:00
PabstMirror
5c5b8f656e Tweak Air to match known data 2015-04-05 17:37:11 -05:00
PabstMirror
c768ef65b2 Tweaking PowderEffects/AirRestitance 2015-04-05 17:07:55 -05:00
PabstMirror
3e77eb9737 Rangetable Builder and Prepcalc 2015-04-05 16:28:12 -05:00
PabstMirror
61a0ae1aec Rangetable Dialog 2015-04-05 15:48:56 -05:00
PabstMirror
3d9da5f142 Make Mils Toogle Self Action 2015-04-05 15:00:59 -05:00
PabstMirror
34a86e0db3 Fix Heading Mils 2015-04-05 14:48:26 -05:00
PabstMirror
0281897a3d Show Charge - Cleanup Settings 2015-04-05 14:34:39 -05:00
PabstMirror
e71378f9b3 AirResit Module Setting / Charge Display ctrl 2015-04-05 12:40:48 -05:00
PabstMirror
1726b787f7 AirRestitance/Wind Effects 2015-04-05 03:02:24 -05:00
PabstMirror
518f2077fe Disable ArtyComputer 2015-04-05 02:27:13 -05:00
PabstMirror
dab4822876 Settings / Module 2015-04-05 02:18:51 -05:00
PabstMirror
e6c7758d3f Prototype - Show Mils on mk6 2015-04-05 01:57:24 -05:00