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
Kllrt
1c611ba2db Added another new CZ strings 2015-04-13 21:15:04 +02:00
ulteq
8edb2d2c49 Complete overhaul of all ammo/magazine and weapon classes: 
*Merged the magazines- into the ballistics module
*Adjusted all magazine class initSpeeds
*Adjusted all weapon class initSpeeds
 2015-04-13 21:08:31 +02:00
commy2
18157414b7 Merge branch '11thmeu-master' 2015-04-13 20:41:46 +02:00
commy2
f4f69deb83 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into 11thmeu-master 2015-04-13 20:22:36 +02:00
commy2
804079cfae manual merge 2015-04-13 20:20:55 +02:00
Nicolás Badano
291b55e17c Merge pull request #563 from meat147/master 
Update AUTHORS.txt
 2015-04-13 15:14:40 -03:00
Pierre (meat)
c9e048e6b3 Update AUTHORS.txt 2015-04-13 20:03:19 +02:00
Harakhti
3c3f6ba4c3 Translation: A to I 
Some parts filled out, other parts corrected or stylized.
 2015-04-13 19:28:58 +02:00
commy2
51c3b88b00 Merge pull request #509 from acemod/vectornight 
Illuminate vector numbers at night
 2015-04-13 19:24:14 +02:00
commy2
bd168981e2 how do I merge 2015-04-13 19:23:42 +02:00
Grzegorz
97c9c9fa8c Merge pull request #2 from acemod/master 
Update original
 2015-04-13 19:20:41 +02:00
bux578
0e6eb46bb4 Merge pull request #560 from gienkov/master 
Further PL translation fixes
 2015-04-13 19:18:54 +02:00
commy2
fa64225e55 Merge pull request #505 from acemod/muteunit 
Muteunit framework, fix #473
 2015-04-13 19:18:45 +02:00
commy2
f48b6dc77a Merge pull request #519 from acemod/marksmenai 
increase engagement ranges / burst mode on new mmg / full auto dmr
 2015-04-13 19:18:40 +02:00
Grzegorz
2cd456432e Update stringtable.xml 2015-04-13 19:17:42 +02:00
Grzegorz
5269f32d62 weird but fixed 
Something went wrong there, but fixed
 2015-04-13 19:11:39 +02:00
jaynus
ff858c1194 Begin stateful guidance. Re-write of TOP down because it wasnt even running. LIN was default. but it was broken anyways. 2015-04-13 09:56:15 -07:00
ViperMaul
87acec03f4 Protect against CfgConvert errors from crashing make.py and properly restore config.cpp - fixes #557 2015-04-13 09:45:44 -07:00
jaynus
e5d8fe2634 Guidance timing per FPS fixes. 2015-04-13 09:24:28 -07:00
jaynus
3e7c8ca634 remove optic debug. 2015-04-13 09:03:19 -07:00
Grzegorz Sikora
ac886828b0 Fixes 2015-04-13 18:02:48 +02:00
jaynus
6aa9f5bcbc NFOV/WFOV 2015-04-13 09:01:18 -07:00
jaynus
c66f99faac Fixed: Locking reticles would lock out-of-order. Fixed: Locking was hard. Fixes #539 2015-04-13 08:59:36 -07:00
jaynus
2d6b2f9a1a I had accidently commented out seeker FOV on the Titan rockets. 2015-04-13 08:33:03 -07:00
Nicolás Badano
206e42be72 Merge pull request #554 from gienkov/patch-3 
fix missing class
 2015-04-13 11:54:00 -03:00
Grzegorz
ec381699ca fix missing class 
Am I doin it right?
Works for me.
 2015-04-13 16:48:14 +02:00
bux578
cba66366bd fix invalid xml 2015-04-13 15:25:51 +02:00
bux578
8c24d9ec35 fix invalid xml, fix duplicate keys 2015-04-13 15:25:30 +02:00
ulteq
c12cc24a78 TABS: 
* "kill them with fire"
* "then kill them again, with a rusty spoon"
 2015-04-13 14:48:31 +02:00
ulteq
d8c23c2a64 Merged advanced_ballistics\CfgWeapons.cpp into ballistics\CfgWeapons.hpp 2015-04-13 14:46:21 +02:00
Niko Lehtovirta
21c9272293 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-13 15:37:38 +03:00
KoffeinFlummi
363a6b3738 Fix erroneus tag in nametags stringtable 
Re: f6c7d444
 2015-04-13 14:32:55 +02:00
KoffeinFlummi
8d4003a396 Merge https://github.com/HerrStein/ACE3 into german-merge 2015-04-13 14:21:00 +02:00
KoffeinFlummi
f6c7d444e1 Merge https://github.com/Anthariel/ACE3 into french-merge 2015-04-13 13:31:48 +02:00
commy2
f94b4befef initial commit 2015-04-13 13:04:23 +02:00
KoffeinFlummi
b93cf4fb4a Merge branch 'polish-merge' 2015-04-13 13:01:17 +02:00
KoffeinFlummi
118b5509ea Merge https://github.com/gienkov/ACE3 into polish-merge 2015-04-13 13:00:59 +02:00
ulteq
5354d6578b Simplified the AB PFH massively 2015-04-13 12:56:53 +02:00
ulteq
63760acc4f Added an error message when the ab extension is missing 2015-04-13 12:56:18 +02:00
ulteq
c8aa3032fe Added some sanity checks to the module setting initialization 2015-04-13 12:54:06 +02:00
commy2
a3c9140415 Merge branch 'nic547-master' 2015-04-13 12:52:58 +02:00
commy2
fce7c4d0be manual merge 2015-04-13 12:52:47 +02:00
commy2
0214d891e1 fix misc issues with optics, fix #537 2015-04-13 12:04:43 +02:00
ulteq
4355df118c Refactored the Kestrel4500 Code. 2015-04-13 11:53:19 +02:00
bux578
8a200464d5 Merge pull request #546 from Kllrt/patch-2 
Very small typo in CZ translation
 2015-04-13 11:02:37 +02:00
Kllrt
915ac46e04 Very small typo in CZ translation 
-.-
 2015-04-13 11:00:47 +02:00
ruPaladin
ccc2124abe Russian translation for addons/interaction 
Fix for addons/interaction translation.
 2015-04-13 11:53:15 +03:00
PabstMirror
bf3e3d3b64 #542 - ACE_fakeWeapon not found 2015-04-13 03:46:42 -05:00
ulteq
c98422b2c6 Shrinked some of the .paa files 2015-04-13 10:45:37 +02:00
ulteq
deadbd9414 Reduced the amount of LOD levels of the Kestrel 2015-04-13 10:39:31 +02:00