Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,634 Commits 73 Branches 88 Tags 752 MiB
01b30c6677
Commit Graph

4634 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KoffeinFlummi
debfe990e8 Fix duplicates 2015-05-02 00:19:10 +02:00
KoffeinFlummi
13b99ed53f Merge https://github.com/adam3adam/ACE3 into czech-merge 
Conflicts:
	AUTHORS.txt
	addons/interact_menu/stringtable.xml
 2015-05-02 00:17:01 +02:00
Lukas
1d3f5cc312 Czceh translation 2015-05-02 00:04:50 +02:00
Felix Wiegand
f16e02b003 Merge pull request #959 from licht-im-Norden87/patch-6 
Update Stringtable: missileguidance
 2015-05-02 00:03:13 +02:00
Felix Wiegand
e1b427a932 Merge pull request #968 from gienkov/patch-11 
PL translation
 2015-05-02 00:01:20 +02:00
Grzegorz
c1d87f2a75 PL translation 
interaction
 2015-05-01 23:50:27 +02:00
Felix Wiegand
a211bcfacf Merge pull request #689 from acemod/group 
Reword the group action names
 2015-05-01 23:30:10 +02:00
Felix Wiegand
472885e14c Merge pull request #966 from Tachii/patch-21 
added 2 missing ru strings
 2015-05-01 23:29:22 +02:00
adam3adam
1189bd69e6 Added author 
adam3adam added
 2015-05-01 23:27:28 +02:00
Tachii
60c02f4051 added 2 missing ru strings 2015-05-02 00:21:00 +03:00
Felix Wiegand
721b5bde44 Merge pull request #965 from FreeZbe/master 
French : update / fix stringtable
 2015-05-01 23:10:56 +02:00
FreeZbe
6f5e64b4a5 French : update / fix stringtable 2015-05-01 23:10:06 +02:00
KoffeinFlummi
2d1af98af5 Add nikolauska to AUTHORS 
Also remove Bla's email address as per request.
 2015-05-01 23:09:30 +02:00
FreeZbe
7e12c97317 French : update / fix stringtable 2015-05-01 23:09:09 +02:00
FreeZbe
d1da3a82d7 French : update / fix stringtable 2015-05-01 23:08:36 +02:00
Felix Wiegand
58a67a2f77 Merge pull request #962 from gienkov/patch-10 
PL translation
 2015-05-01 22:51:36 +02:00
KoffeinFlummi
cc627b4a92 Merge branch 'master' of https://github.com/acemod/ACE3 2015-05-01 22:50:11 +02:00
Dimaslg
339cd8febd Add spanish translation for removing tournis 2015-05-01 22:49:52 +02:00
Glowbal
937b20f551 Merge branch 'master' of github.com:acemod/ACE3 2015-05-01 22:49:24 +02:00
Glowbal
09a0158fa4 This should not be 1 2015-05-01 22:49:13 +02:00
Grzegorz
3b321c7bf2 PL translation 
laser
 2015-05-01 22:46:51 +02:00
KoffeinFlummi
a002c796da Merge branch 'patch-9' of https://github.com/gienkov/ACE3 into polish-merge 
Conflicts:
	addons/medical/stringtable.xml
 2015-05-01 22:46:49 +02:00
KoffeinFlummi
d8299332e4 Merge branch 'master' of https://github.com/acemod/ACE3 
Conflicts:
	addons/respawn/stringtable.xml
 2015-05-01 22:44:42 +02:00
KoffeinFlummi
fb807cbb86 Merge branch 'master' into spanish-merge 
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/respawn/stringtable.xml
 2015-05-01 22:44:10 +02:00
Dimaslg
6f2caec6ec Last touches to Spanish translation 2015-05-01 22:42:09 +02:00
bux578
1a946acc30 German Translation / Typo 2015-05-01 22:33:26 +02:00
Grzegorz
8828704e76 PL translation 
STR_ACE_Medical_RemovingTourniquet
 2015-05-01 22:32:53 +02:00
Glowbal
0a300f3385 Merge pull request #960 from acemod/medicalMissingProgressText 
Added missing progress bar display text
 2015-05-01 22:31:41 +02:00
Felix Wiegand
e97c309e4b Merge pull request #958 from licht-im-Norden87/patch-5 
Update Stringtable: Rallypoint
 2015-05-01 22:31:27 +02:00
Glowbal
e8ccddfc2c Added missing progress bar display text 2015-05-01 22:29:52 +02:00
adam3adam
f5303d455c Translation of some stuff into czech language 
adv. ballistics, atragmx, interaction menu, kestrel4500, laser pointer
and little part of medical
 2015-05-01 22:23:03 +02:00
PabstMirror
bded34fa23 I suck at git 
redo reverted stuff here
 2015-05-01 15:03:05 -05:00
licht-im-Norden87
5e8096f29c Update Stringtable: missileguidance 2015-05-01 21:29:49 +02:00
PabstMirror
e67e15c3fa Merge branch 'master' into medicalFixVehAnimation 
Conflicts:
	addons/common/functions/fnc_getDeathAnim.sqf
	addons/common/functions/fnc_loadPersonLocal.sqf
 2015-05-01 14:29:21 -05:00
licht-im-Norden87
d12c7ff048 Update Stringtable: Rallypoint 
Angleichung
 2015-05-01 21:25:39 +02:00
KoffeinFlummi
c9ff497c83 Merge branch 'master' into polish-merge 
Conflicts:
	addons/respawn/stringtable.xml
 2015-05-01 21:13:36 +02:00
Felix Wiegand
90275b272e Merge pull request #950 from Tachii/patch-19 
Added few missing ru strings
 2015-05-01 21:11:37 +02:00
Felix Wiegand
b0094ff8e6 Merge pull request #949 from Tachii/patch-18 
added 1 RU string
 2015-05-01 21:11:17 +02:00
Felix Wiegand
3d45a26334 Merge pull request #957 from evromalarkey/master 
Few Czech strings
 2015-05-01 21:07:27 +02:00
jaynus
e8584fd68b Merge pull request #956 from acemod/laserCodeSelection 
Laser code selection & Designation
 2015-05-01 12:00:52 -07:00
jaynus
2bd0acb621 Revert "GetDeathAnim" 
This reverts commit 0f736ae684.
 2015-05-01 12:00:38 -07:00
jaynus
6603806c77 Revert "Save and replay valid awake animations" 
This reverts commit 8d1ac26e24.
 2015-05-01 12:00:21 -07:00
jaynus
c1ba4966f9 Test confirm no bouncy. 2015-05-01 11:53:55 -07:00
Lubomír Blažek
dcb3196e58 Czech strings 2015-05-01 20:52:41 +02:00
jaynus
5bf763a08e quote, not var. 2015-05-01 11:47:49 -07:00
Tachii
bed298d5b3 Update stringtable.xml 2015-05-01 21:38:05 +03:00
jaynus
2ed05ed469 Merge remote-tracking branch 'origin/master' into laserCodeSelection 2015-05-01 11:35:11 -07:00
jaynus
dcf4f3b53e Resolved. Conflicts: 
addons/missileguidance/functions/fnc_onFired.sqf
 2015-05-01 11:35:03 -07:00
jaynus
dfbfb4ace2 Laser code selection, hotkeys and locking. Turrets & designator, and gunner. Closes #751 2015-05-01 11:31:37 -07:00
Felix Wiegand
76309ba61e Merge pull request #953 from acemod/license-change 
Change license to allow subfolders with individual licenses
 2015-05-01 20:22:19 +02:00