Commit Graph

6245 Commits

Author SHA1 Message Date
Glowbal
1d918ecd1f Merge pull request #1916 from acemod/master
Start release branch for 3.2
2015-07-26 23:47:18 +02:00
PabstMirror
4f9dba61ee Mk6 - Misc cleanup 2015-07-26 16:45:34 -05:00
Glowbal
41196c15aa Merge pull request #1686 from acemod/fixFrag
Fix frag
2015-07-26 23:42:16 +02:00
ViperMaul
951afef495 Merge pull request #1911 from acemod/fixLoadUnloadUnconscious
Fix load unload unconscious
2015-07-26 14:33:46 -07:00
SilentSpike
76eed02d1d Update zeus settings module doc 2015-07-26 21:37:39 +01:00
SilentSpike
1c9caff716 Spectator settings module doc 2015-07-26 21:33:09 +01:00
bux578
ef11cda5f2 Merge branch 'TheBamse-RHSWeaponHuntIRCompatibility' 2015-07-26 21:30:10 +02:00
bux578
bd6cff2e37 fix conflict 2015-07-26 21:29:53 +02:00
bux578
5cab4b82d4 Merge pull request #1914 from jokoho48/UpdateDocuForParachuteConfigEntries
Update Config Entries for Parachute in documentation/development/ace3…
2015-07-26 21:20:40 +02:00
Glowbal
0af6c5d852 Merge pull request #1913 from acemod/improveSwitchUnits
Improve SwitchUnits
2015-07-26 21:13:21 +02:00
Glowbal
d1809e597c Removed requirement for the medical dll
Medical extension is now an optional requirement that improves performance for advanced medical when used.
2015-07-26 20:54:49 +02:00
Glowbal
3836c1e23f Merge pull request #1915 from acemod/ace_spectator
ace_spectator overhaul
2015-07-26 19:36:04 +02:00
SilentSpike
68b8100b39 Merge branch 'master' into ace_spectator
Conflicts:
	addons/spectator/stringtable.xml
	extras/assets/icons/Icons_Modules.psd
2015-07-26 14:33:47 +01:00
SilentSpike
159937dc45 Merge branch 'master' into ace_spectator
Conflicts:
	addons/explosives/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/map/stringtable.xml
	addons/medical/stringtable.xml
	addons/sitting/stringtable.xml
	addons/spectator/stringtable.xml
	extras/assets/icons/Icons_Modules.psd
2015-07-26 14:15:24 +01:00
Joko
f017f50a19 Update Config Entries for Parachute in documentation/development/ace3-config-entries.md 2015-07-26 14:31:24 +02:00
SilentSpike
e6f016f195 GVAR typo 2015-07-26 13:13:46 +01:00
SilentSpike
e431365586 Spectate on death setting 2015-07-26 13:12:58 +01:00
SilentSpike
ec6a0da01c Adjust camera speed while moving 2015-07-26 12:23:01 +01:00
SilentSpike
b0adf2e2ee Fix 3D icons not rendering 2015-07-26 12:13:05 +01:00
SilentSpike
efbd5189ce Close all dialogs when exiting 2015-07-26 12:05:41 +01:00
SilentSpike
f0f6edb549 Transition camera post-escape menu 2015-07-26 11:28:14 +01:00
bux578
cff54efbe0 add missing private 2015-07-26 09:20:38 +02:00
bux578
993f6bde16 remove respawnCounter in certain respawn template conditions 2015-07-26 09:19:29 +02:00
bux578
4ab1123efd fix unlimited growing array 2015-07-26 09:19:09 +02:00
Glowbal
dfec850aa8 Merge pull request #1910 from SzwedzikPL/backpack_macro_in_cfgs
addX macro in configs
2015-07-26 08:37:47 +02:00
PabstMirror
0b9d1fb05d Disabled by default - Safe FOV Check 2015-07-26 00:48:53 -05:00
SilentSpike
5cfe180d3b Fix camPan normalization 2015-07-26 02:17:09 +01:00
SilentSpike
697997ca8f Escape menu 2015-07-26 02:17:08 +01:00
SilentSpike
878bcf819e Fix map double click event 2015-07-26 00:25:31 +01:00
PabstMirror
c6f21f48a4 Merge branch 'master' into fingering 2015-07-25 17:28:22 -05:00
SzwedzikPL
6258e73290 addX macro in confgis 2015-07-25 21:59:52 +02:00
Glowbal
c9d4395a42 Merge pull request #1870 from SzwedzikPL/ah6_gun_fix
M134 minigun rate of fire & dispersion fix + hearing protection for heli pilots
2015-07-25 21:39:21 +02:00
PabstMirror
fba457999e #1899 - Remove AV_ESS_blk config 2015-07-25 14:32:24 -05:00
Glowbal
ea8dc0a5ec Merge pull request #1809 from SzwedzikPL/medical_fix_treat_at_attendant
Fix for 'Treat at...' option
2015-07-25 21:22:44 +02:00
Glowbal
3a53991ed0 fixed rvmat and texture paths 2015-07-25 21:21:31 +02:00
PabstMirror
ffc5615abd Merge pull request #1886 from acemod/windDeflectionSinglePFEH
Wind deflection single pfeh
2015-07-25 14:01:45 -05:00
PabstMirror
7da258111d Merge pull request #1739 from acemod/virtualAttachObject
Virtual attach object
2015-07-25 13:55:48 -05:00
Glowbal
3514f07d31 Merge pull request #1806 from jonpas/sittingFixes
Akward Sitting Fixes Part 2
2015-07-25 20:42:38 +02:00
Glowbal
f0a2c7c454 Merge pull request #1854 from jonpas/lookUp
Increased ability to look up
2015-07-25 20:41:46 +02:00
Felix Wiegand
20b8d0091d Merge pull request #1909 from acemod/fixParachutes
fix parachutes
2015-07-25 19:59:07 +02:00
Glowbal
2f186ffbf1 Merge pull request #1897 from acemod/vectorCtrlTextGroupFix
#1871 - Don't do ctrlText(set) on RscControlsGroup
2015-07-25 19:57:55 +02:00
PabstMirror
40ed985d34 Config Fixes 2015-07-25 12:56:57 -05:00
bux578
d8d4a6a8c7 fix parachutes 2015-07-25 19:55:39 +02:00
Glowbal
c729672e53 Merge pull request #1885 from acemod/kestullHeightFix
Fix Kestrel Y position on large interface
2015-07-25 19:53:48 +02:00
Glowbal
6422c20e46 Merge pull request #1867 from acemod/cWire-localVehDamage
concWire - Apply damage where vehicle is local
2015-07-25 19:52:42 +02:00
PabstMirror
e616f2240e Merge pull request #1863 from acemod/huntIR-itemRemoved
Close huntIR monitor if item removed
2015-07-25 12:50:05 -05:00
PabstMirror
1008567cba Merge pull request #1847 from acemod/optionsOnIntroOutro
Show Options on Intro/Outro in Missions
2015-07-25 12:49:20 -05:00
Glowbal
0e872a5ed5 Merge pull request #1845 from acemod/huntir-deadProjectile
HuntIR - Handle Dead Projectile
2015-07-25 19:48:32 +02:00
ViperMaul
38bd2896ab Merge pull request #1851 from SzwedzikPL/hearing_in_zeus
Disable hearing in zeus camera
2015-07-25 10:44:34 -07:00
ViperMaul
55614b9ac3 Merge pull request #1839 from acemod/hearingUnification
Hearing PFEH unification / Flashbangs
2015-07-25 10:44:11 -07:00