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,823 Commits 73 Branches 88 Tags 752 MiB
0dd23df7dc
Commit Graph

3823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KoffeinFlummi
1fc546a700 Merge branch 'polish-merge' 2015-04-15 15:10:41 +02:00
KoffeinFlummi
79934cfb78 Merge https://github.com/Coren4/ACE3 into polish-merge 2015-04-15 15:10:28 +02:00
ulteq
1e326c17ad Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-15 15:06:35 +02:00
commy2
eecf405fda Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-15 15:06:29 +02:00
ulteq
238cf1cc63 Added keybinds for ATragMX and Kestrel 4500 (empty by default) 2015-04-15 15:06:28 +02:00
Coren4
9b94692ca5 Update AUTHORS.txt 2015-04-15 15:02:36 +02:00
commy2
5eededd3e1 Recoil overhaul initial commmit 2015-04-15 15:01:07 +02:00
Nicolás Badano
69489df910 Merge pull request #610 from ramius86/patch-3 
Update stringtable.xml
 2015-04-15 09:57:27 -03:00
Nicolás Badano
527385e6e1 Merge pull request #609 from ramius86/patch-2 
Update stringtable.xml
 2015-04-15 09:57:15 -03:00
Felix Wiegand
3032c84eda Merge pull request #577 from nomisum/patch-3 
added myself to authors.txt as requested
 2015-04-15 14:54:15 +02:00
KoffeinFlummi
21305629ed Merge branch 'patch-1' of https://github.com/nomisum/ACE3 into german-merge 2015-04-15 14:53:27 +02:00
commy2
e3d1946924 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-15 14:37:49 +02:00
KoffeinFlummi
8f94bbfec8 Make stringtableduplicates.py more useful 2015-04-15 13:55:07 +02:00
KoffeinFlummi
8b915380b7 Merge branch 'hungarian-merge' 2015-04-15 13:55:02 +02:00
KoffeinFlummi
2ffbccbf20 Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-04-15 12:59:56 +02:00
ulteq
9f289e1721 Fixed incorrect return values in some key handlers: 
*Wind info
*Protractor
 2015-04-15 12:53:02 +02:00
ulteq
42dbd8f5d2 Continued work on the magazine classes: 
*Fixed Katiba using the wrong magazine
*Added ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim
*Added ACE_10Rnd_338_300gr_HPBT_Mag
*Changed some of the .338 magazine initSpeeds to match the new Mar-10 barrel length
*Added the new caseless green ir dim magazine to the ammo crates
*Allowed the Mar-10 to shoot .300 Win Mag
 2015-04-15 12:30:48 +02:00
ulteq
bd5ed13621 Added ACE_65x39_Caseless_green_Tracer_Dim 2015-04-15 12:27:20 +02:00
Marco
bc62891122 Update stringtable.xml 
Italian
 2015-04-15 11:24:20 +02:00
Marco
76ff1da57a Update stringtable.xml 
Italian
 2015-04-15 11:19:54 +02:00
Marco
47f8161855 Update stringtable.xml 
Italian
 2015-04-15 11:18:22 +02:00
Marco
924cd80e60 Update stringtable.xml 
ITalian
 2015-04-15 11:13:47 +02:00
Marco
cb2e1c5116 Update stringtable.xml 
Italian
 2015-04-15 11:13:19 +02:00
Marco
5238647021 Update stringtable.xml 
Italian
 2015-04-15 11:12:15 +02:00
Marco
f931c1a42c Update stringtable.xml 
Italian
 2015-04-15 11:10:05 +02:00
Marco
96be1baddc Update stringtable.xml 
Italian
 2015-04-15 11:08:43 +02:00
Marco
8c0f52e615 Update stringtable.xml 
Italian
 2015-04-15 11:08:04 +02:00
Marco
d1936d8e1b Update stringtable.xml 
Italian
 2015-04-15 11:06:42 +02:00
Marco
5c7b8247c5 Update stringtable.xml 
Italian
 2015-04-15 11:05:57 +02:00
Marco
6e7c1ce9d2 Update stringtable.xml 
Ita
 2015-04-15 11:04:18 +02:00
Marco
544894a05e Update stringtable.xml 
Italian
 2015-04-15 10:59:44 +02:00
Marco
9a8dd905f2 Update stringtable.xml 2015-04-15 10:56:39 +02:00
Marco
eceb759523 Update stringtable.xml 
Italian
 2015-04-15 10:53:35 +02:00
Marco
b28ef3d22d Update stringtable.xml 
Italian
 2015-04-15 10:52:40 +02:00
Marco
45fec0409d Update stringtable.xml 
Italian
 2015-04-15 10:51:26 +02:00
Marco
c9e452a000 Update stringtable.xml 
Italian
 2015-04-15 10:48:52 +02:00
Marco
aaee9c72c1 Update stringtable.xml 
Italian translation
 2015-04-15 10:44:13 +02:00
Marco
f328d302e1 Update stringtable.xml 
Italian translation
 2015-04-15 10:42:25 +02:00
Marco
2daa0e2d29 Update stringtable.xml 
Italian translation
 2015-04-15 10:32:01 +02:00
Marco
532ee16411 Update stringtable.xml 
Italian translation
 2015-04-15 10:30:56 +02:00
Marco
af3fdf9b91 Update stringtable.xml 
Italian translation
 2015-04-15 10:28:09 +02:00
commy2
09289fbf48 only on server though 2015-04-15 08:34:30 +02:00
commy2
6c4e50a98d localized names for rallypoints, auto assign slot of group leader at the start of the mission as JIP persistant rallypoint mover slot 2015-04-15 08:31:40 +02:00
Nicolás Badano
6f07460d1d Merge pull request #604 from firefly2442/patch-1 
minor spelling fixes in feature requests documentation
 2015-04-15 02:08:26 -03:00
commy2
44fad81fe1 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into rallypointfix 2015-04-15 06:51:59 +02:00
Patrick
d0f4fb8de2 Update how-to-make-a-feature-request.md 
minor spelling fixes
 2015-04-14 23:50:48 -05:00
esteldunedain
69aef53f5b Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-15 01:34:10 -03:00
esteldunedain
c226d49ab9 Merge branch 'lmbmenu' 
Conflicts:
	addons/interact_menu/stringtable.xml
 2015-04-15 01:33:44 -03:00
esteldunedain
25e8e93fd0 Add back stringtables for the list menu 2015-04-15 01:32:42 -03:00
Nicolás Badano
d7a0503dbc Merge pull request #600 from acemod/lmbmenu 
disable firing if menu is opened, fix #368, close #483
 2015-04-15 01:29:39 -03:00