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
|
e1d683d8dc
|
laserpointer with new command lineintersectssurface
|
2015-08-31 17:31:37 +02: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 |
|
ViperMaul
|
0e432a5eb3
|
Merge pull request #2271 from jonpas/toolsCBAupdate
Updated required CBA files
|
2015-08-30 21:38:13 -07: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 |
|
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 |
|
Glowbal
|
b968a32ea2
|
Merge pull request #2260 from acemod/updateMainConfig
Update Main Config File
|
2015-08-30 00:37:46 +02:00 |
|
KoffeinFlummi
|
a7f2a7fefc
|
Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3
|
2015-08-30 00:35:11 +02:00 |
|
PabstMirror
|
f67809b18c
|
Merge branch 'master' into mapOpenCloseEvents
|
2015-08-29 16:43:24 -05:00 |
|
PabstMirror
|
22f8b2e8c2
|
Merge pull request #2305 from acemod/attachEventHandlers
Attach event handlers
|
2015-08-29 16:35:51 -05:00 |
|
PabstMirror
|
fa3a0213b7
|
Merge pull request #2249 from acemod/captiveFFV
Captive ffv animation fix + cleanup
|
2015-08-29 15:39:23 -05:00 |
|
Glowbal
|
2b3957324c
|
Merge pull request #2262 from jonpas/readmeFix
Updated README.md files
|
2015-08-29 22:37:40 +02:00 |
|
Glowbal
|
998bc2d45a
|
Merge pull request #2297 from acemod/addMoreHearingProtection
Add Hearing Protection to Helmets with Peltor Headsets
|
2015-08-29 22:34:59 +02:00 |
|
Joko
|
91a8463198
|
Merge pull request #2299 from acemod/FixTactialLadderAnimation
Fix Tactical Ladder Animation Clipping
Fixes #2287
|
2015-08-29 22:33:08 +02:00 |
|
SilentSpike
|
e3cda8ee0e
|
Merge pull request #2083 from acemod/spectator
Spectator
|
2015-08-29 21:21:41 +01:00 |
|
SilentSpike
|
620136a1a7
|
Merge branch 'master' into spectator
Conflicts:
AUTHORS.txt
|
2015-08-29 21:20:04 +01:00 |
|
PabstMirror
|
0b3b3871ff
|
Merge pull request #2065 from acemod/hearingDisableZeus
Setting to disable hearing for zeus RC
|
2015-08-29 15:15:14 -05:00 |
|
PabstMirror
|
d06680e2a0
|
#1571 - Handle Null Attached Objects
|
2015-08-29 11:47:56 -05:00 |
|
SilentSpike
|
200f44d963
|
Adjust spectator camera speed based on height
Slows the camera movement close to the ground as it feels more natural when spectating units up close and such
|
2015-08-29 16:05:04 +01:00 |
|
PabstMirror
|
6eba898301
|
Merge pull request #2160 from acemod/updatingBaseClass150
realisticnames 1.50 Updating Base Class Changes
|
2015-08-29 09:55:25 -05:00 |
|
PabstMirror
|
f6c752045c
|
Cleanup
|
2015-08-29 09:38:57 -05:00 |
|
Glowbal
|
354e4410d1
|
Merge pull request #2268 from gienkov/pulse-enhancement
HR and BP enhancement
|
2015-08-29 11:47:00 +02:00 |
|
Glowbal
|
70c0edf436
|
Merge pull request #2283 from acemod/cargoCanInteract
Add canInteractWith checks for cargo
|
2015-08-29 11:45:50 +02:00 |
|
PabstMirror
|
007859d42e
|
Attach - getin/out/killed event handlers (#2200 #2300)
|
2015-08-28 16:57:16 -05:00 |
|
jokoho48
|
3269114861
|
Fix Tactical Ladder Animation Clipping
|
2015-08-28 11:55:32 +02:00 |
|
bux578
|
19a6226ced
|
add Hearing Protection to Helmets with Peltors
|
2015-08-28 09:10:58 +02:00 |
|
PabstMirror
|
80d18c468e
|
Merge pull request #2244 from acemod/wireCuttersConfigAndCleanup
wirecutters config for fences + cleanup
|
2015-08-27 16:01:31 -05:00 |
|
commy2
|
6fe79c4fe2
|
remove obsolete compat pbo for BWMod, fix #2293
|
2015-08-27 22:10:09 +02:00 |
|