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,634 Commits 73 Branches 88 Tags 752 MiB
01b30c6677
Commit Graph

4634 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glowbal
2b1bbe6743 Merge pull request #955 from acemod/apl 
APL
 2015-05-01 20:21:36 +02:00
KoffeinFlummi
7f7bedb801 Change license to allow subfolders with individual licenses 2015-05-01 20:19:40 +02:00
Glowbal
e1d0ac4b9e Added author 2015-05-01 20:16:34 +02:00
PabstMirror
d8a6dd1bbd Stuff 2015-05-01 12:58:56 -05:00
Tachii
66eda924ac Update stringtable.xml 2015-05-01 20:48:37 +03:00
Dimas
e394a1ade1 Merge pull request #2 from acemod/master 
Update to current version of ace 3
 2015-05-01 19:41:13 +02:00
Glowbal
722c459c1e added APL pbo 2015-05-01 19:37:17 +02:00
Grzegorz
7e87c3a250 Update stringtable.xml 2015-05-01 19:32:59 +02:00
Grzegorz
e36fbe9da7 Update stringtable.xml 2015-05-01 19:32:43 +02:00
Grzegorz Sikora
4668869959 PL translation 2015-05-01 19:30:30 +02:00
Tachii
b1a23fd3c7 Update stringtable.xml 2015-05-01 20:29:57 +03:00
Tachii
43dea56ae6 Update stringtable.xml 2015-05-01 20:29:00 +03:00
Grzegorz
5c96902db2 Merge pull request #9 from acemod/master 
Update master
 2015-05-01 19:26:16 +02:00
Tachii
66818e0a74 Update stringtable.xml 2015-05-01 20:26:05 +03:00
Tachii
889275091e Update stringtable.xml 2015-05-01 20:24:13 +03:00
Tachii
1771b61578 added 2 missing ru strings 2015-05-01 20:23:05 +03:00
Tachii
43655d0cec Update stringtable.xml 2015-05-01 20:18:51 +03:00
Tachii
caf301ac99 Update stringtable.xml 
Added 1 RU string
 2015-05-01 20:15:35 +03:00
PabstMirror
8d1ac26e24 Save and replay valid awake animations 2015-05-01 12:12:13 -05:00
ulteq
ff2d7fdb72 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into fcsInitSpeedFix 
Conflicts:
	addons/fcs/functions/fnc_firedEH.sqf
 2015-05-01 19:00:27 +02:00
ulteq
aa21962f8b Allowed positive weapon initSpeed values 2015-05-01 18:55:44 +02:00
Glowbal
80162627ec Fixed spelling of enableUnconsciousnessAI 2015-05-01 18:49:59 +02:00
Felix Wiegand
23bb96e514 Merge pull request #948 from ruPaladin/patch-7 
Russian translation (interact_menu)
 2015-05-01 18:39:34 +02:00
Felix Wiegand
fc96737557 Merge pull request #947 from ruPaladin/patch-6 
Russian translation (medical)
 2015-05-01 18:39:18 +02:00
ruPaladin
2aa788bba2 Update stringtable.xml 2015-05-01 19:26:23 +03:00
ruPaladin
a883517a5e Update stringtable.xml 2015-05-01 19:18:06 +03:00
KoffeinFlummi
30e90a377e Fix duplicate entries 2015-05-01 17:51:31 +02:00
KoffeinFlummi
48e59f0d71 Merge branch 'master' of https://github.com/acemod/ACE3 
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-05-01 17:46:58 +02:00
KoffeinFlummi
1e786d4a92 Merge https://github.com/FreeZbe/ACE3 into french-merge 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-05-01 17:45:00 +02:00
ulteq
a42dec6760 Added more missing privates 2015-05-01 17:40:30 +02:00
ulteq
5dcb45bd33 Finds the corresponding weapon class for each magazine type. 2015-05-01 17:39:38 +02:00
Felix Wiegand
59697344d2 Merge pull request #941 from acemod/german-translation 
missing german translation
 2015-05-01 17:37:17 +02:00
KoffeinFlummi
e46eba673f Merge branch 'master' into german-translation 
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-05-01 17:36:40 +02:00
KoffeinFlummi
954e4ef549 Merge branch 'master' of https://github.com/acemod/ACE3 
Conflicts:
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
 2015-05-01 17:32:19 +02:00
KoffeinFlummi
e96f23c197 Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge 
Conflicts:
	addons/atragmx/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/respawn/stringtable.xml
 2015-05-01 17:30:59 +02:00
ulteq
6dc28f026f Added missing private 2015-05-01 17:15:49 +02:00
Felix Wiegand
526b0a2d59 Merge pull request #931 from gienkov/master 
PL translation
 2015-05-01 17:15:22 +02:00
KoffeinFlummi
5f60321a69 Merge https://github.com/Legolasindar/ACE3 into spanish-merge 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
 2015-05-01 17:12:00 +02:00
KoffeinFlummi
761e23001f Merge https://github.com/Dimaslg/ACE3 into spanish-merge 
Conflicts:
	addons/medical/stringtable.xml
	addons/missileguidance/stringtable.xml
	addons/optionsmenu/stringtable.xml
 2015-05-01 16:51:20 +02:00
ulteq
800ccc07f3 Removed duplicate code 2015-05-01 16:24:16 +02:00
Nicolás Badano
65dcbce25e Merge pull request #945 from acemod/revert-937-fcsMuzzleVelocityCorrection 
Revert "Takes negative initSpeed values into account"
 2015-05-01 11:07:57 -03:00
ulteq
3ad668605a Fix for last fcs change 2015-05-01 16:02:34 +02:00
jaynus
ce6e59b25e Merge pull request #926 from acemod/guidanceClassFixes 
Limit Titan & Javelin optic configs to only those weapons and disable inheritance for LAZY MOD MAKERS
 2015-05-01 07:00:08 -07:00
jaynus
e4567fb59f Merge remote-tracking branch 'origin/master' into guidanceClassFixes 
Conflicts:
	addons/javelin/functions/fnc_onOpticDraw.sqf
 2015-05-01 06:59:28 -07:00
jaynus
9997b6d464 action is select 1 2015-05-01 06:57:49 -07:00
Nicolás Badano
cde80b2901 Revert "Takes negative initSpeed values into account" 2015-05-01 10:38:41 -03:00
commy2
b255d1040b scope 1 for ACE_Comanche_Test, #943 2015-05-01 15:30:11 +02:00
FreeZbe
68d62b0005 Update stringtable.xml 2015-05-01 14:20:21 +02:00
FreeZbe
518614ec0b Update stringtable.xml 2015-05-01 14:20:03 +02:00
FreeZbe
79ac41bd95 Update stringtable.xml 2015-05-01 14:19:43 +02:00