Commit Graph

13210 Commits

Author SHA1 Message Date
Zakant
1fb6521021 Added checkItem on loadout change (#5021) 2017-03-25 11:08:47 -05:00
PabstMirror
169df1ed3b Merge branch 'master' into medical-rewrite
Conflicts:
	addons/medical/stringtable.xml
2017-03-25 11:03:50 -05:00
11RDP-LoupVert
fc860e7b43 French loc improvement (#5017)
* French loc improvement

(French) text as it is clutters the interface interface, making it
uneasy for medic to use the it smoothly.
https://i.gyazo.com/8d7a5bb2f15dd1332cec36f2eef510c8.png

Hopefully suggested changes fixes that.

There were a few typos and, in my opinion, unaccurate or missing
translation.
Based on French Army Field Manual, actual paramedical personnel and past
work on XMedSys.

* Pull 5017 with spaces instead of tabs

https://github.com/acemod/ACE3/pull/5017

* Fixes a minor typo

Selectioner -> Sélectionner

* Duplicate entry (French)

Removes a duplicate entry, didn't saw first time
2017-03-25 10:52:37 -05:00
PabstMirror
d47ea1d25a Merge pull request #4754 from acemod/medical-rewrite-effects
Medical Rewrite - Post Process Effects
2017-03-25 10:50:48 -05:00
Laid3acK
3291059621 Wiki scope updated (#5028)
* Update scopes.md

* Update scopes.md

* Update scopes.md

* Add files via upload

* Update scopes.md

* fix links and `alt` texts
2017-03-25 10:49:46 -05:00
Laid3acK
10168e9e90 Wiki Kestrel 4500 updated (#5027)
* Update kestrel4500.md

* Update kestrel4500.md

* Update kestrel4500.md

* Update kestrel4500.md

* Update kestrel4500.md

* Update kestrel4500.md

* Update kestrel4500.md

* fix links and `alt` texts
2017-03-25 10:49:14 -05:00
Laid3acK
24fd37c9a6 Wiki Advanced Ballistics updated (#5030)
* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Update advanced-ballistics.md

* Add files via upload

* Update advanced-ballistics.md

* fix links and `alt` texts
2017-03-25 10:48:35 -05:00
Laid3acK
b5030d90b7 Wiki range card updated (#5029)
* Update rangecard.md

* Update rangecard.md

* Update rangecard.md

* Add files via upload

* Update rangecard.md

* fix links and `alt` texts
2017-03-25 10:47:11 -05:00
11RDP-LoupVert
fcd57a9492 Duplicate French entry (#5032)
Removes a duplicate French entry, didn't saw it :/
2017-03-25 10:46:23 -05:00
Laid3acK
a58a39f35a fix links and alt texts 2017-03-25 12:44:38 +01:00
Laid3acK
04926173db Update atragmx.md 2017-03-25 09:09:35 +01:00
Laid3acK
70502e609b Add files via upload 2017-03-24 14:23:13 +01:00
Laid3acK
462a11d92a Update atragmx.md 2017-03-24 14:09:43 +01:00
Zakant
466bdce9e4 Removing point 2017-03-23 18:45:46 +01:00
Zakant
14e146cbeb Added missing dot 2017-03-23 18:44:45 +01:00
Zakant
7bd2725f29 Fixed space after if 2017-03-23 18:40:18 +01:00
Zakant
f8a2d404e2 Fixed more typos 2017-03-23 18:17:38 +01:00
Zakant
b5a48bb4dc Fixed newline after include 2017-03-23 17:32:03 +01:00
Zakant
ff823e0590 Fixed space 2017-03-23 17:27:53 +01:00
Zakant
ad1e233a29 Fixed indentation 2017-03-23 17:27:11 +01:00
Zakant
89cf679af3 Replaces return by 2017-03-23 17:26:16 +01:00
Zakant
07033061e3 Fixed function headers 2017-03-23 17:23:18 +01:00
PabstMirror
15346d0919 Add custom CfgUIGrids for microDagr (#5014) 2017-03-23 11:15:42 -05:00
Zakant
d47d183119 Fixed typo 2017-03-23 16:55:00 +01:00
Zakant
2cfeb5a10e Fixed missing bracket 2017-03-23 15:30:08 +01:00
Zakant
c90de84d04 Added myself to author list 2017-03-23 15:30:05 +01:00
Zakant
6ed90496a2 Added calculateBlood function 2017-03-23 15:30:03 +01:00
Zakant
327124003c Fixed condition expression 2017-03-23 15:30:01 +01:00
Zakant
f1fbf6a8eb Removed legacy code 2017-03-23 15:29:52 +01:00
J3aLeiNe
203a279696 Update atragmx.md 2017-03-23 14:42:45 +01:00
Zakant
58ed8a6c81 Modified cpr condition 2017-03-23 13:41:49 +01:00
Zakant
59c4485ef9 Only create pulse if their isn't any 2017-03-23 13:36:57 +01:00
Zakant
86bf9f4262 Fixed progress callback 2017-03-23 13:34:25 +01:00
Zakant
c790d0eb3e Added failure callback 2017-03-23 13:32:49 +01:00
Zakant
918a62ebce Implemented cpr failure function 2017-03-23 13:32:14 +01:00
Zakant
d815bd8bdc Added cpr failure function and fixed PREP mistake 2017-03-23 13:30:40 +01:00
Zakant
a570a6862c Modified CPR success to work with pulse 2017-03-23 13:28:01 +01:00
Zakant
d9aab91f97 Implemented cpr progress function 2017-03-23 13:26:06 +01:00
Zakant
b1dc4e0c52 Added progress function, reorganized PREPs 2017-03-23 13:21:36 +01:00
Zakant
0cad7d0da6 Fixed arguments and function header 2017-03-23 13:19:25 +01:00
Zakant
5714374a99 Added function to PREP 2017-03-23 13:17:04 +01:00
Zakant
477496e4f6 Added cpr start callback and function 2017-03-23 13:15:17 +01:00
Zakant
c1238501d3 Added CPRcreatePulse setting 2017-03-23 13:14:38 +01:00
Zakant
0d329e0f63 Added startCallback config entry 2017-03-23 13:03:19 +01:00
Zakant
5c89232306 Removed cardiac arrest check 2017-03-23 12:59:40 +01:00
11RDP-LoupVert
5d8cf43199 Dupplicate Polish entry (#5018)
https://i.gyazo.com/c7557980d7d4c36709be78ef1f2c2a8f.png
2017-03-22 11:05:43 -05:00
J3aLeiNe
c625dcda26 Update atragmx.md 2017-03-22 11:23:43 +01:00
Glowbal
bb228fa2b3 Merge branch 'release' 2017-03-21 20:49:11 +01:00
Glowbal
b143af0b8c Prep 3.9.1 release 2017-03-21 20:42:39 +01:00
J3aLeiNe
86e806a04f Update atragmx.md 2017-03-21 18:09:49 +01:00