Commit Graph

74 Commits

Author SHA1 Message Date
PabstMirror
af6b084ba3 Don't allow carrying with injured legs
Fix #2644
2016-01-28 23:05:55 -06:00
PabstMirror
3f1d6ffeb7 Fix dragging sending objects to random location
attachTo seems to have weird getpos results for a few frames.
also don't show mouse wheel option for carrying man
and always use 0 offset for dragging man
2016-01-28 17:11:05 -06:00
PabstMirror
d9eafbdf0f Privates / Headers 2016-01-28 12:52:53 -06:00
PabstMirror
04bccf47d7 Replace all use of deprecated commands 2016-01-19 09:39:07 -06:00
PabstMirror
9a3972de76 Unified Status Effect Handler 2016-01-19 09:39:05 -06:00
Glowbal
c1fa81f28b Fix tabs in sqf files 2015-12-21 17:05:48 +01:00
commy2
a9ebcf8543 fix setVariable and getVariable capitalization 2015-11-30 17:27:09 +01:00
commy2
d9b90258bc fix typeOf capitalization 2015-11-30 17:19:57 +01:00
VKing
069169cc72 Changed ACE_time back to time in comments where appropriate 2015-10-21 22:52:21 +02:00
commy2
bc8cefa5e7 manual merge 2015-09-28 21:06:40 +02:00
jonpas
2ab58ab9ce Replaced common,isAlive function with alive command 2015-09-27 02:23:56 +02:00
commy2
2fe142032e rework modifier key, cleanup sandbags, tripod, ladder, fix #2590 2015-09-26 03:16:55 +02:00
Glowbal
19bfa478d1 Revert use of param in action string 2015-08-26 10:13:30 +02:00
Glowbal
0d7e7fa0cc should be type of 2015-08-26 10:08:32 +02:00
Glowbal
81068e6086 fixed dragging getWeight 2015-08-26 10:05:30 +02:00
Glowbal
1a0abf31fd fix global variable in local name space 2015-08-26 09:11:43 +02:00
Glowbal
65e16da998 fix missing semi column and bracket 2015-08-26 09:10:29 +02:00
jokoho48
644c13c971 fix Typo
Remove macro GETVAR
2015-08-24 13:43:11 +02:00
jokoho48
79cf8dd98e Fixing Some Spelling
Remove Some forgotten Commands
2015-08-09 15:20:50 +02:00
jokoho48
323832474f Code cleanup of Dragging module 2015-08-09 14:53:13 +02:00
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
PabstMirror
3978445837 Draggin Privates 2015-05-12 23:01:59 -05:00
Glowbal
8d358f3ab5 can only carry/drag units that are not in a vehicle 2015-04-30 20:44:59 +02:00
Glowbal
0ab25a2866 fixed #659 2015-04-21 21:41:00 +02:00
Glowbal
0234eedd54 Changed, only drop unit is player goes unconscious, otherwise keep carrying/dragging unit 2015-04-17 20:33:13 +02:00
Glowbal
66bd7e7e5f fixed #457 2015-04-11 20:32:07 +02:00
Glowbal
d94943a9ff getting hitpoint damage on non existing hitpoint returns type instead of bool 2015-04-09 21:38:35 +02:00
Glowbal
093d340ee7 Changed: Dragging/carrying now works for units with broken legs
Added unload and load of unconscious units
2015-04-09 21:23:10 +02:00
jaynus
1bb6be5654 Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
jaynus
e3ad83e109 Merge pull request #286 from KoffeinFlummi/lasers
Self designating lasers, Javelin Guidance, DAGR laser guidance, Comanche updated HUDS
2015-04-05 13:26:54 -07:00
jaynus
ab0d289762 Merge remote-tracking branch 'origin/master' into lasers 2015-04-04 16:56:03 -07:00
Glowbal
2b9afcbb6c Now supports unconscious state fully 2015-04-04 20:37:25 +02:00
Nou
6541600d44 Switch everything to use modelToWorldVisual instead of modelToWorld. 2015-04-03 15:26:27 -07:00
PabstMirror
604e851423 Medical - isBeingCarried 2015-04-03 14:37:04 -05:00
PabstMirror
146812b5e6 Dragging - Detect static weapon disassembled
Static weapons can still be disassembled at any time during dragging.
This just adds a simple distance check and drops if object moves away
from player.
2015-03-30 21:51:11 -05:00
commy2
54369b772f fix: crate instantly drops when trying to pick up with lowered weapon 2015-03-29 20:46:29 +02:00
commy2
e007a247d8 detach when entering a vehicle, don't mess up animation insidea vehicle 2015-03-25 21:51:50 +01:00
commy2
01b7d3b213 global setDir on attachTo 2015-03-25 20:45:47 +01:00
commy2
3634eaf568 tweak carry stance req., timeout certain PFH, exit PFH, debug 2015-03-25 20:18:23 +01:00
commy2
569a77d41b logic 2015-03-25 14:34:19 +01:00
commy2
0c8e8236dd logic 2015-03-25 14:32:36 +01:00
commy2
e1b5b96a7e derped the file 2015-03-25 14:09:49 +01:00
commy2
20882ed694 properly remove fake weapon after carrying persons 2015-03-25 14:07:50 +01:00
commy2
ebe9d7ed5f carrying unconscious persons 2015-03-25 13:32:59 +01:00
commy2
655f23b53c start carrying phase 2015-03-24 21:37:27 +01:00
commy2
749352f0a8 animations, onUnconscious events 2015-03-24 19:07:39 +01:00