Commit Graph

4725 Commits

Author SHA1 Message Date
PabstMirror
1512e4c367 isClientSettable spelling 2015-04-28 14:09:26 -05:00
PabstMirror
9e8b13cd2b Merge branch 'master' into altSelfInteract
Conflicts:
	addons/interact_menu/functions/fnc_renderIcon.sqf
	addons/interact_menu/functions/fnc_renderSelector.sqf
	addons/interact_menu/stringtable.xml
2015-04-28 14:02:03 -05:00
Dimaslg
956b5e3558 Spanish Translation
Minor fixes and some things at the Medical system translated.
2015-04-28 21:01:48 +02:00
Glowbal
f606c24854 fixes #901 2015-04-28 20:47:11 +02:00
Glowbal
dbf748ba93 Merge branch 'master' into medicalImprovements 2015-04-28 20:33:39 +02:00
Glowbal
c06caa7209 Only add JIP event for player clients 2015-04-28 20:33:01 +02:00
Glowbal
ebbb88deff Join in progress players will now be initialized 2015-04-28 20:32:29 +02:00
Glowbal
95d83554da Added local treatment through remoteExec for basic 2015-04-28 20:32:02 +02:00
PabstMirror
9e0932eb56 Opps 2015-04-28 13:31:47 -05:00
Grzegorz
655b974205 Merge pull request #8 from acemod/master
Update master
2015-04-28 20:27:57 +02:00
PabstMirror
270f9f3662 Fix init order problem 2015-04-28 13:26:52 -05:00
bux578
621e1513a0 ballistic stringtable fixes 2015-04-28 20:24:59 +02:00
bux578
2ba8676658 Merge branch 'simon84-german-translations' 2015-04-28 20:16:13 +02:00
bux578
4cc6db47de fix merge conflic 2015-04-28 20:15:56 +02:00
ulteq
85ce5e3729 Unified spacing 2015-04-28 19:43:36 +02:00
NukeDev
0b4bb6e4c9 Italian's Translation fixes
atragmx, attach, ballistics, captives languages fixes
2015-04-28 19:40:36 +02:00
simon84
b119c85c57 found some errors 2015-04-28 19:36:31 +02:00
ulteq
4cc2d072e6 Merge pull request #898 from simon84/german-translations
German translations fixes
2015-04-28 19:36:29 +02:00
ulteq
e759989d33 Removed debug output 2015-04-28 19:33:00 +02:00
ulteq
76393f31db Fixes: https://github.com/acemod/ACE3/issues/896 2015-04-28 19:31:38 +02:00
Glowbal
c38fe384e3 added default values for getvar's 2015-04-28 19:30:35 +02:00
simon84
a244660930 German translation fixes
Unified some translations in "ballistics"
e.g. unit mm, Schuss->Patronen, decimal seperator
2015-04-28 19:25:45 +02:00
ulteq
a4fd621bd0 Merge branch 'NukeDev-master' 2015-04-28 18:55:32 +02: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
ulteq
d0c7a37841 Minor stringtable fix 2015-04-28 18:31:14 +02:00
ulteq
908c204893 Replaced Tabs with Spaces 2015-04-28 18:24:24 +02:00
ulteq
aa824ca137 Merge branch 'gienkov-master' 2015-04-28 18:15:15 +02:00
ulteq
236fc10a0f Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master
Conflicts:
	addons/medical/stringtable.xml
2015-04-28 18:15:05 +02:00
NukeDev
67a4b7ea30 Authors.txt 2015-04-28 18:12:05 +02:00
NukeDev
db82df6214 Italian's Translation's Changes v2 2015-04-28 18:10:35 +02:00
Grzegorz
feeb897fb6 Update stringtable.xml 2015-04-28 18:05:43 +02:00
Grzegorz
b88618563d Update stringtable.xml 2015-04-28 18:05:27 +02:00
Grzegorz Sikora
bcda77c5c7 PL translation 2015-04-28 18:03:35 +02:00
ulteq
93dde41c24 Merge pull request #887 from alganthe/master
french translation pass
2015-04-28 18:02:46 +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
NukeDev
1d434949de Some Italian Translation's Changes 2015-04-28 17:46:35 +02:00
ulteq
faf09a2e1f Merge branch 'gienkov-master' 2015-04-28 17:45:28 +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
ulteq
d2632fbf47 Merge pull request #877 from acemod/weatherModuleDocumentation
Added weather module setting documentation
2015-04-28 17:21:56 +02:00
Ivan Navarro Cabello
8a55c69cd7 added spanish translation
added spanish translation
2015-04-28 17:03:49 +02:00
ulteq
2e8070facb Merge pull request #886 from simon84/german-translations
German translations
2015-04-28 16:54:39 +02:00
Legolasindar
dfc14025a7 Merge pull request #6 from acemod/master
update my master fork
2015-04-28 16:22:52 +02:00
PabstMirror
f8b8d7dd16 Set Lock on postInit so spawned vehicles are set 2015-04-28 00:08:28 -05:00
simon84
8ac6f61fcf added some translations
added some translations
2015-04-28 00:36:37 +02:00
Grzegorz Sikora
e874e4329f PL readme 2015-04-28 00:32:03 +02:00
Grzegorz Sikora
745521990e Merge branch 'master' of https://github.com/gienkov/ACE3 2015-04-28 00:31:40 +02:00
Grzegorz Sikora
22d569e5ab README PL 2015-04-28 00:29:48 +02:00
ulteq
79a5077941 Merge pull request #878 from Brisse89/patch-1
Less fictional weapon names
2015-04-28 00:02:55 +02:00
simon84
312cdf03ac Merge remote-tracking branch 'acemod/master' 2015-04-27 23:47:47 +02:00
PabstMirror
7e0fa18ce7 #770 - Hopefully fix LOS check on flashbang 2015-04-27 16:07:31 -05:00