Commit Graph

19 Commits

Author SHA1 Message Date
commy2
fce7c4d0be manual merge 2015-04-13 12:52:47 +02:00
nic547
0f1115c33b Added new Ammotypes into the AGM crate 2015-04-12 13:08:50 +02:00
KoffeinFlummi
c6efd4e546 Merge https://github.com/EpMAK/ACE3 into russian-merge 2015-04-12 05:39:46 +02:00
nic547
63e5247d3b more ammotypes for the mags 2015-04-11 21:00:41 +02:00
EpMAK
21abff3713 Revert "Revert "Russian Translation""
This reverts commit ea04f4ab3e.
2015-04-11 21:33:34 +03:00
EpMAK
ea04f4ab3e Revert "Russian Translation"
This reverts commit 17a552bb80.
2015-04-11 21:33:07 +03:00
nic547
a37cd51fe7 more stuff
- added more ammotypes
- stringtable now follows guideline
2015-04-11 15:02:56 +02:00
nic547
a4b9090e34 Added new ammotypes for both types of .388 ammo 2015-04-10 21:01:49 +02:00
EpMAK
17a552bb80 Russian Translation
Russian translation of stringtables: new lines + old lines fixed a bit,
realistic names for armory are not yet filled.
2015-04-10 19:55:57 +03:00
EpMAK
68d08b8c7b Revert "Translation"
This reverts commit fab5605ad5.
2015-04-10 19:46:18 +03:00
EpMAK
fab5605ad5 Translation
Russian translation of the texts
2015-04-10 17:51:48 +03:00
commy2
a6a19e956b flashsupressors for new weapons, #264 2015-04-09 19:59:08 +02:00
KoffeinFlummi
8d5bdd2c01 Revert "fix shitty initSpeed definitions breaking SD mags, fix #182"
This reverts commit 55f49eaa1c.
2015-04-07 09:04:17 +02:00
commy2
4a9124c170 changed behavior of silencers from Marksmen 2015-03-29 14:09:51 +02:00
commy2
55f49eaa1c fix shitty initSpeed definitions breaking SD mags, fix #182 2015-03-08 19:51:52 +01:00
PabstMirror
93d889031f 1.40 Changes In Config Inhertiance (RC) 2015-02-28 19:06:17 -06:00
commy2
e72742da31 add macros for transport cargo config 2015-02-14 08:26:30 +01:00
KoffeinFlummi
c407553d49 Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
commy2
b9551f6ad8 split mags from ballistic 2015-01-20 22:40:15 +01:00