Glowbal
f38d245771
fixed bloodloss for basic medical
2015-09-02 21:56:00 +02:00
commy2
f939f9215e
stop flickering of wounds, fix #346
2015-09-02 20:49:17 +02:00
commy2
7d2f1f52a4
remove protection, hitpoint config (fix ubc), some debug stuff
2015-09-02 20:13:51 +02:00
commy2
dc5e6b7c3c
Merge branch '323medicalstrcturaldamage' into medical-adjustments
2015-09-02 20:02:19 +02:00
commy2
9665f73fa3
Merge branch 'master' of https://github.com/acemod/ACE3 into medical-adjustments
2015-09-02 17:03:36 +02:00
SilentSpike
6aa191b788
Merge pull request #2327 from acemod/fixGunnerGoggles
...
Fix gunner goggles
2015-09-02 13:31:50 +01:00
commy2
acfc48efc2
animate head when surrendered and handcuffed
2015-09-01 20:00:28 +02:00
PabstMirror
264091957a
#1917 - Pointing Update Circle Icon
2015-09-01 10:09:14 -05:00
commy2
fb9ad6075f
Merge pull request #2337 from acemod/322bouncym84
...
bouncing flashbangs, fix #1907
2015-09-01 17:05:36 +02:00
commy2
dd788342fe
remove commented debug messages
2015-09-01 16:37:46 +02:00
commy2
b1fbbcc49f
bouncing flashbangs, fix #1907
2015-09-01 12:46:15 +02:00
commy2
5e68486233
high command module breaks ace, fix #2134
2015-09-01 10:06:01 +02:00
commy2
73911f701d
add debug messages for #2134
2015-09-01 08:53:11 +02:00
commy2
3362bbf0bf
fix protection 1.50 ubc issues
2015-09-01 00:01:42 +02:00
commy2
5a164c5cdc
fix UBC issues, simplify uniform hitpoint config
2015-08-31 23:36:59 +02:00
commy2
87cf7ded83
Merge pull request #2311 from acemod/322backpack
...
objectParent command replacing fnc_getBackpackAssignedUnit
2015-08-31 21:32:42 +02:00
commy2
e7d9e8c0dc
Merge pull request #2312 from acemod/322opendoor3rdperson
...
increase reach in 3rd person for opening doors, fix #2301
2015-08-31 21:32:34 +02:00
commy2
aa1ad1bc2a
Merge pull request #2313 from acemod/322ffvweaponselect
...
fix weapon select in ffv slots not working
2015-08-31 21:32:26 +02:00
commy2
9b6bc73c1a
Merge pull request #2314 from acemod/322spottingscope
...
better animation for spotting scope, fix #1638
2015-08-31 21:32:17 +02:00
commy2
591327aaf3
Merge pull request #2315 from acemod/3220xgrenadebug
...
fix autoriflemen spawning with 0x frag grenade bug
2015-08-31 21:32:09 +02:00
commy2
80a0c93bdc
Merge pull request #2316 from acemod/322customcamera
...
fix custom cameras (for intros) being broken with ACE, fix #2248
2015-08-31 21:32:02 +02:00
commy2
d85f96eac0
Merge pull request #2320 from acemod/322notonladder
...
disable all actions while being on a ladder by default, close #2289
2015-08-31 21:31:54 +02:00
commy2
e241c70a78
Merge pull request #2318 from acemod/322tripotmagsize
...
tripod hmgs should have 100rnd mags instead of 500rnd mags, fix #1190
2015-08-31 21:31:44 +02:00
commy2
2a82b97b5a
Merge pull request #2328 from acemod/322laserpointer
...
laserpointer with new command lineintersectssurface
2015-08-31 21:31:35 +02:00
commy2
37aec2b3c3
enable repairing while on ladder
2015-08-31 21:22:22 +02:00
PabstMirror
ba3ecf2a0a
Merge pull request #2321 from acemod/HearingStuff
...
Hearing stuff
2015-08-31 13:24:29 -05:00
PabstMirror
38122ffeaf
Merge pull request #2197 from acemod/mapOpenCloseEvents
...
Map open close events / MapTools Cleanup
2015-08-31 13:23:10 -05:00
commy2
f15805d1f3
setStructuralDamage function
2015-08-31 20:05:38 +02:00
commy2
e1d683d8dc
laserpointer with new command lineintersectssurface
2015-08-31 17:31:37 +02:00
SilentSpike
397d77e5b5
Remove special goggles treatment of vehicle units
...
The condition to disable the overlay for gunners introduces more problems (and inconsistencies for that matter) than it was worth. Vehicle gunners using camera based weapons should probably consider not wearing a pair of glasses/goggles before doing so.
2015-08-31 15:25:40 +01:00
SilentSpike
543e829278
Fix goggles overlay for FFV seats
...
When aiming down sights, view is considered to be "gunner" and so the overlay would be disabled. Introduces addition canUseWeapon check if view is "gunner" to differentiate FFV seats from regular gunner seats
2015-08-31 14:56:51 +01:00
SilentSpike
5e57cad669
Merge pull request #2216 from acemod/isolateZeusMenuKeybind
...
Prevent CBA keybindings in zeus interface
2015-08-31 14:41:48 +01:00
SilentSpike
04269831e8
Consider modifier keys for zeus interaction hack
...
The hacky keybind detection method should consider modifier keys also to prevent keybinds on the same key with different modifiers from firing
2015-08-31 14:40:31 +01:00
Glowbal
8c6f896164
fixed script error when canceling treatment actions
2015-08-31 13:00:17 +02:00
PabstMirror
4be7411a05
Use "visibleMapChanged" event
2015-08-30 15:26:43 -05:00
commy2
7a4c37c085
disable all actions on ladders by default, close #2289
2015-08-30 22:03:45 +02:00
commy2
fae38a2232
tripod hmgs should have 100rnd mags instead of 500rnd mags, fix #1190
2015-08-30 20:20:00 +02:00
commy2
c18af0d34b
completely prevent ace_optics from interfering with any mission camera scripts
2015-08-30 19:30:44 +02:00
commy2
74dfd73167
fix issues with pip optics camera in virtual arsenal
2015-08-30 19:05:35 +02:00
commy2
8d589ea8f0
solution for custom cameras (for intros) being broken with ACE
2015-08-30 15:50:51 +02:00
commy2
fc6f97e09e
fix autoriflemen spawning with 0x frag grenade bug
2015-08-30 13:30:21 +02:00
commy2
610bb7a1df
better animation for spotting scope, fix #1638
2015-08-30 13:10:25 +02:00
commy2
58ec4a68cb
fix weapon select in ffv slots not working
2015-08-30 12:01:13 +02:00
commy2
4682235d8a
increase reach in 3rd person for opening doors, fix #2301
2015-08-30 11:13:26 +02:00
commy2
32300a0a80
objectParent command replacing fnc_getBackpackAssignedUnit
2015-08-30 10:45:14 +02:00
PabstMirror
910bb151e2
#1988 - Boost explosive hearing damage
2015-08-30 01:47:40 -05:00
PabstMirror
8307ccea96
firedNear - use new isKindOf
2015-08-30 01:37:14 -05:00
PabstMirror
2f54cfadbc
Merge pull request #2146 from jokoho48/codeCleanupHearing
...
Code cleanup of Hearing module
2015-08-30 01:18:47 -05:00
KoffeinFlummi
6a17e3fa83
Merge remote-tracking branch 'origin/master'
2015-08-30 00:42:46 +02:00
KoffeinFlummi
5f63290508
Merge branch 'ptbr'
2015-08-30 00:42:31 +02:00
