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 |
|
ulteq
|
4802ffeebf
|
Fixes random teleport when dragging/carrying inside of buildings.
|
2015-05-31 18:34:48 +02:00 |
|
jonpas
|
763cb07629
|
Macro STRING to LSTRING
|
2015-05-28 21:59:04 +02:00 |
|
jonpas
|
6072e14077
|
Changed all strings to macros (except external)
|
2015-05-27 19:04:25 +02:00 |
|
jaynus
|
c924baefd7
|
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
|
2015-05-21 09:42:44 -07:00 |
|
commy2
|
ebe9d7ed5f
|
carrying unconscious persons
|
2015-03-25 13:32:59 +01:00 |
|
commy2
|
749352f0a8
|
animations, onUnconscious events
|
2015-03-24 19:07:39 +01:00 |
|
commy2
|
11bb1a050a
|
fix: could drag and carry object at the same time
|
2015-03-22 17:12:14 +01:00 |
|
commy2
|
1071284010
|
properly remove fake weapon, fix grabDrag action with fake weapon
|
2015-03-18 16:55:57 +01:00 |
|
commy2
|
ec6496ed2f
|
fix authors, add weight checks
|
2015-03-18 14:14:16 +01:00 |
|
commy2
|
27404fed1b
|
function to drop object, fix position event
|
2015-03-16 19:25:29 +01:00 |
|
commy2
|
efb3657da3
|
drag boxes
|
2015-03-16 14:31:16 +01:00 |
|
commy2
|
b79978116d
|
some functions
|
2015-03-14 18:38:44 +01:00 |
|