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
4,048 Commits 73 Branches 88 Tags 752 MiB
2aa788bba2
Commit Graph

4048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ulteq
908c204893 Replaced Tabs with Spaces 2015-04-28 18:24:24 +02:00
ulteq
aa824ca137 Merge branch 'gienkov-master' 2015-04-28 18:15:15 +02:00
ulteq
236fc10a0f Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master 
Conflicts:
	addons/medical/stringtable.xml
 2015-04-28 18:15:05 +02:00
NukeDev
67a4b7ea30 Authors.txt 2015-04-28 18:12:05 +02:00
NukeDev
db82df6214 Italian's Translation's Changes v2 2015-04-28 18:10:35 +02:00
Grzegorz
feeb897fb6 Update stringtable.xml 2015-04-28 18:05:43 +02:00
Grzegorz
b88618563d Update stringtable.xml 2015-04-28 18:05:27 +02:00
Grzegorz Sikora
bcda77c5c7 PL translation 2015-04-28 18:03:35 +02:00
ulteq
93dde41c24 Merge pull request #887 from alganthe/master 
french translation pass
 2015-04-28 18:02:46 +02:00
Josuan Albin
b5524fb3ee French pass 
* fixed ramp in /aircraft
* added aragmx entry
* added multiple medical entries
* translated missileguidance
* completed mk6mortar
* changed Sanitaire to Médical in realisticnames also fixed some typos
in there and had to rename some of the explosives (weren't fitting in
boxes in game)
* added myself to contributors
 2015-04-28 18:00:09 +02:00
NukeDev
1d434949de Some Italian Translation's Changes 2015-04-28 17:46:35 +02:00
ulteq
faf09a2e1f Merge branch 'gienkov-master' 2015-04-28 17:45:28 +02:00
ulteq
dc09c554c0 Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master 
Conflicts:
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
 2015-04-28 17:44:58 +02:00
ulteq
d2632fbf47 Merge pull request #877 from acemod/weatherModuleDocumentation 
Added weather module setting documentation
 2015-04-28 17:21:56 +02:00
Ivan Navarro Cabello
8a55c69cd7 added spanish translation 
added spanish translation
 2015-04-28 17:03:49 +02:00
ulteq
2e8070facb Merge pull request #886 from simon84/german-translations 
German translations
 2015-04-28 16:54:39 +02:00
Legolasindar
dfc14025a7 Merge pull request #6 from acemod/master 
update my master fork
 2015-04-28 16:22:52 +02:00
PabstMirror
f8b8d7dd16 Set Lock on postInit so spawned vehicles are set 2015-04-28 00:08:28 -05:00
simon84
8ac6f61fcf added some translations 
added some translations
 2015-04-28 00:36:37 +02:00
Grzegorz Sikora
e874e4329f PL readme 2015-04-28 00:32:03 +02:00
Grzegorz Sikora
745521990e Merge branch 'master' of https://github.com/gienkov/ACE3 2015-04-28 00:31:40 +02:00
Grzegorz Sikora
22d569e5ab README PL 2015-04-28 00:29:48 +02:00
ulteq
79a5077941 Merge pull request #878 from Brisse89/patch-1 
Less fictional weapon names
 2015-04-28 00:02:55 +02:00
simon84
312cdf03ac Merge remote-tracking branch 'acemod/master' 2015-04-27 23:47:47 +02:00
PabstMirror
7e0fa18ce7 #770 - Hopefully fix LOS check on flashbang 2015-04-27 16:07:31 -05:00
ulteq
416a914253 More vector math replacements 2015-04-27 22:14:08 +02:00
ulteq
0d6d96e76c Cleanup++: 
* Added missing privates
* Removed unused privates
* Replaced some old vector calculations with new vector commands
 2015-04-27 22:04:35 +02:00
bux578
0991c29d00 Merge pull request #883 from ruPaladin/patch-5 
Russian translation (medical)
 2015-04-27 20:00:33 +02:00
ulteq
ebbcb8e5e7 Fixed a rarely occurring calculation error. 2015-04-27 19:28:46 +02:00
ruPaladin
59aba3fb34 Update stringtable.xml 2015-04-27 19:33:22 +03:00
ulteq
fa6a2566e3 Fixed a syntax error 2015-04-27 17:48:06 +02:00
ulteq
b36055b712 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-27 17:35:10 +02:00
ulteq
e4f6a7b2fc Added scope configs to the RHS compatibility modules 2015-04-27 17:35:03 +02:00
Glowbal
450e324f7b adjusted damage handling (adv medical) 2015-04-27 16:42:12 +02:00
bux578
98dba0ee76 Merge pull request #882 from alganthe/master 
Some french entries and a german duplicate
 2015-04-27 16:41:22 +02:00
Glowbal
e4db44d73c adjusted damage parsing 2015-04-27 16:36:00 +02:00
Josuan Albin
e8dec708bc Some french entries and a german duplicate 
Added some french entries and removed a german duplicate
 2015-04-27 16:18:28 +02:00
ulteq
0f4a95fddd Replaced TABs with Spaces 2015-04-27 15:48:53 +02:00
ulteq
66c2e86135 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-27 15:46:55 +02:00
ulteq
44932e4fec Added missing base classes 2015-04-27 15:46:49 +02:00
Glowbal
b520a1072b Merge branch 'master' into medicalImprovements 2015-04-27 15:41:20 +02:00
bux578
efc626789d Merge pull request #881 from Dimaslg/patch-1 
Update AUTHORS.txt
 2015-04-27 15:31:45 +02:00
Dimas
e6e8765134 Update AUTHORS.txt 
Added myself
 2015-04-27 15:27:51 +02:00
ulteq
40c3bf0f81 Added RHS AFRF/USAF compatibility config 2015-04-27 15:16:42 +02:00
Brisse89
26bd75084d Update stringtable.xml 
Khaybar -> Sama
 2015-04-27 14:56:57 +02:00
ulteq
3c92cab7af Reverted the addBlackList function 2015-04-27 14:02:59 +02:00
ulteq
f54f0cd1fa Renamed init functions 2015-04-27 13:58:18 +02:00
Brisse89
4ebdd88369 Less fictional weapon names 
ACP-C2 -> Custom Covert II
KT2002 Katiba -> KH2002 Khaybar
 2015-04-27 13:55:50 +02:00
ulteq
a13cc6b886 Added weather module setting documentation 2015-04-27 12:58:55 +02:00
ulteq
1b5756d33c Added weather update interval module setting 2015-04-27 12:47:26 +02:00