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
3,459 Commits 73 Branches 88 Tags 752 MiB
e7bc0c26bc
Commit Graph

3459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
commy2
fb3ba51fe5 port alternative wirecutter sound 2015-04-15 22:19:43 +02:00
commy2
6f6d080dbd port inject sound 2015-04-15 22:16:54 +02:00
KoffeinFlummi
f020ff7c53 Merge branch 'patch-7' of https://github.com/ramius86/ACE3 into italian-merge 
Conflicts:
	addons/disarming/stringtable.xml
 2015-04-15 22:08:15 +02:00
KoffeinFlummi
9e6ae52ca5 Merge branch 'patch-6' of https://github.com/ramius86/ACE3 into italian-merge 
Conflicts:
	addons/captives/stringtable.xml
 2015-04-15 22:07:42 +02:00
KoffeinFlummi
5c3b06b1bf Merge branch 'patch-1' of https://github.com/ramius86/ACE3 into italian-merge 
Conflicts:
	addons/medical/stringtable.xml
 2015-04-15 22:06:18 +02:00
KoffeinFlummi
234e8e5c40 Merge branch 'patch-1' of https://github.com/Clon1998/ACE3 into german-merge 
Conflicts:
	addons/interaction/stringtable.xml
 2015-04-15 21:55:52 +02:00
jaynus
ea3475d388 Merge pull request #631 from FreeZbe/patch-9 
French : update / fix stringtable
 2015-04-15 12:31:03 -07:00
jaynus
744c64f0b6 Merge pull request #632 from Clon1998/patch-3 
Update AUTHORS.txt
 2015-04-15 12:30:34 -07:00
jaynus
9c4e217822 Merge pull request #633 from FreeZbe/patch-10 
French : update stringtable
 2015-04-15 12:29:56 -07:00
jaynus
185f9379fd Merge pull request #639 from FreeZbe/patch-16 
French : update stringtable
 2015-04-15 12:29:37 -07:00
jaynus
ddaf05262e Merge pull request #638 from FreeZbe/patch-15 
French : update stringtable
 2015-04-15 12:29:02 -07:00
jaynus
0a3a650437 Merge pull request #634 from FreeZbe/patch-11 
French : update stringtable
 2015-04-15 12:28:26 -07:00
FreeZbe
5a7ad82170 French : update stringtable 2015-04-15 21:26:12 +02:00
jaynus
2d189e6199 Merge branch 'master' of github.com:acemod/ACE3 2015-04-15 12:26:03 -07:00
jaynus
10cf02e856 Slower climb phase.Refs #630 2015-04-15 12:25:57 -07:00
FreeZbe
18c65108c3 French : update stringtable 2015-04-15 21:24:24 +02:00
Nicolás Badano
3e205a70d8 Merge pull request #636 from FreeZbe/patch-13 
French : update stringtable
 2015-04-15 16:18:58 -03:00
Nicolás Badano
e6cc26cc96 Merge pull request #635 from FreeZbe/patch-12 
French : update stringtable
 2015-04-15 16:18:39 -03:00
Nicolás Badano
1678a6d695 Merge pull request #628 from ruPaladin/master 
Russian translation fixes
 2015-04-15 16:17:59 -03:00
FreeZbe
56f6c60e1a French : update stringtable 2015-04-15 21:17:35 +02:00
FreeZbe
df61f5c995 French : update stringtable 2015-04-15 21:15:57 +02:00
FreeZbe
c0dbf10971 French : update stringtable 2015-04-15 21:14:00 +02:00
jaynus
5bcb0ec493 Forgot to set terminal on short-range attacks. Fixes #630 2015-04-15 12:09:47 -07:00
commy2
f40373bb78 Merge pull request #550 from acemod/rallypointfix 
fix rallypoints being broken, fix #522
 2015-04-15 21:03:13 +02:00
FreeZbe
550c32e801 French : update stringtable 2015-04-15 20:53:41 +02:00
Clon1998
fa14befe63 Update AUTHORS.txt 
Added my self to the # CONTRIBUTORS
 2015-04-15 20:51:29 +02:00
commy2
d68cc8f40e sync rallypoint marker on jip 2015-04-15 20:50:03 +02:00
ulteq
3ca37baf44 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 20:33:19 +02:00
ulteq
3a062a4ff9 Fixed incorrect Mk319 Mod 0 BC/airFriction 2015-04-15 20:33:11 +02:00
FreeZbe
bc5b9bdfe9 French : update / fix strintable 2015-04-15 20:11:08 +02:00
jaynus
1a117a5893 AMG documentation update. 2015-04-15 11:04:37 -07:00
PabstMirror
e54d8dc827 ProgressBar - Fixed Alignment 2015-04-15 12:55:20 -05:00
PabstMirror
134f48ba55 Merge pull request #602 from acemod/nametagsIsSpeakingPerf 
Nametags - isSpeaking reduce network traffic
 2015-04-15 12:55:15 -05:00
ulteq
d9b3255e21 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 19:51:40 +02:00
ulteq
3cff85e85d Added Mk319 Mod 0 ammo and magazines 2015-04-15 19:51:34 +02:00
Glowbal
c88479d54d staged work 2015-04-15 19:45:42 +02:00
jaynus
ae198fa307 documentation matching re-orginization. 2015-04-15 10:32:52 -07:00
commy2
18be5276a9 rally point moved eh, markers at rallypoint positions 2015-04-15 19:18:42 +02:00
jaynus
743a6d82a5 Merge branch 'master' of github.com:acemod/ACE3 2015-04-15 10:11:18 -07:00
jaynus
25b7f779f1 Difficulty magic. 2015-04-15 10:11:13 -07:00
ruPaladin
26d53d255f Update stringtable.xml 2015-04-15 20:08:39 +03:00
ulteq
396bd3954e Fixed a typo 2015-04-15 19:04:41 +02:00
ruPaladin
fe72eef3da Update stringtable.xml 2015-04-15 20:02:41 +03:00
ulteq
b5a82e313e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 19:00:24 +02:00
ulteq
0c4734637b Fixed the GM6 barrel length and updated the magazines array 2015-04-15 19:00:14 +02:00
ruPaladin
92031cc354 Update stringtable.xml 2015-04-15 19:59:45 +03:00
ulteq
f8061922f7 Added ACE_10Rnd_338_API526_Mag, ACE_5Rnd_127x99_Mag, ACE_5Rnd_127x99_AMAX_Mag 2015-04-15 18:59:41 +02:00
ulteq
e0c34f22bf Added ACE_338_Ball_API526 and updated some airFriction values 2015-04-15 18:59:11 +02:00
ruPaladin
3773238e25 Update stringtable.xml 2015-04-15 19:56:34 +03:00
jaynus
2e3545f3d0 Merge branch 'master' of github.com:acemod/ACE3 2015-04-15 09:55:48 -07:00