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
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
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
f98b268419
Split setUnconscious func, add spontaneousWakeUpChance setting ( #5114 )
2017-06-05 11:42:46 -05:00
Andrea Verano
e3fd1612e2
Italian translation (Add & Fix) ( #5193 )
...
Added Italian translation for:
-advanced fatigue
-advanced throwing
-cook off
-dogtags
-gunbag
-ui-scopes and much more...
Fixed a lot of grammatical errors
2017-05-23 13:44:17 -05:00
PabstMirror
b8a6a602f3
Disable g-forces for UAV AI ( #5094 )
2017-05-12 13:12:17 -05:00
PabstMirror
d313d53b02
Fix gforce avg on switching to aircraft ( #4955 )
...
* Fix gforce avg on switching to aircraft
* Dont use for-loop for neutral g-forces array
2017-03-09 16:49:50 -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
PabstMirror
a3c50a6c76
Add dev macro to quickly recompile functions ( #4699 )
2016-11-23 13:35:25 -06: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
KoffeinFlummi
72899643bd
Merge branch 'master' into japanesestringtables
2016-09-27 20:54:17 +02:00
Grzegorz
a63dcb49d0
PL Translation 3.7.1 ( #4395 )
...
* translate advanced fatigue
* translate advanced throwing
* translate cargo
* translate chemlights
* translate cookoff
* translate explosives
* translate fastroping
* translate gforce
* translate googles
* translate grenades
* translate gunbag
* translate maptools
* translate medical
* translate medical_ai
* translate minedetector
* translate nametags
* translate overheating
* translate repair
* translate tagging
* translate ui
* translate zeus
2016-09-18 22:00:13 +02:00
classicarma
3605778d60
translate gforces
2016-09-17 01:46:19 +09:00
[OMCB]kaban
8fc2cbd0ef
Russian Translations - Update ( #4217 )
2016-08-13 11:25:43 +02:00
commy2
89ecc81111
convert common events to CBA playerEvents
2016-06-22 01:39:20 +02:00
commy2
bf098ec70e
fix some rogue mission dependencies, fix #3954
2016-06-20 21:07:10 +02:00
commy2
3fdc0dd521
Merge pull request #3955 from acemod/add_name
...
add 'name' to components
2016-06-20 19:25:58 +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
Josuan Albin
d26f133733
Add missing french entries in stringtables and update older ones
...
Take changes from #3480 and completed empty entries
2016-06-19 01:18:12 +02:00
jonpas
03e923aa68
Cleanup Function Headers titles
2016-06-18 11:50:41 +02:00
Glowbal
8c9b31b1c7
Merge pull request #3815 from acemod/cbaEventSystem
...
Deprecate ACE events framework
2016-06-09 14:20:26 +02:00
Jonathan Pereira
b64b7e431e
Translated remaining strings
2016-06-03 23:11:40 -03:00
SilentSpike
9e4fd77745
Update common event names to meet new standard
2016-06-03 22:39:43 +01: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
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
commy2
7512c4e52e
manual merge
2016-05-30 21:14:34 +02:00
PabstMirror
3163b53710
gforces - Fix missing ace_settings.hpp include ( #3837 )
2016-05-29 11:54:44 -05:00
jonpas
b54d1985f1
QGVAR and fix gforces, goggles, grenades, hearing, interact_menu
2016-05-25 01:57:41 +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
commy2
da70854568
manual merge
2016-05-18 11:48:27 +02:00
ProfessorCZ
7d0fcde9fa
CZ Translate - Update
...
04/30/2016
2016-04-30 00:57:24 +02:00
PabstMirror
3adbb59f04
Geforce - Change default to aircraft only
2016-04-19 23:04:51 -05:00
PabstMirror
236ad912af
Gforces - Add ace_setting to only run in aircraft
2016-04-19 12:59:41 -05:00
commy2
467075ad67
replace timePFH with CBA_missionTime
2016-03-02 11:01:39 +01:00
commy2
46a239f9f6
precompile on game start
2016-02-22 15:20:36 +01:00
PabstMirror
46d6e92bca
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
esteldunedain
f599542b8e
gforces cleanup. Close #2130
2016-01-19 00:18:01 -03:00
VKing
069169cc72
Changed ACE_time back to time in comments where appropriate
2015-10-21 22:52:21 +02:00
PabstMirror
5f0d73bab6
Cleanup more stuff
2015-09-18 14:24:20 -05:00
jokoho48
b7e02da1cc
remove if (!hasInterface) from PFH
...
move ! in ()
2015-09-11 16:58:26 +02:00
jokoho48
defbdf1b1a
fix that HC throw a issue if PPEffect was used/applyed
2015-09-09 17:05:48 +02:00
jaynus
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
Kavinsky
8e9b35c757
Fixed Capitalized folders on include paths
2015-05-20 23:28:10 +02:00
PabstMirror
00f26144ec
More Privates
2015-04-17 15:45:00 -05:00
jaynus
1bb6be5654
Cleaning up of all tabs in source code files.
2015-04-06 09:22:43 -07:00
Glowbal
c6c04442c1
GForces now uses correct unconscious function
2015-04-02 22:54:39 +02:00
Nicolás Badano
5e79970740
Switching nicknames
2015-03-24 01:18:00 -03:00
PabstMirror
8a9ac4147f
Update $PBOPREFIX$
...
Only getting error on server, not client
`Warning Message: Script z\ace\addons\gforces\XEH_preInit.sqf not found`
2015-03-21 12:14:38 -05:00
Nicolás Badano
a2b1cf1259
g-forces: updated headers
2015-02-08 19:58:41 -03:00
PabstMirror
01ee35d6c5
Geforces: Fix "Error Zero divisor"
...
Adds some simple checks before dividing.
Before dropping uniform or playing as a dog would throw script error.
2015-02-01 13:09:17 -06:00
PabstMirror
9631154926
Set ADDON variable in XEH_preInit
2015-01-29 01:38:46 -06:00
Nicolás Badano
d42be7b5f8
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-01-27 19:26:32 -03:00
Nicolás Badano
60fa6dfbe6
gforces: fixed prefix for config entries
2015-01-27 19:25:37 -03:00
Felix Wiegand
0f027e7e09
Create README.md
2015-01-26 13:56:37 +01:00
Nicolás Badano
3fa6f1b0c9
gforces: fix for when there's no player
2015-01-17 15:18:11 -03:00
Nicolás Badano
402156aecf
gforces: renamed function
2015-01-17 01:09:12 -03:00
Nicolás Badano
e61b828314
gforces: moved stuff out of config.cpp
2015-01-17 01:01:56 -03:00
Nicolás Badano
43b87cda0b
gforces: tweaked based on pilot feedback ( https://github.com/KoffeinFlummi/AGM/issues/1774#issuecomment-70341573 )
2015-01-17 00:59:45 -03:00
Nicolás Badano
f594198eae
gforces: port from AGM
2015-01-16 23:01:41 -03:00
