mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00

History

KoffeinFlummi 614afa8537 Merge https://github.com/Kllrt/ACE3 into czech-merge

Conflicts:
	addons/attach/stringtable.xml
	addons/captives/stringtable.xml
	addons/common/stringtable.xml
	addons/dragging/stringtable.xml
	addons/explosives/stringtable.xml
	addons/goggles/stringtable.xml
	addons/grenades/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/kestrel/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/logistics_uavbattery/stringtable.xml
	addons/logistics_wirecutter/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/maptools/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/nametags/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/reload/stringtable.xml
	addons/reloadlaunchers/stringtable.xml
	addons/weaponselect/stringtable.xml
	addons/wep_javelin/stringtable.xml
	addons/winddeflection/stringtable.xml

2015-04-12 14:27:59 +02:00

functions

translations

2015-04-07 10:02:33 +02:00

models

Captives First Pass

2015-02-02 20:04:50 -06:00

sounds

#118 Sound Effect from CSE

2015-02-06 23:23:33 -06:00

second batch of icons

2015-03-23 20:02:35 +01:00