Glowbal
38cdd523f0
Clean up medical function private declares
2016-06-13 14:27:43 +02:00
Glowbal
fd108478fe
Clean up medical menu privates
2016-06-13 12:49:35 +02:00
Glowbal
8e59993d7a
Change clean up medical code
2016-06-13 10:55:19 +02:00
Glowbal
73bd684b65
Change formatting and private keywords in medical
2016-06-13 02:34:56 +02:00
Glowbal
3ba2396db7
Change minor clean up of handleUnitVitals
2016-06-13 02:11:21 +02:00
Glowbal
f0b0b49f3c
Merge pull request #3908 from acemod/funBag
...
Only do gunbag things when target has a gunbag
2016-06-12 23:25:55 +02:00
Glowbal
43a2b0ea29
Merge pull request #3909 from acemod/fix-bandaging-configuration
...
Adjust bandage configuration
2016-06-12 23:25:16 +02:00
Glowbal
4c71974855
Merge pull request #3910 from acemod/fixVelWounds
...
Add maxDam for medium velocity wounds
2016-06-12 23:25:03 +02:00
PabstMirror
1997cb5199
Add maxDam for medium velocity wounds
...
Ensures that velocity wounds from a major hit will use the "Large" type
of wound
2016-06-12 14:47:59 -05:00
Glowbal
fa1282406f
Change bandage configurations
...
- Field dressing is average treatment
- Packing bandage is average treatment, higher reopen change, longer reopening delay
- Elastic bandage is higher treatment, higher reopen change, shorter reopen delay
- QuikClot is lower treatment, lower reopen change, longer reopening delay
2016-06-12 20:40:45 +02:00
PabstMirror
e8a403a9ad
Only do gunbag things when target has a gunbag
2016-06-12 12:58:39 -05:00
Glowbal
b16f444795
Merge pull request #3905 from acemod/fix-c4996
...
Fix c4996
2016-06-12 17:42:38 +02:00
Glowbal
b52c1c8ce3
Merge branch 'master' into fix-c4996
...
Conflicts:
extensions/clipboard/ace_clipboard.cpp
2016-06-12 17:35:19 +02:00
Glowbal
8dc8926960
Merge branch 'master' into fix-c4996
...
Conflicts:
extensions/parse_imagepath/ace_parse_imagepath.cpp
2016-06-12 17:30:29 +02:00
commy2
1136a57e42
Merge pull request #3903 from acemod/gunbag_ace
...
Gunbag ace
2016-06-12 14:03:02 +02:00
commy2
3c6de5ad6f
remove misc box from gunbag CfgPatches
2016-06-12 14:00:55 +02:00
commy2
000e4a68e6
gunbag improvements
2016-06-12 13:51:23 +02:00
commy2
7a0b9a1a16
Merge branch 'gunbag' of https://github.com/ir0n1e/ACE3 into ir0n1e-gunbag
2016-06-12 11:02:23 +02:00
commy2
7b49855e89
Merge pull request #3902 from acemod/tanoaWindDAta
...
Tanoa Weather Data
2016-06-12 10:26:56 +02:00
commy2
813b584acf
Merge pull request #3900 from acemod/pipFlicker
...
Optics - Create PIP camera only when needed
2016-06-12 10:11:04 +02:00
commy2
f17d4af645
Merge pull request #3901 from acemod/vMassNull
...
movement - Handle objNull in virtualMass
2016-06-12 09:08:31 +02:00
PabstMirror
8aa5e53bdd
movement - Handle objNull in virtualMass
2016-06-12 02:01:49 -05:00
PabstMirror
5e3d4866a6
Prepare camera when optic equipped
2016-06-12 01:53:03 -05:00
bux578
a2124a6b45
add tanoa wind dir data, add comments
2016-06-12 07:30:38 +02:00
bux578
68e2531af3
Merge remote-tracking branch 'origin/master' into tanoaWindDAta
2016-06-12 07:01:14 +02:00
PabstMirror
d14392c35c
Optics - Create PIP camera only when needed
2016-06-11 23:08:55 -05:00
commy2
ec01ae0d0b
Merge pull request #3897 from acemod/tanoaMapData
...
Tanoa map data
2016-06-11 23:03:22 +02:00
SilentSpike
931ccf8a46
Merge pull request #3796 from acemod/zeusModuleUiExample
...
Add more zeus modules
2016-06-11 21:41:55 +01:00
bux578
2a667a322d
init WindData --- missing directions
2016-06-11 22:37:03 +02:00
bux578
950cdb1ee3
fix missing values
...
was using an incomplete regex
2016-06-11 22:05:44 +02:00
SilentSpike
242876fa83
Merge remote-tracking branch 'origin/master' into zeusModuleUiExample
2016-06-11 21:02:16 +01:00
Glowbal
e8ba309765
Merge pull request #3887 from gpgpgpgp/patch-2
...
add a line to get rid of 4 first aid kits in the invisible fast roping helper
2016-06-11 21:53:34 +02:00
Glowbal
1632cb9105
Merge pull request #3878 from acemod/fastroping-sounds-fix
...
Only play fastroping sounds for player
2016-06-11 21:53:00 +02:00
commy2
250e27bfd2
Merge pull request #3864 from acemod/removeLineDrawing
...
Remove line drawing
2016-06-11 21:38:56 +02:00
Butt4cak3
151d13244b
Improved misleading translation of german bandages ( #3810 )
...
* Improved misleading translation of german bandages
* Further improved german bandage names
2016-06-11 21:35:22 +02:00
PabstMirror
d57754a7cd
Private/Formatting
2016-06-11 14:34:14 -05:00
PabstMirror
4f73ead80c
Fix alt/lat for maps not defined in getMapData
2016-06-11 14:32:36 -05:00
bux578
c268572649
add Tanoa mapData
2016-06-11 21:14:05 +02:00
bux578
18d864e950
split mapData into separate function
2016-06-11 21:13:51 +02:00
Glowbal
7f9257716e
Merge pull request #2331 from acemod/323bloodyoverlay
...
remove BI blood overlay
2016-06-11 20:49:54 +02:00
commy2
a4bd6ea80f
Merge pull request #3893 from acemod/virtualMasDiv0
...
virtualMass - Fix div0 error when naked
2016-06-10 10:27:36 +02:00
commy2
e55881e1ef
Merge pull request #3894 from acemod/fixNametagsUAV
...
Fix nametag error when assignedTeam is nil
2016-06-10 10:20:16 +02:00
Glowbal
bbb8bafa1c
Merge pull request #3895 from acemod/devHandleDamage
...
Temp fix for change to handleDamage in dev branch
2016-06-10 09:28:44 +02:00
PabstMirror
dc6d5f1367
Temp fix for change to handleDamage in dev branch
...
Fix #3892
2016-06-09 21:26:50 -05:00
PabstMirror
5ecc09d78c
Fix nametag error when assignedTeam is nil
2016-06-09 20:42:30 -05:00
PabstMirror
e8f7f6ea24
virtualMass - Fix div0 error when playing as rabbit
2016-06-09 20:30:45 -05:00
PabstMirror
d7d87be32b
Merge remote-tracking branch 'refs/remotes/origin/master' into removeLineDrawing
2016-06-09 17:20:39 -05:00
Glowbal
c3d984d6e7
Merge pull request #3840 from acemod/eol-lf
...
Convert to LF line endings
2016-06-10 00:15:51 +02:00
jonpas
3389720f6b
Merge branch 'master' into eol-lf
2016-06-10 00:12:07 +02:00
jonpas
1c06764d03
Add Extract Dependencies script ( #2640 )
...
* Add Extract Dependencies Python script, Add tools\temp to .gitignore
* Change backtick to single quote
* Remove unnecessary import
* Remove all whitespace
* Add support for multi-line dependencies, Add header comment, Improve
* Fix final message
* Update output to Jekyll IF statements for inclusion on pages
* Space
* Correct comments for Jekyll usage
2016-06-09 14:59:26 +02:00
