644460ed96
Merge branch 'master' into parseList
...
Conflicts:
addons/slideshow/functions/fnc_makeList.sqf
2015-09-04 18:40:35 +02:00
f63e652636
Merge pull request #2334 from acemod/mapToolsAspectRatio
...
MapTools - Handle Bad Aspect Ratio
2015-09-03 10:44:34 -05:00
736be74c2b
Merge pull request #2344 from acemod/322hideclock
...
hide clock on map if no watch in inventory, #414
2015-09-03 13:44:20 +02:00
36b42f2780
Merge pull request #2343 from acemod/322flares
...
scripted approach to hand flares, fix #1079
2015-09-03 13:44:04 +02:00
529c85df58
Merge pull request #2338 from acemod/322sit
...
Sitting improvements
2015-09-03 13:43:53 +02:00
6b7f84b297
add missing ;
2015-09-03 13:39:17 +02:00
76bb2bd2b8
replace function with FUNC macro
2015-09-03 13:37:36 +02:00
fbf00b9aa5
correct comment
2015-09-03 02:55:40 +02:00
c213c0e05a
Merge pull request #2352 from jonpas/slideshowPrivates
...
Cleaned up Slideshow privates
2015-09-02 16:10:31 -05:00
def2d29501
Cleaned up slideshow privates
2015-09-02 22:51:31 +02:00
6aa191b788
Merge pull request #2327 from acemod/fixGunnerGoggles
...
Fix gunner goggles
2015-09-02 13:31:50 +01:00
07ab7d1c35
correct comment
2015-09-02 02:00:53 +02:00
29efc13556
hide clock, use eventhandler
2015-09-02 01:59:07 +02:00
43c54d51e8
hide clock on map if no watch in inventory, #414
2015-09-02 01:40:38 +02:00
83424cdcab
header for fnc_flare
2015-09-02 00:03:16 +02:00
7ce606740c
make flares work in mp
2015-09-01 23:56:25 +02:00
be56fd7d46
scripted approach to hand flares, fix #1079
2015-09-01 23:19:49 +02:00
237d5b6536
stand up action (uses get out shortcut) and less awkward standing animaton
2015-09-01 21:03:28 +02:00
acfc48efc2
animate head when surrendered and handcuffed
2015-09-01 20:00:28 +02:00
405d85eaaa
fix leaning back through chair while sitting, fix #1795
2015-09-01 19:06:20 +02:00
264091957a
#1917 - Pointing Update Circle Icon
2015-09-01 10:09:14 -05:00
fb9ad6075f
Merge pull request #2337 from acemod/322bouncym84
...
bouncing flashbangs, fix #1907
2015-09-01 17:05:36 +02:00
c0defe9204
Merge pull request #2336 from acemod/322hcmodule
...
high command module breaks ace, fix #2134
2015-09-01 17:05:24 +02:00
dd788342fe
remove commented debug messages
2015-09-01 16:37:46 +02:00
de66c2be7b
add commy's newest issue
2015-09-01 13:16:58 +02:00
b1fbbcc49f
bouncing flashbangs, fix #1907
2015-09-01 12:46:15 +02:00
5e68486233
high command module breaks ace, fix #2134
2015-09-01 10:06:01 +02:00
73911f701d
add debug messages for #2134
2015-09-01 08:53:11 +02:00
c97e0eb500
MapTools - Handle Bad Aspect Ratio
2015-08-31 22:50:01 -05:00
3362bbf0bf
fix protection 1.50 ubc issues
2015-09-01 00:01:42 +02:00
87cf7ded83
Merge pull request #2311 from acemod/322backpack
...
objectParent command replacing fnc_getBackpackAssignedUnit
2015-08-31 21:32:42 +02:00
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
aa1ad1bc2a
Merge pull request #2313 from acemod/322ffvweaponselect
...
fix weapon select in ffv slots not working
2015-08-31 21:32:26 +02:00
9b6bc73c1a
Merge pull request #2314 from acemod/322spottingscope
...
better animation for spotting scope, fix #1638
2015-08-31 21:32:17 +02:00
591327aaf3
Merge pull request #2315 from acemod/3220xgrenadebug
...
fix autoriflemen spawning with 0x frag grenade bug
2015-08-31 21:32:09 +02:00
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
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
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
2a82b97b5a
Merge pull request #2328 from acemod/322laserpointer
...
laserpointer with new command lineintersectssurface
2015-08-31 21:31:35 +02:00
37aec2b3c3
enable repairing while on ladder
2015-08-31 21:22:22 +02:00
ba3ecf2a0a
Merge pull request #2321 from acemod/HearingStuff
...
Hearing stuff
2015-08-31 13:24:29 -05:00
38122ffeaf
Merge pull request #2197 from acemod/mapOpenCloseEvents
...
Map open close events / MapTools Cleanup
2015-08-31 13:23:10 -05:00
e1d683d8dc
laserpointer with new command lineintersectssurface
2015-08-31 17:31:37 +02:00
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
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
5e57cad669
Merge pull request #2216 from acemod/isolateZeusMenuKeybind
...
Prevent CBA keybindings in zeus interface
2015-08-31 14:41:48 +01:00
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
0e432a5eb3
Merge pull request #2271 from jonpas/toolsCBAupdate
...
Updated required CBA files
2015-08-30 21:38:13 -07:00
4be7411a05
Use "visibleMapChanged" event
2015-08-30 15:26:43 -05:00
7a4c37c085
disable all actions on ladders by default, close #2289
2015-08-30 22:03:45 +02:00
