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
1e786d4a92
ACE3/addons
History
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
..
advanced_ballistics Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-05-01 17:30:59 +02:00
ai increase engagement ranges / burst mode on new mmg / full auto dmr 2015-04-12 18:21:28 +02:00
aircraft Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge 2015-04-29 12:52:55 +02:00
atragmx Merge https://github.com/FreeZbe/ACE3 into french-merge 2015-05-01 17:45:00 +02:00
attach Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master 2015-04-30 13:20:31 +02:00
backpacks Some missing private defines. 2015-04-16 12:36:16 -05:00
ballistics Merge https://github.com/FreeZbe/ACE3 into french-merge 2015-05-01 17:45:00 +02:00
captives Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master 2015-04-30 13:20:31 +02:00
common Merge pull request #928 from acemod/AdjustUnloadPerson 2015-04-30 20:55:17 +02:00
difficulties
disarming Update Hungarian translations 2015-04-30 13:25:25 +02:00
disposable Merge https://github.com/FreeZbe/ACE3 into french-merge 2015-05-01 17:45:00 +02:00
dragging Merge https://github.com/Dimaslg/ACE3 into spanish-merge 2015-05-01 16:51:20 +02:00
explosives Merge https://github.com/FreeZbe/ACE3 into french-merge 2015-05-01 17:45:00 +02:00
fcs Merge https://github.com/Dimaslg/ACE3 into spanish-merge 2015-05-01 16:51:20 +02:00
flashsuppressors Merge conflicts resolved 2015-04-29 21:15:22 +02:00
frag fix ubc, fix #938 2015-05-01 11:01:07 +02:00
gforces More Privates 2015-04-17 15:45:00 -05:00
goggles rename category ace <blank> to ace common 2015-05-01 10:19:47 +02:00
grenades Merge https://github.com/Dimaslg/ACE3 into spanish-merge 2015-05-01 16:51:20 +02:00
hearing Added missing privates 2015-04-30 10:50:49 +02:00
hitreactions prevent ai fro being stuck, #290 2015-04-09 16:54:50 +02:00
interact_menu Merge https://github.com/FreeZbe/ACE3 into french-merge 2015-05-01 17:45:00 +02:00
interaction Merge https://github.com/Dimaslg/ACE3 into spanish-merge 2015-05-01 16:51:20 +02:00
inventory Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge 2015-04-29 12:52:55 +02:00
javelin Merge remote-tracking branch 'origin/master' into guidanceClassFixes 2015-05-01 06:59:28 -07:00
kestrel4500 Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-05-01 17:30:59 +02:00
laser ace_lasers 2015-04-18 10:57:11 -07:00
laser_selfdesignate Merge https://github.com/Dimaslg/ACE3 into spanish-merge 2015-05-01 16:51:20 +02:00
laserpointer Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-05-01 17:30:59 +02:00
logistics_uavbattery Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge 2015-04-29 12:52:55 +02:00
logistics_wirecutter Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge 2015-04-29 12:52:55 +02:00
magazinerepack Merge https://github.com/Dimaslg/ACE3 into spanish-merge 2015-05-01 16:51:20 +02:00
main Make PARAM/Explode_X faster 2015-04-25 10:25:08 -05:00
map Remove tabler comments. 2015-04-26 21:05:41 +02:00
maptools Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge 2015-04-29 12:52:55 +02:00
markers Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge 2015-04-29 12:52:55 +02:00
medical Merge https://github.com/FreeZbe/ACE3 into french-merge 2015-05-01 17:45:00 +02:00
microdagr Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-05-01 17:30:59 +02:00
missileguidance Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-05-01 17:30:59 +02:00
missionmodules Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
mk6mortar Merge https://github.com/FreeZbe/ACE3 into french-merge 2015-05-01 17:45:00 +02:00
modules Using ace_frag_fnc_addManualTrack instead of fired function 2015-04-20 23:55:23 +02:00
movement Initial categories 2015-04-30 22:02:20 +02:00
nametags Merge https://github.com/Dimaslg/ACE3 into spanish-merge 2015-05-01 16:51:20 +02:00
nightvision Merge https://github.com/Dimaslg/ACE3 into spanish-merge 2015-05-01 16:51:20 +02:00
noidle
noradio More Privates 2015-04-17 15:45:00 -05:00
norearm
optics Localization update 2015-04-29 11:20:21 +03:00
optionsmenu Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-05-01 17:30:59 +02:00
overheating Merge https://github.com/Dimaslg/ACE3 into spanish-merge 2015-05-01 16:51:20 +02:00
overpressure Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
parachute Initial categories 2015-04-30 22:02:20 +02:00
protection manual merge 2015-04-08 22:01:41 +02:00
ragdolls
realisticnames Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-05-01 17:30:59 +02:00
recoil Removed debug output 2015-04-28 19:33:00 +02:00
reload Merge https://github.com/FreeZbe/ACE3 into french-merge 2015-05-01 17:45:00 +02:00
reloadlaunchers Update stringtable.xml 2015-05-01 14:20:21 +02:00
respawn Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-05-01 17:30:59 +02:00
safemode plurals 2015-04-30 22:39:33 +02:00
scopes Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-05-01 17:30:59 +02:00
smallarms Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
switchunits Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge 2015-04-29 12:52:55 +02:00
testmissions Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
thermals
vector Initial categories 2015-04-30 22:02:20 +02:00
vehiclelock Merge https://github.com/Dimaslg/ACE3 into spanish-merge 2015-05-01 16:51:20 +02:00
vehicles plurals 2015-04-30 22:39:33 +02:00
weaponselect Merge https://github.com/Dimaslg/ACE3 into spanish-merge 2015-05-01 16:51:20 +02:00
weather Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-05-01 17:30:59 +02:00
winddeflection Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge 2015-04-29 12:52:55 +02:00