PabstMirror
3fbd6cff18
Merge pull request #3368 from acemod/fixNils
...
Fix some undefined functions / strings
2016-02-20 19:49:07 -06:00
Glowbal
ea113b8e61
Fix duplicate {
2016-02-21 01:04:12 +01:00
Glowbal
7d063d4dee
Merge branch 'master' into medical-focus-feature
...
Conflicts:
addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
2016-02-21 00:37:30 +01:00
PabstMirror
8b932fd5a0
Fix some undefined functions / strings
2016-02-20 16:58:45 -06:00
ChairborneIT
0021bc08df
Added translation for most Italian stringtable entries
2016-02-20 21:39:05 +01:00
Thomas Kooi
2930fab6c6
Merge pull request #3354 from acemod/playerBodybags
...
Fix bagging respawning players (alt)
2016-02-20 17:26:07 +01:00
Thomas Kooi
4f10d551d6
Merge pull request #2949 from gienkov/fixWoundCount
...
ceil number of wounds
2016-02-20 16:56:17 +01:00
PabstMirror
fc3bb0de6b
Fix #3355 - add missing semi-colons
2016-02-19 18:51:25 -06:00
PabstMirror
dffcbc7650
Cleanup events
2016-02-19 15:45:37 -06:00
PabstMirror
44b526ab6d
bodybag - hide player corpse and delete later
...
Fix #1301
2016-02-19 15:41:13 -06: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
Grzegorz
95250c8ecd
medical PL translation
...
3.5.0 ready
2016-02-19 19:10:59 +01:00
Thomas Kooi
95532ea521
Merge pull request #3333 from acemod/medicalEvents
...
Replace execRemoteFnc in ace_medical
2016-02-19 12:00:00 +01:00
commy2
5d0d8576ea
Merge pull request #3288 from SzwedzikPL/edenassignsettings
...
Repair & medical object attributes for eden editor
2016-02-19 11:47:26 +01:00
commy2
be8f7f9cc0
Merge pull request #3276 from acemod/156selectapply
...
replace filter and map with select and apply
2016-02-18 14:23:02 +01:00
esteldunedain
88eae19646
Replace execRemoteFnc in ace_medical
2016-02-17 22:54:43 -03:00
PabstMirror
be742c13cd
Merge branch 'master' into 155selectRandom
2016-02-17 15:58:19 -06:00
PabstMirror
dccc1d33fd
Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge
2016-02-17 12:30:03 -06:00
Thomas Kooi
26cb6bd6a3
Merge pull request #3326 from acemod/makeAdvMedicalWoundsConsistant
...
Make wound assignment consistent for dll/sqf
2016-02-17 18:34:28 +01:00
PabstMirror
40396fc69e
Remove debug
2016-02-17 09:37:08 -06:00
PabstMirror
f1797feead
Make wound assignment consistent for dll/sqf
...
Dll now exits on first match for threshold damage (exitWith)
Remove random wound in sqf to match dll
Fix backblast threshold order
Add lower vehiclecrash threshold
Add dll version logging
2016-02-16 12:19:18 -06:00
PabstMirror
5c9dfd7dc5
Handle enemy causing veh explode, fix revive unload
...
Fix #3269
2016-02-15 22:23:37 -06:00
PabstMirror
9441b548be
Fix vehicle crashes not being fatal to non-drivers
...
Fix #3306
2016-02-15 17:11:04 -06:00
Glowbal
ff86359247
Merge branch 'master' into medical-focus-feature
2016-02-13 19:51:45 +01:00
Ivan Krouglyi
0a226b5ee9
Update fnc_treatment_success.sqf
...
Error at 84 line - you forget ";"
2016-02-13 03:29:42 +03:00
PabstMirror
ff4ba98e68
Pre-load again on mission load (save game)
2016-02-10 11:50:30 -06:00
commy2
82086efca0
manual merge
2016-02-10 10:11:33 +01:00
PabstMirror
e1b83b8172
Manually pre-load for StaticWeapons and Car
...
Fix #3168
2016-02-09 22:43:38 -06:00
SzwedzikPL
0c80551fd8
ace attribute category, lower case classes
2016-02-10 01:17:18 +01:00
SzwedzikPL
94ea26c7b9
typo fix
2016-02-08 00:14:55 +01:00
SzwedzikPL
3bfac35b65
ace repair and medical attributes
2016-02-07 23:56:45 +01:00
Glowbal
e754c89c73
Remove non functional event driven handleDamage
2016-02-07 13:18:19 +01:00
Glowbal
575f362fb6
Add setting for limiting usage of Epinephrine in basic medical #1792
...
Part of focus feature medical #3134 . Default settings are inline with old default.
2016-02-07 13:10:38 +01:00
Glowbal
bfd90cd5d3
Add Adenosine to replace atropine #1573
2016-02-07 12:54:23 +01:00
Glowbal
39cf11367f
improve medical bandage configuration
2016-02-07 12:37:00 +01:00
Glowbal
84878c3d8b
Merge branch 'master' into medical-focus-feature
2016-02-07 12:11:25 +01:00
commy2
ac007e6995
replace more map with apply
2016-02-06 12:08:04 +01:00
PabstMirror
35333cbe9d
Merge branch 'cargoCleanup'
2016-02-04 12:51:52 -06:00
Thomas Kooi
69746a133b
Merge pull request #3254 from ProfessorCZ/master
...
Czech Translation - Update
2016-02-04 19:36:28 +01:00
PabstMirror
336184dfaa
Change medication removal from array
2016-02-04 10:00:33 -06:00
PabstMirror
3cc10a27ce
Tourniquets block medication until released
...
Close #2704
2016-02-03 14:40:26 -06: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
c0eccc67c3
Change all SCALAR to NUMBER in headers
2016-01-28 18:19:15 -06:00
PabstMirror
17a882fe4d
Add findUnloadPosition integration
2016-01-26 18:01:01 -06:00
Glowbal
34613b42f2
Increase heart rate increase speed #3134
2016-01-20 11:49:10 +01:00
PabstMirror
04bccf47d7
Replace all use of deprecated commands
2016-01-19 09:39:07 -06:00
Glowbal
86158ac45b
Stage improvements bandage effectiveness
2016-01-17 14:09:22 +01:00
Glowbal
7de1a7bc6c
add initial implementation of drowning and collision damage handling
2016-01-17 13:21:18 +01:00
Glowbal
209d10065b
Fix missing event log entries #3134
2016-01-17 12:28:37 +01:00
