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,156 Commits 73 Branches 88 Tags 752 MiB
e6187adfc7
Commit Graph

4156 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ulteq
e6187adfc7 Removed a trailing space 2015-05-02 22:09:38 +02:00
ulteq
b5ec13b992 Fixed some inconsistencies in the stringtable 2015-05-02 22:07:25 +02:00
Felix Wiegand
7678919e8d Merge pull request #982 from ToasterBR/master 
Translation to Portuguese
 2015-05-02 21:40:14 +02:00
ulteq
d080414c84 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-05-02 18:22:12 +02:00
ulteq
3bfbf8b64e Got rid of the math include in the ab extension 2015-05-02 18:22:06 +02:00
jaynus
980be9f55b Merge pull request #972 from acemod/javFixInheritanceCheck 
Javelin - Fix configProperties
 2015-05-02 08:50:18 -07:00
ViperMaul
d9bd98bf60 Merge pull request #983 from acemod/setVersionMakeCFG 
set new default key for make.cfg
 2015-05-01 23:50:52 -07:00
ViperMaul
12e05cc526 set new default key 2015-05-01 23:46:22 -07:00
ToasterBR
1ae2b640c2 Added myself to Authors 
Nick and real email included
 2015-05-02 03:45:57 -03:00
ToasterBR
021b00c722 Translation to Portuguese 
Done all remaining portuguese translations, including some minor
corrections
 2015-05-02 03:38:53 -03:00
PabstMirror
436e50411a Medical - Fix Uncon PFEH argument changes 2015-05-01 22:42:43 -05:00
Felix Wiegand
4dce2b8841 Merge pull request #978 from licht-im-Norden87/patch-7 
Added german strings to interaction
 2015-05-02 04:08:37 +02:00
Felix Wiegand
1ca737ffb6 Merge pull request #979 from licht-im-Norden87/patch-8 
Added german strings to laser
 2015-05-02 04:08:18 +02:00
licht-im-Norden87
f93ac12807 Added german strings to laser 2015-05-02 03:28:54 +02:00
licht-im-Norden87
106f2ab89b Added german strings to interaction 2015-05-02 03:25:28 +02:00
esteldunedain
b8d8aeae5c Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-05-01 20:32:51 -03:00
esteldunedain
be07fd2c82 Avoid ACE_Comanche_Test from showing on Zeus. #943 2015-05-01 20:32:20 -03:00
PabstMirror
34016a2776 Merge pull request #975 from gienkov/patch-13 
Update CfgVehicles.hpp
 2015-05-01 18:30:07 -05:00
Grzegorz
c9cf1d2455 Update CfgVehicles.hpp 
another typo few lines below
 2015-05-02 01:26:54 +02:00
PabstMirror
02262a54b9 Merge pull request #974 from gienkov/patch-12 
Update CfgVehicles.hpp - fix spulling
 2015-05-01 18:25:43 -05:00
Grzegorz
5b9e6de6f1 Update CfgVehicles.hpp 
missing "s"
 2015-05-02 01:21:49 +02:00
PabstMirror
ce1255bb2f Fix configProperties 2015-05-01 17:56:04 -05:00
KoffeinFlummi
e6de0d5906 Set version in make.py 2015-05-02 00:54:29 +02:00
KoffeinFlummi
97a9bffe98 Set version number to 3.0.0.2 2015-05-02 00:49:43 +02:00
ulteq
4239772ce9 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-05-02 00:36:34 +02:00
ulteq
884da7742e Disabled AB terrain init, if AB is not enabled 2015-05-02 00:36:23 +02:00
Felix Wiegand
07ec7b96c4 Merge pull request #954 from acemod/medicalFixVehAnimation 
Medical fix veh animation
 2015-05-02 00:35:13 +02:00
KoffeinFlummi
f1ba0cff26 Merge https://github.com/ProfessorCZ/ACE3 into czech-merge 
Conflicts:
	AUTHORS.txt
	addons/advanced_ballistics/stringtable.xml
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/respawn/stringtable.xml
 2015-05-02 00:26:25 +02:00
KoffeinFlummi
e05f1b557a Merge branch 'master' of https://github.com/acemod/ACE3 2015-05-02 00:19:39 +02:00
KoffeinFlummi
debfe990e8 Fix duplicates 2015-05-02 00:19:10 +02:00
KoffeinFlummi
13b99ed53f Merge https://github.com/adam3adam/ACE3 into czech-merge 
Conflicts:
	AUTHORS.txt
	addons/interact_menu/stringtable.xml
 2015-05-02 00:17:01 +02:00
Lukas
1d3f5cc312 Czceh translation 2015-05-02 00:04:50 +02:00
Felix Wiegand
f16e02b003 Merge pull request #959 from licht-im-Norden87/patch-6 
Update Stringtable: missileguidance
 2015-05-02 00:03:13 +02:00
Felix Wiegand
e1b427a932 Merge pull request #968 from gienkov/patch-11 
PL translation
 2015-05-02 00:01:20 +02:00
Grzegorz
c1d87f2a75 PL translation 
interaction
 2015-05-01 23:50:27 +02:00
Felix Wiegand
a211bcfacf Merge pull request #689 from acemod/group 
Reword the group action names
 2015-05-01 23:30:10 +02:00
Felix Wiegand
472885e14c Merge pull request #966 from Tachii/patch-21 
added 2 missing ru strings
 2015-05-01 23:29:22 +02:00
adam3adam
1189bd69e6 Added author 
adam3adam added
 2015-05-01 23:27:28 +02:00
Tachii
60c02f4051 added 2 missing ru strings 2015-05-02 00:21:00 +03:00
Felix Wiegand
721b5bde44 Merge pull request #965 from FreeZbe/master 
French : update / fix stringtable
 2015-05-01 23:10:56 +02:00
FreeZbe
6f5e64b4a5 French : update / fix stringtable 2015-05-01 23:10:06 +02:00
KoffeinFlummi
2d1af98af5 Add nikolauska to AUTHORS 
Also remove Bla's email address as per request.
 2015-05-01 23:09:30 +02:00
FreeZbe
7e12c97317 French : update / fix stringtable 2015-05-01 23:09:09 +02:00
FreeZbe
d1da3a82d7 French : update / fix stringtable 2015-05-01 23:08:36 +02:00
Felix Wiegand
58a67a2f77 Merge pull request #962 from gienkov/patch-10 
PL translation
 2015-05-01 22:51:36 +02:00
KoffeinFlummi
cc627b4a92 Merge branch 'master' of https://github.com/acemod/ACE3 2015-05-01 22:50:11 +02:00
Dimaslg
339cd8febd Add spanish translation for removing tournis 2015-05-01 22:49:52 +02:00
Glowbal
937b20f551 Merge branch 'master' of github.com:acemod/ACE3 2015-05-01 22:49:24 +02:00
Glowbal
09a0158fa4 This should not be 1 2015-05-01 22:49:13 +02:00
Grzegorz
3b321c7bf2 PL translation 
laser
 2015-05-01 22:46:51 +02:00