Commit Graph

6434 Commits

Author SHA1 Message Date
Glowbal
7d30bc53ed Removed non chairs 2015-07-27 21:59:38 +02:00
SilentSpike
12dca2e684 Merge branch 'hotfix' 2015-07-27 18:34:51 +01:00
SilentSpike
302e476522 Merge branch 'hotfix' into release 2015-07-27 18:34:06 +01:00
SilentSpike
47d96835c6 Fix arrayIntersect oversight 2015-07-27 18:32:21 +01:00
SilentSpike
6197a63188 Turns out the formatting requires more newlines 2015-07-27 16:13:09 +01:00
SilentSpike
00684ccb64 Merge pull request #1918 from acemod/spect-doc
ace_spectator documentation
2015-07-27 15:57:48 +01:00
SilentSpike
ed06d00a41 Consistent formatting 2015-07-27 14:41:38 +01:00
SilentSpike
307703631b Fix typo
Add hyperlink
scenario designers -> mission makers
Formatting
2015-07-27 14:20:23 +01:00
SilentSpike
4bf80a7ba7 Better phrasing 2015-07-27 13:28:06 +01:00
SilentSpike
ae4eacdab4 Camera attributes details 2015-07-27 13:24:07 +01:00
SilentSpike
7fe6e71023 Vision mode details 2015-07-27 13:17:23 +01:00
SilentSpike
6f16cbb553 Camera mode details 2015-07-27 13:12:52 +01:00
SilentSpike
7c9ffa9f9f Spectator system details 2015-07-27 13:07:11 +01:00
SilentSpike
647d6b6181 Update existing text 2015-07-27 12:45:33 +01:00
Grzegorz
d23cab06aa + and - 2015-07-27 13:20:07 +02:00
PabstMirror
ceb12662e0 Version To 3.2.0 2015-07-27 02:05:58 -05:00
ViperMaul
2694343c69 Merge branch 'release' of https://github.com/acemod/ACE3 into release 2015-07-26 23:56:50 -07:00
ViperMaul
4f53bdefb9 Suppress debug in fnc_unloadPersonLocal.sqf 2015-07-26 23:54:42 -07:00
PabstMirror
81f9c92c44 Merge branch 'master' into release 2015-07-27 01:49:18 -05:00
PabstMirror
544387d320 Merge pull request #1922 from acemod/rebuildDLLs
Rebuild dlls for 3.2
2015-07-27 01:48:09 -05:00
Glowbal
d0adb6c317 Merge branch 'master' into release 2015-07-27 08:41:00 +02:00
Glowbal
24e5b17497 Merge pull request #1921 from acemod/fixLoadUnconscious
Fix load unconscious into boats and co-pilot seats
2015-07-27 08:40:16 +02:00
Glowbal
01ca669313 Merge pull request #1919 from SzwedzikPL/rhs_usf_combat_fix
rhs usf combat config fix
2015-07-27 08:39:53 +02:00
PabstMirror
8cb0b8a30c Rebuild dlls for 3.2 2015-07-26 23:29:07 -05:00
ViperMaul
9a98530392 Add support for loading unconscious into boats, refs #1729 2015-07-26 18:33:25 -07:00
ViperMaul
6142d99626 Add support for loading unconscious into co-pilot seat
fixes #1727
2015-07-26 18:20:36 -07:00
gienkov
5136215e79 finger, parachute and spectator translation 2015-07-27 01:46:58 +02:00
SzwedzikPL
bdb23301db rhs usf combat config fix 2015-07-27 01:42:02 +02:00
SilentSpike
64bf693980 Documented spectatable units and sides 2015-07-27 00:00:43 +01:00
gienkov
5bb1dded4b Merge remote-tracking branch 'origin' into pl-translation-4 2015-07-27 00:47:54 +02:00
SilentSpike
42af5bcf3d Spectator usage documentation 2015-07-26 23:12:10 +01:00
PabstMirror
5b2b490434 Merge branch 'master' into release 2015-07-26 16:53:07 -05:00
PabstMirror
bf4e95e750 Merge pull request #1548 from acemod/fingering
Fingering
2015-07-26 16:47:41 -05:00
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