Commit Graph

147 Commits

Author SHA1 Message Date
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
77d39877d2 Merge branch 'master' into medicalImprovements 2015-04-04 22:01:15 +02:00
Glowbal
2b9afcbb6c Now supports unconscious state fully 2015-04-04 20:37:25 +02:00
commy2
2fa7624815 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into repair 2015-04-04 20:03:33 +02:00
PabstMirror
07dfe52133 Remove Duplicate Mortar Code (inherit from statics)
Before an action added to staticWeapon wouldn't be applied to mk6 mortar
2015-04-03 19:07:13 -05: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
f231b2b14c removing wheels logic, carryable wheels 2015-03-29 03:35:55 +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
commy2
43846970fa init drag/carry options on persons 2015-03-24 16:12:46 +01:00
commy2
84dbeb19d1 fix: timeout could cause being stuck with attached item 2015-03-22 17:35:26 +01:00
commy2
11bb1a050a fix: could drag and carry object at the same time 2015-03-22 17:12:14 +01:00
commy2
e1200f8753 fix: release action didn't show up 2015-03-22 16:38:21 +01:00
Nicolás Badano
b854db0195 Updated interact_menu api calls on ace_dragging 2015-03-19 23:33:11 -03:00
commy2
1071284010 properly remove fake weapon, fix grabDrag action with fake weapon 2015-03-18 16:55:57 +01:00
commy2
be17e25487 handle dc is the same fnc as handle killed 2015-03-18 16:02:01 +01:00
commy2
0bc7811912 don't drag or carry dead objects 2015-03-18 15:52:34 +01:00
commy2
4ea6b91e47 use eventhandlers instead of PFH 2015-03-18 15:42:33 +01:00
commy2
ec6496ed2f fix authors, add weight checks 2015-03-18 14:14:16 +01:00
commy2
c23c0788f6 tweaks, carry static weapons 2015-03-18 13:36:22 +01:00
commy2
ab39608e4d change height when carrying, fix most cases of floating objects 2015-03-18 01:36:56 +01:00
commy2
dc7cfab06f change default carry position 2015-03-17 15:45:34 +01:00
commy2
75548e21d9 add carry objects 2015-03-17 15:42:25 +01:00
commy2
57becc203c handle disconnection when dragging 2015-03-17 13:47:07 +01:00
commy2
5f39cf213b some fixes for MP 2015-03-17 12:20:46 +01:00
commy2
6d868d1bd1 fix collisions when releasing, fix crate fliping in buildings 2015-03-17 11:44:41 +01:00
commy2
fef150cff2 attempt to fix collisions 2015-03-17 00:24:25 +01:00
commy2
2aaef08c1d can drag / drop functions, localization 2015-03-16 20:39:49 +01:00
commy2
2da0eee1e2 add drop dragged object action 2015-03-16 20:09:54 +01:00
commy2
27404fed1b function to drop object, fix position event 2015-03-16 19:25:29 +01:00
commy2
ad181de578 main me
nu for reammo_box
2015-03-16 15:41:55 +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
commy2
f3f20439c8 config stuff, functions to make objects dragable 2015-03-14 13:51:23 +01:00
commy2
58212f5ce0 add PBO to drag objects 2015-03-14 12:05:43 +01:00