Glowbal
f57eb08ce5
Merge pull request #2620 from jonpas/sittingFramework
...
Sitting Framework
2015-10-18 12:26:53 +02:00
SzwedzikPL
98f6bb3589
Merge branch 'master' of https://github.com/acemod/ACE3 into interactions_lamps
...
Conflicts:
addons/cargo/CfgVehicles.hpp
addons/interaction/CfgVehicles.hpp
addons/interaction/XEH_preInit.sqf
addons/interaction/stringtable.xml
2015-10-15 11:49:08 +02:00
gienkov
ba42e3e295
pl string for dragging, tactical ladder
2015-09-29 22:12:11 +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
jonpas
ae07a71b0d
Minimized XEH to ThingX config level
2015-09-27 02:13:32 +02:00
jonpas
cd510c8ff7
Added carrying to chairs
2015-09-27 02:05:38 +02:00
commy2
2fe142032e
rework modifier key, cleanup sandbags, tripod, ladder, fix #2590
2015-09-26 03:16:55 +02:00
KoffeinFlummi
83aa2cc68c
Merge branch 'release' into french
2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be
Update French translations
2015-09-10 19:14:51 +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
Glowbal
5bec26c721
Merge pull request #2086 from jokoho48/codeCleanUpDragging
...
Code cleanup of Dragging module
2015-08-26 08:45:30 +02:00
jokoho48
644c13c971
fix Typo
...
Remove macro GETVAR
2015-08-24 13:43:11 +02:00
SzwedzikPL
3e19b33493
interaction with portable lamps
2015-08-22 20:00:26 +02:00
jonpas
de033f0ff2
README.md files added to all modules
2015-08-19 04:18:33 +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
Glowbal
1ad2a5cdf1
Merge branch 'master' into repair
...
Conflicts:
addons/interaction/CfgVehicles.hpp
2015-07-03 22:29:29 +02:00
ProfessorCZ
acc5f4d29f
CZ - Translation
2015-06-12 15:05:04 +02:00
ProfessorCZ
531372b2a3
CZ - Translation
...
Already in README
2015-06-12 14:50:50 +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
Alessandro Foresi
643df71932
Added: Italian translation from Blackedsoul p#20
2015-05-10 11:05:16 +02:00
Alessandro Foresi
9e093b9459
Added: More italian translations
2015-05-09 23:52:01 +02:00
Alessandro Foresi
6695a8793b
Added: Some italian translastions
2015-05-09 23:43:03 +02:00
ToasterBR
021b00c722
Translation to Portuguese
...
Done all remaining portuguese translations, including some minor
corrections
2015-05-02 03:38:53 -03:00
KoffeinFlummi
761e23001f
Merge https://github.com/Dimaslg/ACE3 into spanish-merge
...
Conflicts:
addons/medical/stringtable.xml
addons/missileguidance/stringtable.xml
addons/optionsmenu/stringtable.xml
2015-05-01 16:51:20 +02:00
Glowbal
8d358f3ab5
can only carry/drag units that are not in a vehicle
2015-04-30 20:44:59 +02:00
Dimaslg
f8d5c423ae
Merge conflicts resolved
2015-04-29 21:15:22 +02:00
PabstMirror
2beaf8ddeb
Merge pull request #905 from acemod/fixDragAnim
...
Fix Dragging StanceChange Anim
2015-04-29 13:34:16 -05:00
KoffeinFlummi
a1e709047e
Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge
...
Conflicts:
AUTHORS.txt
addons/aircraft/stringtable.xml
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/disposable/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/fcs/stringtable.xml
addons/frag/stringtable.xml
addons/grenades/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/kestrel/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/logistics_uavbattery/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/markers/stringtable.xml
addons/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/movement/stringtable.xml
addons/nametags/stringtable.xml
addons/nightvision/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/parachute/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/respawn/stringtable.xml
addons/safemode/stringtable.xml
addons/switchunits/stringtable.xml
addons/vehiclelock/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
2015-04-29 12:52:55 +02:00
PabstMirror
414a50fb9b
Fix Dragging StanceChange Anim
2015-04-28 15:40:36 -05:00
Josuan Albin
b5524fb3ee
French pass
...
* fixed ramp in /aircraft
* added aragmx entry
* added multiple medical entries
* translated missileguidance
* completed mk6mortar
* changed Sanitaire to Médical in realisticnames also fixed some typos
in there and had to rename some of the explosives (weren't fitting in
boxes in game)
* added myself to contributors
2015-04-28 18:00:09 +02:00
VyMajoris
523cb49ff1
Added - Portuguese translation to lots of things.
...
Also fixed a typo the english key for STR_ACE_microdagr_configure.
2015-04-26 03:09:16 -03:00
Dimaslg
274663e1b9
Spanish Translation
...
Minor fixes and spelling mistakes.
2015-04-25 18:53:45 +02:00
commy2
1a9f8d86e0
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into repair
2015-04-24 18:25:34 +02:00
Glowbal
0ab25a2866
fixed #659
2015-04-21 21:41:00 +02:00
commy2
665aa37898
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into repair
2015-04-21 12:41:12 +02:00
Glowbal
362051e2db
Merge pull request #717 from acemod/medicalFixes
...
Medical fixes
2015-04-20 22:16:57 +02:00
KoffeinFlummi
06a4f3d10e
Remove tabler comments.
2015-04-20 15:48:50 +02:00
Grzegorz Sikora
8530684fa6
PL fix #2
2015-04-19 23:09:11 +02:00
Glowbal
b71ac1485d
Merge branch 'master' into medicalFixes
2015-04-19 12:06:54 +02:00
Tachii
dc2c3e246e
Update stringtable.xml
2015-04-19 01:25:30 +03:00
Glowbal
0234eedd54
Changed, only drop unit is player goes unconscious, otherwise keep carrying/dragging unit
2015-04-17 20:33:13 +02:00
KoffeinFlummi
2ffbccbf20
Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge
2015-04-15 12:59:56 +02:00
KoffeinFlummi
63fe4118d4
Merge https://github.com/FreeZbe/ACE3 into french-merge
2015-04-14 14:48:13 +02:00
Harakhti
3c3f6ba4c3
Translation: A to I
...
Some parts filled out, other parts corrected or stylized.
2015-04-13 19:28:58 +02:00
bux578
cba66366bd
fix invalid xml
2015-04-13 15:25:51 +02:00
KoffeinFlummi
f6c7d444e1
Merge https://github.com/Anthariel/ACE3 into french-merge
2015-04-13 13:31:48 +02:00
KoffeinFlummi
118b5509ea
Merge https://github.com/gienkov/ACE3 into polish-merge
2015-04-13 13:00:59 +02:00
Anthariel
2939862e8c
Update stringtable.xml
2015-04-13 02:12:56 +02:00
KoffeinFlummi
614afa8537
Merge https://github.com/Kllrt/ACE3 into czech-merge
...
Conflicts:
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/goggles/stringtable.xml
addons/grenades/stringtable.xml
addons/hearing/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/kestrel/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/logistics_uavbattery/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/nametags/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
2015-04-12 14:27:59 +02:00
FreeZbe
45ff6c7ce9
French: (Nearly) Complete French translations
...
Some entries (3 or 4) are still missing.
I dont understand what you mean / what the input is related to.
2015-04-12 14:15:45 +02:00
Glowbal
6bfd3e5c74
Merge pull request #481 from acemod/FixUnconciousAnimWhileCarrying
...
Fixed breaking of unconscious animation on drop object.
2015-04-12 09:48:27 +02:00
KoffeinFlummi
59952441d8
Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge
2015-04-12 06:22:17 +02:00
EpMAK
21abff3713
Revert "Revert "Russian Translation""
...
This reverts commit ea04f4ab3e
2015-04-11 21:33:34 +03:00
EpMAK
ea04f4ab3e
Revert "Russian Translation"
...
This reverts commit 17a552bb80
2015-04-11 21:33:07 +03:00
Glowbal
66bd7e7e5f
fixed #457
2015-04-11 20:32:07 +02:00
Kllrt
38adfbcb70
Added missing CZ strings and made little revision
2015-04-11 16:33:00 +02:00
EpMAK
17a552bb80
Russian Translation
...
Russian translation of stringtables: new lines + old lines fixed a bit,
realistic names for armory are not yet filled.
2015-04-10 19:55:57 +03:00
EpMAK
68d08b8c7b
Revert "Translation"
...
This reverts commit fab5605ad5
2015-04-10 19:46:18 +03:00
EpMAK
fab5605ad5
Translation
...
Russian translation of the texts
2015-04-10 17:51:48 +03:00
Grzegorz
6be80caf2e
dragging PL translation
2015-04-10 03:41:12 +02:00
VyMajoris
c8c183863c
Changed - Dragging drop Portuguese Translation
...
Changed from "Largar" to "Soltar". "Largar" seems a little to harsh when dealing with humans.
"STR_ACE_Dragging_UnableToDrag" Commented code unchanged
2015-04-09 22:28:45 -03:00
Legolasindar
ed87e53c80
Update stringtable.xml
...
Updated spanish terms.
2015-04-10 00:48:51 +02:00
licht-im-Norden87
a6f8e05cb8
Update stringtable.xml
2015-04-09 23:37:26 +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
commy2
5ea35a01bb
sorting out required addons for modularity
2015-04-09 13:23:29 +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
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
