ACE3/addons
KoffeinFlummi 3aafa2082d Merge https://github.com/nomisum/ACE3 into german-merge
Conflicts:
	addons/atragmx/stringtable.xml
	addons/scopes/stringtable.xml
	addons/weather/stringtable.xml
2015-04-19 00:39:44 +02:00
..
advanced_ballistics Merge https://github.com/nomisum/ACE3 into german-merge 2015-04-19 00:39:44 +02:00
ai increase engagement ranges / burst mode on new mmg / full auto dmr 2015-04-12 18:21:28 +02:00
aircraft Fixed: Tabs everywhere. 2015-04-17 07:30:55 -07:00
atragmx Merge https://github.com/nomisum/ACE3 into german-merge 2015-04-19 00:39:44 +02:00
attach French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
backpacks Some missing private defines. 2015-04-16 12:36:16 -05:00
ballistics PL translation 2015-04-17 21:48:04 +02:00
captives French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
common Merge pull request #714 from acemod/localMedicalGarbage 2015-04-18 21:25:53 +02:00
difficulties Create README.md 2015-01-26 13:37:41 +01:00
disarming French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
disposable Update stringtable.xml 2015-04-18 03:09:51 +03:00
dragging Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-04-15 12:59:56 +02:00
explosives French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
fcs Merge remote-tracking branch 'origin/master' into laserCodes 2015-04-18 10:36:07 -07:00
flashsuppressors Fixes 2015-04-13 18:02:48 +02:00
frag Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge 2015-04-15 22:20:47 +02:00
gforces More Privates 2015-04-17 15:45:00 -05:00
goggles More Privates 2015-04-17 22:40:37 -05:00
grenades French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
hearing French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
hitreactions prevent ai fro being stuck, #290 2015-04-09 16:54:50 +02:00
interact_menu Merge https://github.com/nomisum/ACE3 into german-merge 2015-04-19 00:39:44 +02:00
interaction Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge 2015-04-15 22:20:47 +02:00
inventory Cleanup / private vars 2015-04-16 19:46:42 -05:00
javelin Merge pull request #749 from FreeZbe/master 2015-04-18 21:16:07 +02:00
kestrel4500 Merge https://github.com/nomisum/ACE3 into german-merge 2015-04-19 00:39:44 +02:00
laser ace_lasers 2015-04-18 10:57:11 -07:00
laser_selfdesignate Merge pull request #749 from FreeZbe/master 2015-04-18 21:16:07 +02:00
laserpointer Merge https://github.com/Legolasindar/ACE3 into spanish-merge 2015-04-16 18:31:31 +02:00
logistics_uavbattery Merge pull request #721 from acemod/privatesPass1 2015-04-17 23:51:23 -05:00
logistics_wirecutter More Privates 2015-04-17 22:40:37 -05:00
magazinerepack French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
main Readd CfgModuleCategories.hpp 2015-04-12 11:06:25 -03:00
map More Privates 2015-04-17 22:40:37 -05:00
maptools More Privates 2015-04-17 18:13:09 -05:00
markers More Privates 2015-04-17 15:45:00 -05:00
medical Merge pull request #714 from acemod/localMedicalGarbage 2015-04-18 21:25:53 +02:00
microdagr Merge pull request #721 from acemod/privatesPass1 2015-04-17 23:51:23 -05:00
missileguidance Merge pull request #749 from FreeZbe/master 2015-04-18 21:16:07 +02:00
missionmodules Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
modules Indentation 2015-03-22 12:45:46 +01:00
movement player has to put weapon on back before climbing, check if still can climb 2015-04-18 10:16:10 +02:00
nametags French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
nightvision More Privates 2015-04-17 15:45:00 -05:00
noidle indentation 2015-03-26 18:03:13 +01:00
noradio More Privates 2015-04-17 15:45:00 -05:00
norearm hide rearm action for players 2015-03-26 14:14:56 +01:00
optics Fixed: Tabs everywhere. 2015-04-17 07:30:55 -07:00
optionsmenu French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
overheating Merge https://github.com/nomisum/ACE3 into german-merge 2015-04-19 00:39:44 +02:00
overpressure Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
parachute Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-17 15:45:22 +02:00
protection manual merge 2015-04-08 22:01:41 +02:00
ragdolls Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
realisticnames Merge pull request #749 from FreeZbe/master 2015-04-18 21:16:07 +02:00
reload More Privates 2015-04-17 22:40:37 -05:00
reloadlaunchers More Privates 2015-04-17 18:13:09 -05:00
respawn French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
safemode More Privates 2015-04-17 18:13:09 -05:00
scopes Merge https://github.com/nomisum/ACE3 into german-merge 2015-04-19 00:39:44 +02:00
smallarms Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
switchunits Ignore Case 2015-04-17 16:51:27 -05:00
testmissions Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
thermals Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
vector how do I merge 2015-04-13 19:23:42 +02:00
vehiclelock More Privates 2015-04-17 15:45:00 -05:00
vehicles maybe fix for #741, Speedlimiter locking vehicle controls 2015-04-18 17:42:13 +02:00
weaponselect More Privates 2015-04-17 15:45:00 -05:00
weather Merge https://github.com/nomisum/ACE3 into german-merge 2015-04-19 00:39:44 +02:00
winddeflection Enabled wind deflection for grenades and vehicle gunners: 2015-04-18 21:17:37 +02:00