Commit Graph

2094 Commits

Author SHA1 Message Date
68d08b8c7b Revert "Translation"
This reverts commit fab5605ad5.
2015-04-10 19:46:18 +03:00
fab5605ad5 Translation
Russian translation of the texts
2015-04-10 17:51:48 +03:00
ccc326b81f missing ) 2015-04-10 10:00:06 +02:00
2498115cff add short translation writeup
shamelessly promoting tabler ;)
2015-04-10 09:57:02 +02:00
e4381d791c Merge pull request #370 from acemod/translations
translations
2015-04-10 09:06:30 +02:00
c258c6c00d fixing translation 2015-04-10 09:05:37 +02:00
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
8dcfbff920 Merge pull request #423 from acemod/comancheRoll
<3 @KoffeinFlummi
2015-04-09 23:31:45 -07:00
6286d59bd9 Remove NVG from gunner optics on comanche. 2015-04-09 23:29:37 -07:00
9e7d4c25bb Removes old value of stabalizing which broke gunner. Fixes #412 2015-04-09 23:28:41 -07:00
d5f190dff8 fix: getGunner returns null object when throwing grenades, planting explosives 2015-04-10 06:47:31 +02:00
105184ce88 fix: getGunner returns null object if pilot uses manual fire if no gunner is present 2015-04-10 06:36:09 +02:00
26d282c224 Explosives: Fix cursor interaction menu breaking 2015-04-09 22:46:19 -05:00
cc6bd1c302 Merge pull request #415 from Tourorist/patch-1
a minor cleanup
2015-04-09 23:45:55 -03:00
c568201be9 I am not sure either
They are rendered correctly in SQF and XML formats, as handled by Arma 3. However, having no previous experience messing with typography in definition files, I'll agree that it's better to play safe until tested. Will try to find out just how strict or permissive it is.
2015-04-10 05:38:33 +03:00
5a2a2612f4 minor cleanup
* replaced hyphen (-) with en dash (–)
* split up the title and sequel number in "Arma 3"
* case-stylized GitHub, as it meant to be
* updated the project URL from (I presume) a temporary address
2015-04-10 04:52:05 +03:00
def9000520 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-09 22:49:25 -03:00
a3eb450e80 Added instructions for making feature requests. 2015-04-09 22:49:04 -03:00
357fd1969b Merge pull request #406 from Legolasindar/patch-4
Spanish: Update stringtable.xml
2015-04-09 21:24:19 -03:00
7e6e0d0ecd Merge pull request #402 from Legolasindar/patch-2
Update stringtable.xml
2015-04-09 21:24:00 -03:00
ed87e53c80 Update stringtable.xml
Updated spanish terms.
2015-04-10 00:48:51 +02:00
c511431e61 Fix encoding problem
Not sure why, but it was decoding the \a's: Warning:
z\ace\addons\main\config.cpp Line 556: ['MAIN',_this] execVM
'\zceddons\mainbout.sqf';-NOGIT
2015-04-09 17:17:33 -05:00
1dcbebc04c Update stringtable.xml
Updated spanish terms
2015-04-10 00:10:47 +02:00
309eb7b3bf Merge pull request #399 from licht-im-Norden87/patch-1
Stringtable: German additions
2015-04-10 00:06:43 +02:00
b93020091b Merge pull request #401 from Legolasindar/patch-1
Update stringtable.xml
2015-04-09 19:06:27 -03:00
7b4d62c46c Update stringtable.xml
Fixed spanish terms
2015-04-10 00:05:47 +02:00
1d7f6c5404 Woops 2015-04-09 23:09:09 +02:00
2c7df9da6a Stringtable: German additions 2015-04-09 23:02:28 +02:00
8177178cea Update getting-started.md 2015-04-09 22:29:55 +02:00
05228b147d Update links in README 2015-04-09 22:27:16 +02:00
0de99fe8a0 Update modules.md 2015-04-09 22:14:12 +02:00
3554a3bfe9 Update modules.md 2015-04-09 22:14:01 +02:00
84c8e02328 Merge pull request #396 from KoffeinFlummi/medicalCleanup
Medical cleanup
2015-04-09 22:13:31 +02:00
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
d94943a9ff getting hitpoint damage on non existing hitpoint returns type instead of bool 2015-04-09 21:38:35 +02:00
e836d2627d Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-09 21:38:12 +02:00
b54d1e8786 Nicer output in build.py 2015-04-09 21:37:54 +02:00
1b94e2e33a Update README.md 2015-04-09 21:35:56 +02:00
63861a9fc0 Remove TO_MERGE 2015-04-09 21:33:25 +02:00
30862b4bfc Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-09 21:26:19 +02:00
5e918eb707 Remove AGM from TO_MERGE folder 2015-04-09 21:25:55 +02:00
093d340ee7 Changed: Dragging/carrying now works for units with broken legs
Added unload and load of unconscious units
2015-04-09 21:23:10 +02:00
d81ed9f969 Merge pull request #397 from KoffeinFlummi/master-docs
Add documentation to master branch
2015-04-09 21:17:30 +02:00
8ca882248a Add documentation to master branch 2015-04-09 21:09:49 +02:00
0926397ab4 Removed deadcode and obvious comments 2015-04-09 20:13:46 +02:00
39cbf21278 Removed deprecated carry functions 2015-04-09 20:12:30 +02:00
2d265ec6c2 prevent ai fro being stuck, #290 2015-04-09 16:54:50 +02:00
b41c6280ba prvent falling ai from being stcuk, fix #290 2015-04-09 16:52:59 +02:00
147fcdfa0c Merge pull request #392 from KoffeinFlummi/requiredaddons
sorting out required addons for modularity
2015-04-09 16:37:47 +02:00
f0cc0941e5 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-09 10:05:38 -03:00