Glowbal
6657bde921
Change basic medical to use advanced medical injury system
2016-06-13 12:18:56 +02:00
Glowbal
792dbcd009
Change clean up privates in handleDamage code
2016-06-13 11:05:21 +02:00
Glowbal
8e59993d7a
Change clean up medical code
2016-06-13 10:55:19 +02:00
Glowbal
a18af7c207
Merge pull request #3912 from acemod/medical-impr
...
Small clean up to medical
2016-06-13 09:49:45 +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
voiper
1ffd9d58ab
Revert postInit.
2016-06-12 15:39:16 -07:00
voiper
5a29c4b04c
Fix up weapon names.
2016-06-12 15:33:37 -07:00
voiper
f3fc99f3b8
Housekeeping of ace_flashlights and ace_map.
...
ace_map now handles flashlights independently of ace_flashlights.
ace_map searches for flashlight beam textures directly from weapon configs.
ace_map has acc_flashlight config (so vanilla ace_map will have at least one flashlight to use).
2016-06-12 15:31:11 -07:00
jonpas
b80b7e5265
Shorten more GVARs
2016-06-13 00:08:28 +02:00
jonpas
323555d9a4
Prefix model, Fix indentation of model.cfg, Remove redundant CLASSNAME macro
2016-06-13 00:03:33 +02:00
jonpas
b40915dd12
Cealnup quotes, capitalization, function headers
2016-06-12 23:56:00 +02:00
voiper
b45a17001c
Merge remote-tracking branch 'origin/master' into grenadesounds
2016-06-12 14:54:14 -07: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
VKing
d5f8d965f3
Change ace_time to cba_missionTime
2016-06-12 17:22:44 +02:00
VKing
6b62436cfb
Delete unused animation files
2016-06-12 16:29:00 +02:00
VKing
fe18107077
Fix cfgPatches entries
2016-06-12 16:28:42 +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
VKing
7f3aacb4d6
Add mass to metal detectors
...
Based on values from the manufacturer's pamphlet (vallon.de)
2016-06-12 12:41:59 +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
VKing
12130c8c3a
Add description string
2016-06-12 10:19:06 +02:00
VKing
3c85398d87
Clean up the sound config
2016-06-12 10:17:02 +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
SzwedzikPL
0e247bdb00
CBA events
2016-06-11 22:13:39 +02:00
SzwedzikPL
acdfa52a89
Merge branch 'acemod/master' into dogtags
2016-06-11 22:07:57 +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
PabstMirror
ddf9e0b5cc
CBA Events
2016-06-11 14:57:04 -05: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
