ACE3/addons at a1e709047ec424032dbdc872ca80089186abaea6 - ACE3 - Z's Git Repo

Arma3_Epoch/ACE3

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

History

KoffeinFlummi a1e709047e Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

Conflicts:
	AUTHORS.txt
	addons/aircraft/stringtable.xml
	addons/attach/stringtable.xml
	addons/captives/stringtable.xml
	addons/common/stringtable.xml
	addons/disposable/stringtable.xml
	addons/dragging/stringtable.xml
	addons/explosives/stringtable.xml
	addons/fcs/stringtable.xml
	addons/frag/stringtable.xml
	addons/grenades/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/markers/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/movement/stringtable.xml
	addons/nametags/stringtable.xml
	addons/nightvision/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/parachute/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/reload/stringtable.xml
	addons/reloadlaunchers/stringtable.xml
	addons/respawn/stringtable.xml
	addons/safemode/stringtable.xml
	addons/switchunits/stringtable.xml
	addons/vehiclelock/stringtable.xml
	addons/weaponselect/stringtable.xml
	addons/wep_javelin/stringtable.xml
	addons/winddeflection/stringtable.xml

2015-04-29 12:52:55 +02:00

..

advanced_ballistics

Improved a module setting description

2015-04-26 22:44:18 +02:00

increase engagement ranges / burst mode on new mmg / full auto dmr

2015-04-12 18:21:28 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

French pass

2015-04-28 18:00:09 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Some missing private defines.

2015-04-16 12:36:16 -05:00

Localization update

2015-04-29 11:20:21 +03:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Create README.md

2015-01-26 13:37:41 +01:00

French: updates / fixes stringtable

2015-04-18 18:49:46 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

flashsuppressors

Remove tabler comments.

2015-04-26 21:05:41 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

More Privates

2015-04-17 15:45:00 -05:00

Remove tabler comments.

2015-04-26 21:05:41 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

gj git

2015-04-20 02:18:46 -05:00

prevent ai fro being stuck, #290

2015-04-09 16:54:50 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

ace_lasers

2015-04-18 10:57:11 -07:00

laser_selfdesignate

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +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

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Make PARAM/Explode_X faster

2015-04-25 10:25:08 -05:00

Remove tabler comments.

2015-04-26 21:05:41 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

missileguidance

Localization update

2015-04-29 11:20:21 +03:00

Cleaning up of all tabs in source code files.

2015-04-06 09:22:43 -07:00

Localization update

2015-04-29 11:20:21 +03:00

Using ace_frag_fnc_addManualTrack instead of fired function

2015-04-20 23:55:23 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

indentation

2015-03-26 18:03:13 +01:00

More Privates

2015-04-17 15:45:00 -05:00

hide rearm action for players

2015-03-26 14:14:56 +01:00

Localization update

2015-04-29 11:20:21 +03:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Cleaning up of all tabs in source code files.

2015-04-06 09:22:43 -07:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

manual merge

2015-04-08 22:01:41 +02:00

Add remaining READMEs, add helper script

2015-01-26 14:34:48 +01:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Removed debug output

2015-04-28 19:33:00 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

reloadlaunchers

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Fixes: https://github.com/acemod/ACE3/issues/904

2015-04-29 09:27:49 +02:00

Cleaning up of all tabs in source code files.

2015-04-06 09:22:43 -07:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Cleaning up of all tabs in source code files.

2015-04-06 09:22:43 -07:00

Add remaining READMEs, add helper script

2015-01-26 14:34:48 +01:00

fix vector name

2015-04-26 15:36:47 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Remove tabler comments.

2015-04-26 21:05:41 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00

Added weather update interval module setting

2015-04-27 12:47:26 +02:00

Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge

2015-04-29 12:52:55 +02:00