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
2,523 Commits 73 Branches 88 Tags 752 MiB
fa88ab484e
Commit Graph

2523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ulteq
fa88ab484e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into kestrel4500 
Conflicts:
	addons/kestrel/stringtable.xml
 2015-04-13 21:31:04 +02:00
Nicolás Badano
db6361a086 Merge pull request #565 from Kllrt/master 
Added another new CZ strings
 2015-04-13 16:25:32 -03:00
Kllrt
1c611ba2db Added another new CZ strings 2015-04-13 21:15:04 +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
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
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
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
Grzegorz Sikora
ac886828b0 Fixes 2015-04-13 18:02:48 +02: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
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
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
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
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
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
ulteq
939365a376 New texture for the Kestrel model 2015-04-13 10:39:14 +02:00
PabstMirror
7111cdd8ff #540 - remove debug spam 2015-04-13 03:16:33 -05:00
PabstMirror
2a015482a1 Old Interaction Events (1713999 is long dead) 2015-04-13 01:03:08 -05:00
PabstMirror
878bdadbb3 Switch clientInit to postInit 2015-04-13 00:46:45 -05:00
PabstMirror
70dbae5a25 #527 - Unconscious switching groups 2015-04-13 00:32:07 -05:00
PabstMirror
669dbe10c9 BecomeLeader - Don't create new group 2015-04-13 00:23:00 -05:00
PabstMirror
b50a7a0147 Try to fix degree symbol (encoding issue) 2015-04-12 22:56:46 -05:00
PabstMirror
7719da2f66 Javelin Localiztion 2015-04-12 22:45:55 -05:00
PabstMirror
36b92b3d44 Don't do client stuff on dedicated. 2015-04-12 22:44:19 -05:00
Anthariel
3e8c8384cf Update stringtable.xml 
Missing translation
 2015-04-13 02:24:13 +02:00
Anthariel
8339d15087 Update stringtable.xml 
Added: French translations (note, I've already removed a % at the line 30
 2015-04-13 02:21:57 +02:00
Anthariel
7a8cd684a3 Update stringtable.xml 2015-04-13 02:19:58 +02:00
Anthariel
2939862e8c Update stringtable.xml 2015-04-13 02:12:56 +02:00
Anthariel
d9f9dffbc0 Update stringtable.xml 2015-04-13 02:11:12 +02:00
Anthariel
e176df4636 Update stringtable.xml 2015-04-13 02:10:23 +02:00
Anthariel
7523dd011f Update stringtable.xml 2015-04-13 02:06:17 +02:00