PabstMirror
af48c6a86c
Merge branch 'master' into medical-rewrite
...
Conflicts:
addons/medical/ACE_Medical_SelfActions.hpp
addons/medical/CfgVehicles.hpp
addons/medical/XEH_PREP.hpp
addons/medical/functions/fnc_treatment.sqf
addons/medical/functions/fnc_treatment_failure.sqf
addons/medical/functions/fnc_treatment_success.sqf
addons/medical_treatment/functions/fnc_actionLoadUnit.sqf
2017-10-02 22:29:30 -05:00
jonpas
711e1fc026
Fix Underwater interactions (magrepack, loading, refuel, medical legs, dragging) ( #5521 )
...
* Fix Magazine Repack underwater - fix #5513
Also prevent common goKneeling function underwater
* Fix loading patients underwater - fix #5515
* Fix load object underwater
* Fix take nozzle on jerry can underwater
* Fix refuel underwater conditions further
* Use isTouchingGround, Make refuel semi-compatible
reports false if head is out of the water, we want true even if we are not diving
* Less interact exceptions duplication
* Use animationState to determine if unit is swimming, create common function and use it instead of isTouchingGround
* Fix condition
* Support dragging underwater
No carrying due to animation timing issues and other misc things
* Allow Medical Legs SelfActions underwater
* Fix fixPosition function underwater (use getPosATL instead of getPos)
* Fix fixPosition's slope adjustment for non-gravity objects, Do the same for objects without simulation as well
2017-10-01 13:38:11 -05:00
PabstMirror
ddf72d5878
Merge branch 'master' into medical-rewrite
...
Conflicts:
addons/medical/ACE_Medical_SelfActions.hpp
addons/medical/CfgVehicles.hpp
addons/medical/CfgWeapons.hpp
addons/medical/data/model.cfg
addons/medical/functions/fnc_treatment.sqf
addons/medical/functions/fnc_treatment_failure.sqf
addons/medical/functions/fnc_treatment_success.sqf
addons/medical/stringtable.xml
2017-09-23 11:25:58 -05:00
Broström.A | Evul
a50cf4e300
Added drag and Cargo ability to Orange crates ( #5421 )
...
* Added load and carry ability to some new upcoming crates
* Added missing crate to dragging
* Added missing ones for cargo.
2017-09-07 19:45:37 +02:00
jonpas
5cf7569711
Correct new Chinese stringtable identifiers ( #5334 )
2017-07-08 09:48:39 -05:00
GodofMonkeys
60131ee589
Add Chinese Traditional & Simplified Localization ( #5295 )
...
Add Chinese Traditional & Simplified Localization
2017-06-22 16:46:00 +02:00
PabstMirror
183eaaecdc
Cleanup heli pod actions ( #5271 )
...
Close #4783
- Make taru pods non loadable
- Make taru pods non draggable
- Increase interaction range for huron pods
2017-06-14 15:35:17 +02:00
PabstMirror
356a8f640a
Merge branch 'master' into medical-rewrite
...
Conflicts:
addons/medical/functions/fnc_actionCheckBloodPressure.sqf
addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
addons/medical/functions/fnc_actionCheckPulse.sqf
addons/medical/functions/fnc_actionCheckPulseLocal.sqf
addons/medical/functions/fnc_actionDiagnose.sqf
addons/medical/functions/fnc_actionRemoveTourniquet.sqf
addons/medical/functions/fnc_addHeartRateAdjustment.sqf
addons/medical/functions/fnc_addToInjuredCollection.sqf
addons/medical/functions/fnc_addUnconsciousCondition.sqf
addons/medical/functions/fnc_addVitalLoop.sqf
addons/medical/functions/fnc_canTreat.sqf
addons/medical/functions/fnc_copyDeadBody.sqf
addons/medical/functions/fnc_createLitter.sqf
addons/medical/functions/fnc_determineIfFatal.sqf
addons/medical/functions/fnc_getBloodLoss.sqf
addons/medical/functions/fnc_getBloodPressure.sqf
addons/medical/functions/fnc_getBloodVolumeChange.sqf
addons/medical/functions/fnc_getCardiacOutput.sqf
addons/medical/functions/fnc_getHeartRateChange.sqf
addons/medical/functions/fnc_getTriageStatus.sqf
addons/medical/functions/fnc_getUnconsciousCondition.sqf
addons/medical/functions/fnc_handleBandageOpening.sqf
addons/medical/functions/fnc_handleCollisionDamage.sqf
addons/medical/functions/fnc_handleDamage.sqf
addons/medical/functions/fnc_handleDamage_advanced.sqf
addons/medical/functions/fnc_handleDamage_advancedSetDamage.sqf
addons/medical/functions/fnc_handleDamage_airway.sqf
addons/medical/functions/fnc_handleDamage_caching.sqf
addons/medical/functions/fnc_handleDamage_fractures.sqf
addons/medical/functions/fnc_handleDamage_internalInjuries.sqf
addons/medical/functions/fnc_handleDamage_wounds.sqf
addons/medical/functions/fnc_handleDamage_woundsOld.sqf
addons/medical/functions/fnc_hasMedicalEnabled.sqf
addons/medical/functions/fnc_hasTourniquetAppliedTo.sqf
addons/medical/functions/fnc_isInStableCondition.sqf
addons/medical/functions/fnc_isMedicalVehicle.sqf
addons/medical/functions/fnc_itemCheck.sqf
addons/medical/functions/fnc_medicationEffectLoop.sqf
addons/medical/functions/fnc_modifyMedicalAction.sqf
addons/medical/functions/fnc_moduleAdvancedMedicalSettings.sqf
addons/medical/functions/fnc_moduleAssignMedicalFacility.sqf
addons/medical/functions/fnc_moduleBasicMedicalSettings.sqf
addons/medical/functions/fnc_moduleReviveSettings.sqf
addons/medical/functions/fnc_parseConfigForInjuries.sqf
addons/medical/functions/fnc_playInjuredSound.sqf
addons/medical/functions/fnc_reviveStateLoop.sqf
addons/medical/functions/fnc_selectionNameToNumber.sqf
addons/medical/functions/fnc_setDead.sqf
addons/medical/functions/fnc_setHitPointDamage.sqf
addons/medical/functions/fnc_setStructuralDamage.sqf
addons/medical/functions/fnc_setUnconscious.sqf
addons/medical/functions/fnc_showBloodEffect.sqf
addons/medical/functions/fnc_treatment.sqf
addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
addons/medical/functions/fnc_treatmentAdvanced_CPRLocal.sqf
addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf
addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf
addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf
addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
addons/medical/functions/fnc_treatmentAdvanced_medication.sqf
addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf
addons/medical/functions/fnc_treatmentBasic_bloodbag.sqf
addons/medical/functions/fnc_treatmentBasic_bloodbagLocal.sqf
addons/medical/functions/fnc_treatmentBasic_epipen.sqf
addons/medical/functions/fnc_treatmentBasic_morphine.sqf
addons/medical/functions/fnc_treatmentBasic_morphineLocal.sqf
addons/medical/functions/fnc_treatmentIV.sqf
addons/medical/functions/fnc_treatmentIVLocal.sqf
addons/medical/functions/fnc_treatmentTourniquet.sqf
addons/medical/functions/fnc_treatmentTourniquetLocal.sqf
addons/medical/functions/fnc_treatment_failure.sqf
addons/medical/functions/fnc_treatment_success.sqf
addons/medical/functions/fnc_unconsciousPFH.sqf
addons/medical/functions/fnc_useItem.sqf
addons/medical/functions/fnc_vitalLoop.sqf
addons/medical_blood/functions/fnc_hit.sqf
addons/medical_treatment/functions/fnc_hasItem.sqf
addons/medical_treatment/functions/fnc_useItems.sqf
2017-06-10 10:21:18 -05:00
Phyma
ffaa195fe5
Conform function headers to coding guidelines ( #5255 )
...
* Fixed headers to work with silentspike python script
* Fixed rest of the files
* Fixed ace-team
2017-06-08 15:31:51 +02:00
PabstMirror
b3fa074c38
Disable dragging on big AA Turrets ( #5251 )
2017-06-06 01:39:49 -05:00
Phyma
cec82be93b
Raise lower carry object ( #5234 )
...
* Fix to move items up and down
* Fixed private
* Fixed public bug
* Inserted Pabst solution
* Remove extra space
* Fixed request + added author
* Fixed to correct comment
* Tweeked comment again
2017-06-04 12:46:49 -05:00
PabstMirror
ddccfe563b
Merge branch 'master' into medical-rewrite
...
Conflicts:
addons/medical/functions/fnc_determineIfFatal.sqf
addons/medical/functions/fnc_displayPatientInformation.sqf
2017-06-03 12:37:28 -05:00
PabstMirror
00b91bed45
Minor fixes, cleanup, add lint ignore directives ( #5176 )
...
- Fix bug in getNumberMagazinesIn (func not used)
- Fix bug in seekerFindLaserSpot (func not used yet)
- Everything else is just cleanup
2017-05-31 22:09:36 +01:00
PabstMirror
1aebae32c5
Merge branch 'master' into medical-rewrite
...
Conflicts:
addons/medical/functions/fnc_treatment_failure.sqf
addons/medical/functions/fnc_treatment_success.sqf
2017-05-14 14:50:36 -05:00
PabstMirror
0cdb2ce238
Increase max weapon index for large modsets ( #5054 )
2017-05-12 13:12:39 -05:00
PabstMirror
a32478adfb
Merge branch 'master' into medical-rewrite
2017-01-17 13:10:18 -06:00
jtj5283449
d4855a7ff3
Korean Translation v1.0 ( #4794 )
...
* Add files via upload
* Add files via upload
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
* Added Korean translation
japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml.
* Fix encoding
2017-01-02 17:52:01 -06:00
commy2
a83267b2ff
manual merge
2016-12-05 20:15:16 +01:00
PabstMirror
a3c50a6c76
Add dev macro to quickly recompile functions ( #4699 )
2016-11-23 13:35:25 -06:00
jonpas
07ebb83281
Fix PlasticCase drag direction
2016-10-29 21:37:50 +02:00
jonpas
7c4a7c2328
Fix header
2016-10-29 21:32:49 +02:00
jonpas
c08d15151e
Fix error, Set disabled collision objects to object variable
2016-10-29 21:31:54 +02:00
jonpas
8bfcb5a1b1
Reenable collision on drop, Update function headers
2016-10-28 14:20:39 +02:00
jonpas
e400a68427
Disable collision with nearby players while carrying
2016-10-28 00:11:38 +02:00
jonpas
e83791c246
Fix carrying direction for Land_WoodenBox_F
2016-10-27 23:30:40 +02:00
commy2
5613ec5d5a
treatment functions and unconsciousness rework
2016-10-06 00:54:57 +02:00
commy2
05d30c5573
convert log macros to cba versions ( #4282 )
...
* convert log macros to cba versions
* Add changes to AB
* remove obsolete macro
2016-10-02 12:55:31 +02:00
PabstMirror
1bc5669c95
Merge branch 'master' into cba-log-macros
2016-09-30 11:18:58 -05:00
classicarma
647ad8c681
translate dragging
2016-09-17 01:44:37 +09:00
commy2
f76457f48f
convert log macros to cba versions
2016-08-22 21:06:52 +02:00
Broström.A | Evul
0dfee34a56
Added additional cargo and dragging for crates ( #4129 )
...
* Added Cargo and Dragging for `Land_WoodenBox_F` and `Land_WoodenCrate_01_F`.
2016-08-13 11:33:41 +02:00
PabstMirror
6f22df40b6
dragging - Don't run animChanged event on all units
...
Also Fix CBA_fnc_addPlayerEventHandler
2016-08-03 15:35:10 -05:00
ColdEvul
43c1c89cc1
Made new APEX crates draggable
2016-07-14 15:12:54 +02:00
commy2
ce72bfd07a
replace tabs with spaces
2016-07-12 16:28:36 +02:00
commy2
8a4514f8e7
use a function to do gestures
2016-07-12 16:16:01 +02:00
commy2
0a5a4d2d33
Fix German word order / capitalization
2016-07-03 20:42:43 +02:00
PabstMirror
96efbaef53
Add Drag/Drop Keybind
2016-07-01 16:28:44 -05:00
commy2
89ecc81111
convert common events to CBA playerEvents
2016-06-22 01:39:20 +02:00
BaerMitUmlaut
88b58216ee
Added beautified component names
2016-06-20 11:44:36 +02:00
commy2
c481ddedaf
add 'name' to components
2016-06-19 09:38:39 +02:00
jonpas
03e923aa68
Cleanup Function Headers titles
2016-06-18 11:50:41 +02:00
SilentSpike
90ebf9638b
Update common event names to meet new standard
2016-06-04 11:12:56 +01:00
SilentSpike
9e4fd77745
Update common event names to meet new standard
2016-06-03 22:39:43 +01:00
Glowbal
694503c01b
Fix medical events
2016-06-03 20:57:21 +02:00
Glowbal
fa2cf55156
Fix medical related events
2016-06-03 20:22:34 +02:00
PabstMirror
d7f9c52c2f
Merge branch 'master' into cbaEventSystem
2016-06-02 19:29:30 -05:00
jonpas
95573ee711
Stringtable URL ( #3855 )
...
* Move url into stringtable to display it properly, Add some missing author and url entries
* Fix main
* Remove duplicate author
2016-06-01 23:45:51 +02:00
commy2
9d61dd6159
Merge pull request #3850 from acemod/fixCfgPatchesAuthor
...
Fix CfgPatches author/ is not a value
2016-06-01 14:24:17 +02:00
jonpas
1354826d56
Put semi-colon to the correct place
2016-06-01 14:11:32 +02:00
jonpas
1331265e65
Move url into a macro
2016-06-01 13:49:10 +02:00
jonpas
6730d016c2
Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility
2016-06-01 13:27:02 +02:00
jonpas
26fbc36cab
Merge branch 'master' into cbaEventSystem
2016-05-31 22:36:08 +02:00
PabstMirror
598c3dc181
Fix 1.60 UBC (slingloads)
2016-05-30 17:11:06 -05:00
commy2
7512c4e52e
manual merge
2016-05-30 21:14:34 +02:00
SilentSpike
207d6612da
Remove duplicate ACE_newEvents entries
2016-05-24 15:06:17 +01:00
SilentSpike
c4b75160a4
Run event renaming script
2016-05-24 14:13:11 +01:00
SilentSpike
108ff4f644
Replace ACE event system calls with CBA counterparts
...
Regex used:
\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent
E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event
E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01:00
jonpas
e7dbcd7b58
Replace delayed execution functions with new CBA counterparts
2016-05-22 15:29:01 +02:00
commy2
da70854568
manual merge
2016-05-18 11:48:27 +02:00
Rebel
8bd4afed6b
Drag and carry icons. ( #3676 )
2016-05-07 22:23:38 +02:00
BaerMitUmlaut
7fcbe93b71
Cleaned up excessive whitespace
2016-05-03 02:32:44 +02:00
jonpas
357045a0ed
Merge pull request #3518 from ColdEvul/CargoAndInteractionCase
...
Carry, drag and load metal and plastic cases
2016-04-03 11:43:11 +00:00
commy2
4ceb1b34b8
Merge pull request #3566 from acemod/removeDragCarryFromCannons
...
Disable drag and carry for StaticCannon
2016-03-08 19:05:04 +01:00
PabstMirror
1a77b0fcd4
Disable drag and carry for StaticCannon
...
#3528
2016-03-08 11:43:35 -06:00
Thomas Kooi
60af0d3162
Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR
...
Standardize GVAR array brackets in configs.
2016-03-08 18:19:50 +01:00
Nicolás Badano
1d3950bfff
Merge pull request #3497 from acemod/liteDrag
...
Fix portable light floating / dir when carrying
2016-03-05 22:07:43 -03:00
ColdEvul
80bada0365
Fixed carrying rotation.
2016-03-02 22:27:29 +01:00
jonpas
4918dbacb0
Replace and depreacate EFUNC(common,addScrollWheelEventHandler) with MouseZChanged Display EH
2016-03-02 17:33:46 +01:00
ColdEvul
b91897de3b
Added comment
2016-03-02 16:41:45 +01:00
ColdEvul
e7ec87d284
Added carry and interaction for case.
2016-03-02 16:38:23 +01:00
commy2
467075ad67
replace timePFH with CBA_missionTime
2016-03-02 11:01:39 +01:00
PabstMirror
8f620f2e61
Fix portable light floating / dir when carrying
...
#3486
2016-03-01 18:49:41 -06:00
commy2
fa3913752b
replace XEH_ENABLED macro with actual class, fix #3482 , fix #3483
2016-03-01 17:05:00 +01:00
VKing
8bb7b072d4
Standardize grammar of GVAR arrays in configs to place the square brackets outside the GVAR macro.
...
This prevents any possible confusion when the GVARs are used in code.
2016-02-28 15:18:15 +01:00
BlackWindowS
c61e7b5104
Tweaked & added translations
...
Translation of almost every STR to French
2016-02-28 14:48:04 +01:00
NorXAengell
ea461446f9
Translation Fr
2016-02-26 19:24:53 +01:00
esteldunedain
71707bc81a
Some spanish translations for 3.5.0
2016-02-25 10:54:19 -03:00
commy2
46a239f9f6
precompile on game start
2016-02-22 15:20:36 +01:00
ChairborneIT
0021bc08df
Added translation for most Italian stringtable entries
2016-02-20 21:39:05 +01:00
Thomas Kooi
27c6934ff2
Merge pull request #2230 from SzwedzikPL/interactions_lamps
...
Interaction with portable lamps
2016-02-20 16:47:28 +01:00
PabstMirror
ed653456e5
Merge pull request #3338 from acemod/translations156merge
...
Fix Merge Conflicts on More Italian Translations
2016-02-19 15:09:40 -06:00
PabstMirror
c456e1a631
Merge pull request #3214 from acemod/cba23
...
Changes for CBA 2.3
2016-02-17 15:33:42 -06:00
PabstMirror
dccc1d33fd
Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge
2016-02-17 12:30:03 -06:00
SzwedzikPL
388b00f58c
remove unnecessary code, aesthetic tweak
2016-02-10 01:38:14 +01:00
SzwedzikPL
5f0a2b1945
use event system, polish translation
2016-02-05 04:26:54 +01:00
SzwedzikPL
7b8be590b4
Merge branch 'acemod/master' into interactions_lamps
2016-02-05 01:43:06 +01:00
Thomas Kooi
a3f80dbc30
Merge pull request #3230 from acemod/draggingStuff
...
Fix dragging moving object to random location
2016-02-04 19:58:56 +01:00
ProfessorCZ
61611d0ec7
Czech Translation - Update
...
Update
2016-02-03 18:31:31 +01:00
PabstMirror
46d6e92bca
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
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
276aea04c1
Changes for CBA 2.3
2016-01-24 11:41:10 -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
commy2
3854a5c989
Merge pull request #3109 from acemod/ThingX
...
fix ThingX capitalization, fix #3076
2016-01-05 21:52:42 +01:00
commy2
427628045c
fix ThingX capitalization, fix #3076
2016-01-03 15:21:38 +01:00
Alessandro Foresi
2d152675fc
Add: IT small translations, DE removed duplicate
2016-01-03 13:02:01 +01:00
Glowbal
c1fa81f28b
Fix tabs in sqf files
2015-12-21 17:05:48 +01:00
PabstMirror
cae9f436f6
Merge branch 'release'
2015-12-08 15:14:33 -06:00
