ACE3/addons at cc75928cc0d81968c841b17fa57896c23b1c51f0 - 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

simon84 cc75928cc0 Merge remote-tracking branch 'acemod/master'

Conflicts:
	addons/disarming/stringtable.xml
	addons/hearing/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/nametags/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/winddeflection/stringtable.xml

2015-04-16 22:47:51 +02:00

..

advanced_ballistics

Merge branch 'spanish-merge'

2015-04-16 18:32:37 +02:00

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

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

Merge pull request #610 from ramius86/patch-3

2015-04-15 09:57:27 -03:00

Got rid of the __DSP macro

2015-04-16 19:52:20 +02:00

Some missing private defines.

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

Some missing private defines.

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

added spanish translation

2015-04-16 19:03:15 +02:00

Some missing private defines.

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

Fixed: ACE_Fake**** Was showing in arsenal. Fixes #670

2015-04-16 10:10:24 -07:00

Create README.md

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

Merge remote-tracking branch 'acemod/master'

2015-04-16 22:47:51 +02:00

Some missing private defines.

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

Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge

2015-04-15 12:59:56 +02:00

Stringtable cleanup

2015-04-16 02:54:50 -05:00

Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge

2015-04-15 12:59:56 +02:00

flashsuppressors

Fixes

2015-04-13 18:02:48 +02:00

Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge

2015-04-15 22:20:47 +02:00

Cleaning up of all tabs in source code files.

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

Merge branch 'hungarian-merge'

2015-04-15 13:55:02 +02:00

Merge branch 'hungarian-merge'

2015-04-15 13:55:02 +02:00

Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge

2015-04-15 22:20:47 +02:00

prevent ai fro being stuck, #290

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

Update stringtable.xml

2015-04-16 14:59:19 +02:00

Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge

2015-04-15 22:20:47 +02:00

Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge

2015-04-15 22:20:47 +02:00

Merge https://github.com/Legolasindar/ACE3 into spanish-merge

2015-04-16 18:31:31 +02:00

Merge https://github.com/Legolasindar/ACE3 into spanish-merge

2015-04-16 18:31:31 +02:00

Seeker FOV implemented, fast FOV check.

2015-04-12 19:16:58 -07:00

laser_selfdesignate

#644 - Extra Space in macro

2015-04-15 20:30:09 -05:00

Merge https://github.com/Legolasindar/ACE3 into spanish-merge

2015-04-16 18:31:31 +02:00

logistics_uavbattery

Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge

2015-04-15 12:59:56 +02:00

logistics_wirecutter

port alternative wirecutter sound

2015-04-15 22:19:43 +02:00

Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge

2015-04-15 22:20:47 +02:00

Readd CfgModuleCategories.hpp

2015-04-12 11:06:25 -03:00

Merge pull request #392 from KoffeinFlummi/requiredaddons

2015-04-09 16:37:47 +02:00

Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge

2015-04-15 22:20:47 +02:00

Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge

2015-04-15 22:20:47 +02:00

Merge remote-tracking branch 'acemod/master'

2015-04-16 22:47:51 +02:00

Merge remote-tracking branch 'acemod/master'

2015-04-16 22:47:51 +02:00

missileguidance

Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge

2015-04-15 22:20:47 +02:00

Cleaning up of all tabs in source code files.

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

Indentation

2015-03-22 12:45:46 +01:00

Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge

2015-04-15 22:20:47 +02:00

Merge remote-tracking branch 'acemod/master'

2015-04-16 22:47:51 +02:00

Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge

2015-04-15 12:59:56 +02:00

indentation

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

mute implementation in noradio, handle post init on remote units

2015-04-12 11:17:58 +02:00

hide rearm action for players

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

Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge

2015-04-15 12:59:56 +02:00

Merge remote-tracking branch 'acemod/master'

2015-04-16 22:47:51 +02:00

Merge remote-tracking branch 'acemod/master'

2015-04-16 22:47:51 +02:00

Cleaning up of all tabs in source code files.

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

Translation: N to R

2015-04-13 23:45:44 +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

addons/realisticnames translation to Russian

2015-04-16 14:10:48 +03:00

Merge branch 'hungarian-merge'

2015-04-15 13:55:02 +02:00

reloadlaunchers

Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge

2015-04-15 12:59:56 +02:00

added spanish translation

2015-04-16 19:03:15 +02:00

Merge https://github.com/Coren4/ACE3 into polish-merge

2015-04-15 15:10:28 +02:00

Merge https://github.com/Legolasindar/ACE3 into spanish-merge

2015-04-16 18:31:31 +02:00

Cleaning up of all tabs in source code files.

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

Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge

2015-04-15 12:59:56 +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

how do I merge

2015-04-13 19:23:42 +02:00

Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge

2015-04-15 12:59:56 +02:00

Merge branch 'hungarian-merge'

2015-04-15 13:55:02 +02:00

Merge branch 'hungarian-merge'

2015-04-15 13:55:02 +02:00

Merge https://github.com/Legolasindar/ACE3 into spanish-merge

2015-04-16 18:31:31 +02:00

Merge remote-tracking branch 'acemod/master'

2015-04-16 22:47:51 +02:00