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

History

SilentSpike 159937dc45 Merge branch 'master' into ace_spectator

Conflicts:
	addons/explosives/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/stringtable.xml
	addons/medical/stringtable.xml
	addons/sitting/stringtable.xml
	addons/spectator/stringtable.xml
	extras/assets/icons/Icons_Modules.psd

2015-07-26 14:15:24 +01:00

data

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

functions

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

trying to fix capitilization 2

2015-01-11 21:39:49 +01:00

$PBOPREFIX$

Fixed Capitalized folders on include paths

2015-05-20 23:28:10 +02:00

CfgEventHandlers.hpp

Stop placement on interact_menu open

2015-03-27 11:53:04 -05:00

CfgMagazines.hpp

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

CfgVehicles.hpp

Merge pull request #1505 from alganthe/strobe-intensity

2015-06-04 15:34:20 -03:00

CfgWeapons.hpp

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

config.cpp

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

GUI_VirtualAmmo.hpp

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

README.md

Formating and Headers

2015-02-01 14:56:19 -06:00

script_component.hpp

Merge branch 'master' into ace_spectator

2015-07-26 14:15:24 +01:00

stringtable.xml

Stringtable fixes up to medical

2015-05-27 21:19:14 +02:00

XEH_clientInit.sqf

Stop placement on interact_menu open

2015-03-27 11:53:04 -05:00

XEH_preInit.sqf

Use CBA PFEH instead of BI stacked

2015-03-27 11:14:04 -05:00

README.md

ace_attach

Introducing the ability to attach various throwables to yourself or vehicles, to mark your position and assist in IFF. Adds item ACE_IR_Strobe_Item.

Maintainers

The people responsible for merging changes to this component or answering potential questions.