PabstMirror
8fd0aef7d4
Medical - Fix Handle Damage
...
{} were unmatched so nothing ran.
I think this is just leftover from a merge.
2015-05-22 16:35:48 -05:00
PabstMirror
537bba1382
Medical - Fix Unconscious Condition
2015-05-22 13:56:45 -05:00
jaynus
582ea318d4
Merge remote-tracking branch 'origin/superTime'
...
Conflicts:
addons/frag/functions/fnc_fired.sqf
addons/frag/functions/fnc_trackFragRound.sqf
2015-05-22 07:24:55 -07:00
jaynus
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
PabstMirror
1aa9520adb
Fix Script Error when treating with bincos
2015-05-20 23:24:44 -05:00
Alessandro Foresi
67319b6808
Fixed: Removed § at the end of EH call
2015-05-20 22:04:19 +02:00
KoffeinFlummi
f16f282abd
Merge remote-tracking branch 'origin/release' into master-fix
...
Conflicts:
addons/medical/functions/fnc_handleDamage.sqf
extensions/common/p3d/animation.cpp
extensions/common/p3d/compressed.cpp
extensions/common/p3d/compressed.hpp
extensions/common/pbo/archive.cpp
extensions/common/pbo/search.cpp
extensions/common/pbo/search.hpp
extensions/common/shared.hpp
extensions/common/simplepipe_win32.cpp
extensions/common/simplepipe_win32.hpp
extensions/common/simulation/object.cpp
extensions/common/simulation/object.hpp
extensions/common/targetver.h
extensions/common/vector.hpp
2015-05-20 19:31:55 +02:00
PabstMirror
0d00894d9f
#1318 - isInMedicalVehicle - medicClass is number
2015-05-20 17:17:09 +02:00
Glowbal
694a24c970
Only change the color if bleeding (adv)
2015-05-20 17:15:25 +02:00
Glowbal
0a2679846c
Changed: morphine works 15 minutes
2015-05-20 17:15:24 +02:00
Glowbal
e8d169248f
Made atropine less effective
2015-05-20 17:15:23 +02:00
Glowbal
82260e5090
Changed: Made Morphine suppress more pain
2015-05-20 17:15:23 +02:00
Glowbal
2b1468db24
Added pain suppression instead of removal
2015-05-20 17:15:22 +02:00
Glowbal
429c85c9f1
fixed missing parameters for non local unit
2015-05-20 17:15:22 +02:00
Glowbal
913c938a9d
Added force unconscious parameter #1205
2015-05-20 17:15:21 +02:00
Glowbal
6439bf4e3a
Adjusted item mass #1226
2015-05-20 17:15:20 +02:00
Glowbal
808bb6d048
fixes #1195 units do not display injuries
...
Is caused because the system thinks medical is disabled for basic units, while this obviously is not the case.
2015-05-20 17:15:20 +02:00
Glowbal
104fcdc589
fixes #1155
2015-05-20 17:15:19 +02:00
PabstMirror
4d877196e4
Missing Parenthesissies
2015-05-19 00:36:54 -05:00
Glowbal
572b46a473
fix for #1297 Being near Campfires messes up basic medical and causes large fps lag
...
Should only do a max of 1 PFH at a time. If new damage is received before the PFH is completed, it will reset.
2015-05-19 07:23:44 +02:00
Glowbal
5b65d4117d
fixed wrong macro for addEventhandler
2015-05-18 23:02:46 +02:00
Glowbal
539ed2dc79
Fix debug message and prevent Instant death inside vehicles
2015-05-18 22:22:57 +02:00
Glowbal
771b62ed04
Fix medical vehicle return value
...
Could fix #1142
2015-05-18 21:33:35 +02:00
PabstMirror
c6991fde54
re-add brackets
2015-05-18 21:33:24 +02:00
Glowbal
2621c5a36c
fixed incorrect private var name
2015-05-18 21:33:12 +02:00
Glowbal
c76e22463a
consistent usage of brackets
2015-05-18 21:32:58 +02:00
PabstMirror
5a4ef610ec
Use PFEH array instead of setVariable
2015-05-18 21:32:47 +02:00
PabstMirror
2c3a5b0603
Start vital tracking after treatment
2015-05-18 21:32:22 +02:00
PabstMirror
f511de0a49
Calculate vitals interval on first run
2015-05-18 21:32:05 +02:00
Glowbal
853c654b4d
fixes #1195 units do not display injuries
...
Is caused because the system thinks medical is disabled for basic units, while this obviously is not the case.
2015-05-18 21:00:32 +02:00
Glowbal
fc99d07f7c
fixes #1155
2015-05-18 21:00:18 +02:00
jaynus
c17df2acb8
Change to execNextFrame.
2015-05-18 21:00:06 +02:00
jaynus
1c69f4faa4
Fixed: Litter spawning at huge radius, floating litter over water. Fixes #1112
2015-05-18 20:59:56 +02:00
ODK-Bn
13740d9f32
translated the missing strings into Russian
2015-05-17 13:25:08 +02:00
Glowbal
d9da4211f7
Merge branch 'master' into medicalExtension
2015-05-17 09:51:41 +02:00
Glowbal
2b91d398f0
added extension to config
2015-05-17 09:51:34 +02:00
Glowbal
556b9ad7d8
removed debug prints
2015-05-17 00:47:42 +02:00
Glowbal
4d8f24d2ae
Removed old sqf version.
2015-05-17 00:44:45 +02:00
Glowbal
1d7bfa239f
Temp added old sqf version for easy performance comparison
2015-05-17 00:08:34 +02:00
Glowbal
e3dd1eaf47
Using extension for handleDamage wounds instead of sqf
2015-05-16 23:21:03 +02:00
Glowbal
23a1bc86ca
Loading config data to extension
2015-05-16 23:20:38 +02:00
Glowbal
f02314e996
Merge pull request #1217 from acemod/medicalFixes2
...
Medical Vitals Fixes
2015-05-16 15:35:42 +02:00
PabstMirror
dabd11b9c5
MedicalStringtable - Fill missing languages
2015-05-15 16:01:39 -05:00
Grzegorz
1e552496d5
Missing strings
...
They need to be here otherwise few options are blank inside medical modules.
2015-05-15 19:23:49 +02:00
PabstMirror
1d64e5917f
re-add brackets
2015-05-15 02:32:19 -05:00
Glowbal
56aec85616
fixed incorrect private var name
2015-05-15 09:25:57 +02:00
Glowbal
4b245c0fc4
consistent usage of brackets
2015-05-15 09:25:00 +02:00
PabstMirror
39bc7d06be
Use PFEH array instead of setVariable
2015-05-15 02:15:03 -05:00
PabstMirror
8dbca1d3de
Start vital tracking after treatment
2015-05-14 22:18:53 -05:00
PabstMirror
8abd3c1fef
Calculate vitals interval on first run
2015-05-14 22:16:44 -05:00
Glowbal
d42d0ef69d
Merge pull request #1164 from acemod/litterFixes
...
Litter distribution fix and "floating litter over water" fix (medical)
2015-05-14 16:17:10 +02:00
jaynus
20bd5957e3
Change to execNextFrame.
2015-05-14 07:15:52 -07:00
Glowbal
abadf05342
Merge remote-tracking branch 'gienkov/module-translations'
...
Conflicts:
addons/medical/stringtable.xml
2015-05-14 16:01:41 +02:00
Ivan Navarro Cabello
43c5afac55
fixed some spanish translation
...
I fixed some spanish translation.
2015-05-14 14:32:35 +02:00
jaynus
b13d44fb6b
Fixed: Litter spawning at huge radius, floating litter over water. Fixes #1112
2015-05-13 17:29:09 -07:00
Glowbal
a4d0af4b67
Fix medical vehicle return value
...
Could fix #1142
2015-05-13 15:55:03 +02:00
GieNkoV
1610221a70
Remove duplicated strings
2015-05-12 20:01:10 +02:00
GieNkoV
bc72c71e8e
Fix small errors inside stringtables
2015-05-12 19:11:56 +02:00
Grzegorz Sikora
44466e8be8
Remove tabs and repair errors @Glowbal found
...
Conflicts:
addons/map/CfgVehicles.hpp
addons/medical/CfgVehicles.hpp
Conflicts:
addons/map/CfgVehicles.hpp
addons/medical/CfgVehicles.hpp
addons/optionsmenu/stringtable.xml
2015-05-12 18:27:27 +02:00
Grzegorz Sikora
156bba3321
Yes/No to BOOL
...
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/hearing/CfgVehicles.hpp
addons/hearing/stringtable.xml
addons/interaction/stringtable.xml
addons/map/CfgVehicles.hpp
addons/map/stringtable.xml
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
addons/switchunits/CfgVehicles.hpp
addons/switchunits/stringtable.xml
Conflicts:
addons/common/CfgVehicles.hpp
addons/common/stringtable.xml
addons/explosives/stringtable.xml
addons/hearing/stringtable.xml
addons/interaction/stringtable.xml
addons/map/CfgVehicles.hpp
addons/map/stringtable.xml
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
addons/nametags/stringtable.xml
addons/respawn/stringtable.xml
addons/switchunits/CfgVehicles.hpp
addons/switchunits/stringtable.xml
2015-05-12 18:26:24 +02:00
Grzegorz Sikora
6a821715a0
Stringtable modules
...
Conflicts:
addons/missionmodules/CfgVehicles.hpp
addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02:00
Glowbal
e6a8f0b295
Merge pull request #1103 from SilentSpike/medical_typofix
...
Trivial variable name fix for moduleAssignMedicalVehicle function
2015-05-10 22:37:54 +02:00
SilentSpike
eff5ce03d6
false -> 0
2015-05-10 20:58:17 +01:00
SilentSpike
518cfdab9e
isMedic -> medicClass
2015-05-10 20:19:32 +01:00
SilentSpike
d321ed2753
Changed function variable to match other medical vehicle functions
2015-05-10 19:56:35 +01:00
Alessandro Foresi
2dd06babec
Added: Italian translations completed.
...
Fixed: BOM markers where missing
2015-05-10 11:44:46 +02:00
Alessandro Foresi
643df71932
Added: Italian translation from Blackedsoul p#20
2015-05-10 11:05:16 +02:00
Glowbal
e674229dde
enabledFor > enableFor
2015-05-08 20:10:40 +02:00
Josuan Albin
dd2ea99d15
pak
...
pak anim
2015-05-05 19:26:11 +02:00
Josuan Albin
f063e45e60
medical advanced added
...
animations added for advanced
2015-05-05 19:04:08 +02:00
Josuan Albin
b781264212
New anim update
...
new healing animation added to animationCaller, animationCallerSelf
stays the same
2015-05-05 18:53:17 +02:00
bux578
bd69405cf4
fix czech typo in medical, fix #1010
2015-05-05 08:37:41 +02:00
Glowbal
f6e815fbaf
Merge pull request #1003 from acemod/fixMedicalLitterError
...
Fix treatment script error
2015-05-04 00:25:46 +02:00
Glowbal
ae47c78552
Make treatment execute before createLitter
2015-05-04 00:20:28 +02:00
Glowbal
b86012a6b1
Ensure that litterCondition is always code #1000
2015-05-04 00:16:12 +02:00
ProfessorCZ
a0e443cfc6
Czech translation - Update
2015-05-03 11:48:56 +02:00
KoffeinFlummi
e918e1d661
Merge https://github.com/ruPaladin/ACE3 into russian-merge
...
Conflicts:
addons/interaction/stringtable.xml
addons/medical/stringtable.xml
2015-05-02 23:43:33 +02:00
KoffeinFlummi
d0c7fce7f3
Merge https://github.com/adam3adam/ACE3 into czech-merge
...
Conflicts:
addons/interaction/stringtable.xml
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
2015-05-02 23:29:45 +02:00
KoffeinFlummi
298e1d88bd
Merge branch 'hu-catchup' of https://github.com/Harakhti/ACE3 into hungarian-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/laser/stringtable.xml
addons/medical/stringtable.xml
addons/respawn/stringtable.xml
2015-05-02 23:17:39 +02:00
Harakhti
6c2717be7f
More more translations
...
Stope.
2015-05-02 18:06:01 +02:00
adam3adam
05a6389acd
Czech translation v2
...
mk6mortar and some medical translation
2015-05-02 12:46:28 +02:00
ruPaladin
3aad0904cd
medical2
2015-05-02 12:45:27 +03:00
ruPaladin
ca03637a54
medical
2015-05-02 12:42:02 +03:00
ToasterBR
021b00c722
Translation to Portuguese
...
Done all remaining portuguese translations, including some minor
corrections
2015-05-02 03:38:53 -03:00
PabstMirror
436e50411a
Medical - Fix Uncon PFEH argument changes
2015-05-01 22:42:43 -05:00
Felix Wiegand
07ec7b96c4
Merge pull request #954 from acemod/medicalFixVehAnimation
...
Medical fix veh animation
2015-05-02 00:35:13 +02:00
KoffeinFlummi
f1ba0cff26
Merge https://github.com/ProfessorCZ/ACE3 into czech-merge
...
Conflicts:
AUTHORS.txt
addons/advanced_ballistics/stringtable.xml
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/kestrel4500/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/respawn/stringtable.xml
2015-05-02 00:26:25 +02:00
KoffeinFlummi
13b99ed53f
Merge https://github.com/adam3adam/ACE3 into czech-merge
...
Conflicts:
AUTHORS.txt
addons/interact_menu/stringtable.xml
2015-05-02 00:17:01 +02:00
Lukas
1d3f5cc312
Czceh translation
2015-05-02 00:04:50 +02:00
FreeZbe
d1da3a82d7
French : update / fix stringtable
2015-05-01 23:08:36 +02:00
KoffeinFlummi
cc627b4a92
Merge branch 'master' of https://github.com/acemod/ACE3
2015-05-01 22:50:11 +02:00
Dimaslg
339cd8febd
Add spanish translation for removing tournis
2015-05-01 22:49:52 +02:00
Glowbal
937b20f551
Merge branch 'master' of github.com:acemod/ACE3
2015-05-01 22:49:24 +02:00
Glowbal
09a0158fa4
This should not be 1
2015-05-01 22:49:13 +02:00
KoffeinFlummi
a002c796da
Merge branch 'patch-9' of https://github.com/gienkov/ACE3 into polish-merge
...
Conflicts:
addons/medical/stringtable.xml
2015-05-01 22:46:49 +02:00
KoffeinFlummi
d8299332e4
Merge branch 'master' of https://github.com/acemod/ACE3
...
Conflicts:
addons/respawn/stringtable.xml
2015-05-01 22:44:42 +02:00
KoffeinFlummi
fb807cbb86
Merge branch 'master' into spanish-merge
...
Conflicts:
addons/interact_menu/stringtable.xml
addons/respawn/stringtable.xml
2015-05-01 22:44:10 +02:00
Dimaslg
6f2caec6ec
Last touches to Spanish translation
2015-05-01 22:42:09 +02:00
bux578
1a946acc30
German Translation / Typo
2015-05-01 22:33:26 +02:00
Grzegorz
8828704e76
PL translation
...
STR_ACE_Medical_RemovingTourniquet
2015-05-01 22:32:53 +02:00
Glowbal
e8ccddfc2c
Added missing progress bar display text
2015-05-01 22:29:52 +02:00
adam3adam
f5303d455c
Translation of some stuff into czech language
...
adv. ballistics, atragmx, interaction menu, kestrel4500, laser pointer
and little part of medical
2015-05-01 22:23:03 +02:00
PabstMirror
bded34fa23
I suck at git
...
redo reverted stuff here
2015-05-01 15:03:05 -05:00
Glowbal
722c459c1e
added APL pbo
2015-05-01 19:37:17 +02:00
Glowbal
80162627ec
Fixed spelling of enableUnconsciousnessAI
2015-05-01 18:49:59 +02:00
ruPaladin
a883517a5e
Update stringtable.xml
2015-05-01 19:18:06 +03:00
KoffeinFlummi
30e90a377e
Fix duplicate entries
2015-05-01 17:51:31 +02:00
KoffeinFlummi
48e59f0d71
Merge branch 'master' of https://github.com/acemod/ACE3
...
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
2015-05-01 17:46:58 +02:00
KoffeinFlummi
1e786d4a92
Merge https://github.com/FreeZbe/ACE3 into french-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
2015-05-01 17:45:00 +02:00
KoffeinFlummi
e46eba673f
Merge branch 'master' into german-translation
...
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
2015-05-01 17:36:40 +02:00
KoffeinFlummi
954e4ef549
Merge branch 'master' of https://github.com/acemod/ACE3
...
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
2015-05-01 17:32:19 +02:00
KoffeinFlummi
e96f23c197
Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge
...
Conflicts:
addons/atragmx/stringtable.xml
addons/interact_menu/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
addons/realisticnames/stringtable.xml
addons/respawn/stringtable.xml
2015-05-01 17:30:59 +02:00
Felix Wiegand
526b0a2d59
Merge pull request #931 from gienkov/master
...
PL translation
2015-05-01 17:15:22 +02:00
KoffeinFlummi
5f60321a69
Merge https://github.com/Legolasindar/ACE3 into spanish-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
2015-05-01 17:12:00 +02: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
bux578
bfb68fe368
fix spelling errors
2015-05-01 14:19:30 +02:00
FreeZbe
80ae016021
Update stringtable.xml
2015-05-01 14:19:15 +02:00
Glowbal
e9a86da8e0
Should be in same order as the module
2015-05-01 12:18:21 +02:00
bux578
aa2e5077e4
missing german translation
2015-05-01 12:17:28 +02:00
Glowbal
5beca63ae2
Added missing private
2015-05-01 11:51:23 +02:00
KoffeinFlummi
e06e1a2f89
Make preventDeath work
2015-05-01 01:38:36 +02:00
KoffeinFlummi
cb82b20464
Let setUncon handle AI unconsciousness
2015-05-01 01:38:16 +02:00
KoffeinFlummi
48770f77d2
Rename caching variables in basic HD
2015-05-01 01:37:58 +02:00
KoffeinFlummi
67bd2b4e2f
Reduce animation forcing delay
2015-05-01 01:36:09 +02:00
KoffeinFlummi
98e44e86d8
Offload ejecting to unloadPerson
2015-05-01 01:35:50 +02:00
KoffeinFlummi
f7f416c8d3
Proper privates and alignment
2015-05-01 01:34:38 +02:00
KoffeinFlummi
aa9f1c53c7
Whoops
2015-05-01 01:34:18 +02:00
KoffeinFlummi
53835605ea
Merge remote-tracking branch 'origin/master' into basic-med-options
...
Conflicts:
addons/medical/functions/fnc_getBloodLoss.sqf
addons/medical/functions/fnc_handleDamage_basic.sqf
2015-05-01 01:25:16 +02:00
Grzegorz
3f932c0a93
Update stringtable.xml
2015-04-30 22:55:51 +02:00
Grzegorz Sikora
03973f3dcf
PL translation
2015-04-30 22:54:15 +02:00
KoffeinFlummi
d59436c588
Only force animation when necessary
2015-04-30 22:19:31 +02:00
KoffeinFlummi
8fda984903
Fix missing semicolon
2015-04-30 22:17:25 +02:00
KoffeinFlummi
965a976daf
Reorganize AI unconsciousness
2015-04-30 22:16:45 +02:00
KoffeinFlummi
f28a806938
Remove max unconsciousness time again
2015-04-30 22:15:40 +02:00
KoffeinFlummi
270c3adc1e
Do it again, but properly this time
2015-04-30 22:06:10 +02:00
KoffeinFlummi
85669a9e92
Convert Medical stringtable key names to lowercase
2015-04-30 22:01:09 +02:00
Glowbal
e7290feaa2
disabled radial option, so it isn't server selectable either
2015-04-30 21:20:04 +02:00
Glowbal
2f763a2310
Disabled client setting for menu style
2015-04-30 21:17:33 +02:00
Glowbal
1bee48214e
Merge branch 'master' into medicalMenuClientSetting
...
Conflicts:
addons/medical/ACE_Medical_Actions.hpp
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
2015-04-30 21:08:46 +02:00
Glowbal
432a0102e8
Improved unloadPerson function
...
Removed caller parameter.
2015-04-30 20:44:43 +02:00
KoffeinFlummi
fd152c580b
Merge branch 'master' into basic-med-options
...
Conflicts:
addons/medical/ACE_Settings.hpp
addons/medical/functions/fnc_setUnconscious.sqf
2015-04-30 18:39:33 +02:00
PabstMirror
9c02f915ec
Merge pull request #922 from acemod/medicalPrivates
...
Medical Private Variables
2015-04-30 11:34:33 -05:00
ulteq
ac33ad109f
Merge pull request #923 from Bla1337/master
...
Localization update (Russian)
2015-04-30 13:44:54 +02:00
Harakhti
4e165e2572
Update Hungarian translations
...
Let us match the current revision. At the time of making, the Ballistics
XML was broken.
2015-04-30 13:25:25 +02:00
ulteq
2c97b20781
Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master
...
Conflicts:
addons/atragmx/stringtable.xml
addons/ballistics/stringtable.xml
addons/medical/stringtable.xml
addons/missileguidance/stringtable.xml
addons/overheating/stringtable.xml
addons/realisticnames/stringtable.xml
addons/vehiclelock/stringtable.xml
2015-04-30 13:20:31 +02:00
Bla1337
5d1478b733
interact and medical system localization upd
2015-04-30 14:01:22 +03:00
PabstMirror
48f7455ef1
Opps2
2015-04-30 01:23:23 -05:00
PabstMirror
d71bba0359
opps
2015-04-30 01:21:41 -05:00
PabstMirror
eb5af0cd89
Medical Private Variables
2015-04-30 01:17:26 -05:00
PabstMirror
f90834eeab
Unused
2015-04-29 16:57:24 -05:00
PabstMirror
5fef446c00
EFUNC for dragging calls
2015-04-29 16:53:09 -05:00
PabstMirror
a39e869728
Fix extra {} wraped
...
Error position: <if ({[_unit] call ace_medical_fnc_setDea>
Error if: Type code, expected Bool
File z\ace\addons\medical\functions\fnc_handleDamage.sqf, line 50
2015-04-29 16:44:47 -05:00
Glowbal
581c64f66f
Implemented unloading from vehicles #740
2015-04-29 23:12:47 +02:00
Glowbal
943d2cbd72
Merge branch 'master' into medicalImprovements
2015-04-29 23:01:38 +02:00
Glowbal
aaa8171457
Implemented prevent instant death #839
2015-04-29 22:54:58 +02:00
Glowbal
614a93ef12
fixes #838
2015-04-29 22:04:46 +02:00
Glowbal
87465b8b10
fixes #829
2015-04-29 21:49:24 +02:00
Dimaslg
f8d5c423ae
Merge conflicts resolved
2015-04-29 21:15:22 +02:00
NukeDev
73772d9de1
Other Fixes
2015-04-29 16:44:42 +02: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
Legolasindar
1c8137a7e5
fixed spanish translate for opened pull #893
...
fixed spanish translate for opened pull #893
2015-04-29 12:46:32 +02:00
Bla1337
cfbf3bd053
Localization update
2015-04-29 11:20:21 +03:00
PabstMirror
3eb2bdfc84
Display Name Progress Text
2015-04-28 21:17:29 -05:00
Glowbal
a854b90b00
Increased level at which a lot of blood message gets shown in basic medical
2015-04-28 22:19:30 +02:00
Dimaslg
956b5e3558
Spanish Translation
...
Minor fixes and some things at the Medical system translated.
2015-04-28 21:01:48 +02:00
Glowbal
f606c24854
fixes #901
2015-04-28 20:47:11 +02:00
Glowbal
dbf748ba93
Merge branch 'master' into medicalImprovements
2015-04-28 20:33:39 +02:00
Glowbal
c06caa7209
Only add JIP event for player clients
2015-04-28 20:33:01 +02:00
Glowbal
ebbb88deff
Join in progress players will now be initialized
2015-04-28 20:32:29 +02:00
Glowbal
95d83554da
Added local treatment through remoteExec for basic
2015-04-28 20:32:02 +02:00
Glowbal
c38fe384e3
added default values for getvar's
2015-04-28 19:30:35 +02:00
ulteq
2a759aba70
Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master
...
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
2015-04-28 18:55:23 +02:00
ulteq
236fc10a0f
Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master
...
Conflicts:
addons/medical/stringtable.xml
2015-04-28 18:15:05 +02:00
NukeDev
db82df6214
Italian's Translation's Changes v2
2015-04-28 18:10:35 +02:00
Grzegorz
b88618563d
Update stringtable.xml
2015-04-28 18:05:27 +02:00
Grzegorz Sikora
bcda77c5c7
PL translation
2015-04-28 18:03:35 +02: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
ulteq
dc09c554c0
Merge branch 'master' of https://github.com/gienkov/ACE3 into gienkov-master
...
Conflicts:
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
2015-04-28 17:44:58 +02:00
Ivan Navarro Cabello
8a55c69cd7
added spanish translation
...
added spanish translation
2015-04-28 17:03:49 +02:00
simon84
8ac6f61fcf
added some translations
...
added some translations
2015-04-28 00:36:37 +02:00
ruPaladin
59aba3fb34
Update stringtable.xml
2015-04-27 19:33:22 +03:00
Glowbal
450e324f7b
adjusted damage handling (adv medical)
2015-04-27 16:42:12 +02:00
Glowbal
e4db44d73c
adjusted damage parsing
2015-04-27 16:36:00 +02:00
Glowbal
b520a1072b
Merge branch 'master' into medicalImprovements
2015-04-27 15:41:20 +02:00
Grzegorz
78329110a1
Update stringtable.xml
2015-04-26 23:01:18 +02:00
Grzegorz Sikora
a272258500
PL translation
2015-04-26 22:59:20 +02:00
KoffeinFlummi
365f1e025b
Merge remote-tracking branch 'origin/GermanMedicalTranslation' into german-merge
...
Conflicts:
addons/medical/stringtable.xml
2015-04-26 22:04:39 +02:00
KoffeinFlummi
b472292b20
Remove tabler comments.
...
sed is awesome.
2015-04-26 21:05:41 +02:00
KoffeinFlummi
1bb8628109
Merge https://github.com/simon84/ACE3 into german-merge
2015-04-26 21:00:22 +02:00
commy2
6aea424f6d
Merge pull request #872 from acemod/muteuncon
...
mute unconsious units
2015-04-26 17:40:51 +02:00
commy2
7319a3dbc6
remove obsolete config entries
2015-04-26 17:38:48 +02:00
commy2
31ae05dd6e
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
2015-04-26 17:26:16 +02:00
commy2
90f1d1f3fa
those damn mine detectors, also fix advanced medical box not showing up in zeus
2015-04-26 17:25:56 +02:00
commy2
8976b6983d
mute unconsious units
2015-04-26 16:47:36 +02:00
bux578
6cc4f48eb2
Uppercase Injuries
2015-04-26 14:19:28 +02:00
bux578
b3c461b9da
last few translations
2015-04-26 14:02:14 +02:00
bux578
b2dd065429
remove comment
2015-04-26 12:27:06 +02:00
Glowbal
b266734f6e
Merge branch 'master' into medicalImprovements
2015-04-26 11:20:04 +02:00
Glowbal
fc08ebb0a5
added "isNotInside" exception to unload
2015-04-26 11:19:25 +02:00
bux578
dec47dade8
ups, remove test code
2015-04-26 09:38:56 +02:00
