Arma3_Epoch/ACE3

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

History

jonpas 541f1010a7 Merge branch 'master' into macroSTR

Conflicts:
	addons/attach/functions/fnc_attach.sqf
	addons/captives/functions/fnc_moduleSurrender.sqf
	addons/common/CfgVehicles.hpp
	addons/explosives/CfgModule.hpp
	addons/hearing/CfgVehicles.hpp
	addons/interaction/CfgVehicles.hpp
	addons/map/CfgVehicles.hpp
	addons/microdagr/CfgVehicles.hpp
	addons/mk6mortar/CfgVehicles.hpp
	addons/nametags/CfgVehicles.hpp
	addons/nightvision/functions/fnc_changeNVGBrightness.sqf
	addons/respawn/CfgVehicles.hpp
	addons/switchunits/CfgVehicles.hpp
	addons/vehiclelock/CfgVehicles.hpp
	addons/winddeflection/stringtable.xml

2015-06-02 22:14:32 +02:00

..

#1383 - Fix map shake interfering with other anims

2015-05-24 23:56:22 -05:00

second batch of icons

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

$PBOPREFIX$

Fixed Capitalized folders on include paths

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

ACE_Settings.hpp

Second batch of settings files

2015-05-14 20:59:25 +02:00

CfgEventHandlers.hpp

Reordered the map, mapfx and pbos:

2015-03-14 16:58:05 -03:00

CfgMarkers.hpp

Reordered the map, mapfx and pbos:

2015-03-14 16:58:05 -03:00

CfgVehicles.hpp

Merge branch 'master' into macroSTR

2015-06-02 22:14:32 +02:00

config.cpp

Second batch of settings files

2015-05-14 20:59:25 +02:00

MapControls.hpp

Reordered the map, mapfx and pbos:

2015-03-14 16:58:05 -03:00

MapTweaks.hpp

Ported from ACE2:

2015-03-13 19:34:56 -03:00

README.md

Reordered the map, mapfx and pbos:

2015-03-14 16:58:05 -03:00

script_component.hpp

Fixed Capitalized folders on include paths

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

stringtable.xml

Merge https://github.com/Macusercom/ACE3 into german-merge

2015-06-01 14:27:49 +02:00

XEH_postInitClient.sqf

All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.

2015-05-21 09:42:44 -07:00

XEH_preInit.sqf

disable map cursor coordinates in mp

2015-04-08 10:45:57 +02:00

README.md

ace_map

Various tweaks to the in-game map. Including:

Better map styling (countours, legend, hiding bushes and trees, etc).
Max zoom level (optional)
Map shaking while walking (optional)
Map illumination (optional)
Blufor tracker (optional)

Maintainers

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