Merge branch 'master' into release

addons/fastroping/functions/fnc_fastRopeServerPFH.sqf

@@ -53,7 +53,12 @@ if (_hasBeenAttached && {isNull attachedTo _unit}) exitWith {
 _dummy setVelocity [0,0,-6];
 
 //Check if fast rope is finished
-if (((getPos _unit select 2) < 0.2) || {ropeLength _ropeTop == 34.5} || {vectorMagnitude (velocity _vehicle) > 5} || {!(alive _unit)} || {captive _unit}) exitWith {
+if (
+    ((getPos _unit select 2) < 0.2)
+    || {ropeLength _ropeTop == 34.5}
+    || {vectorMagnitude (velocity _vehicle) > 5}
+    || {!([_unit] call EFUNC(common,isAwake))}
+) exitWith {
     detach _unit;
 
     //Reset rope

addons/laserpointer/functions/fnc_drawLaserpoint.sqf

@@ -85,7 +85,7 @@ private _size = 2 * sqrt (1 / _distance) * (call EFUNC(common,getZoom));
 
 drawIcon3D [
     format ["\a3\weapons_f\acc\data\collimdot_%1_ca.paa", ["red", "green"] select _isGreen],
-    [[1,0.25,0.25,0.5*_brightness], [0.25,1,0.25,0.5*_brightness]] select _isGreen,
+    [[1,0.25,0.25,0.6*_brightness], [0.25,1,0.25,0.5*_brightness]] select _isGreen,
     _pL,
     _size,
     _size,

addons/main/script_mod.hpp

@@ -12,7 +12,7 @@
 #define VERSION_AR MAJOR,MINOR,PATCHLVL,BUILD
 
 // MINIMAL required version for the Mod. Components can specify others..
-#define REQUIRED_VERSION 1.62
+#define REQUIRED_VERSION 1.64
 #define REQUIRED_CBA_VERSION {3,1,0}
 
 #ifdef COMPONENT_BEAUTIFIED

addons/nametags/XEH_postInit.sqf

@@ -35,3 +35,6 @@ GVAR(showNamesTime) = -10;
         call FUNC(updateSettings);
     };
 }] call CBA_fnc_addEventHandler;
+
+// civilians don't use military ranks
+["CIV_F", ["","","","","","",""]] call FUNC(setFactionRankIcons);

docs/README.md

@@ -32,14 +32,14 @@
 
 - Install `make` and `gcc`
     ```
-    sudo apt-get make gcc
+    sudo apt-get install make gcc
     ```
 
-- Install `ruby 2.0`, `rbuy2.0-dev` and `ruby-switch`
+- Install `ruby2.0`, `rbuy2.0-dev` and `ruby-switch`
     ```
     sudo apt-add-repository ppa:brightbox/ruby-ng
-    sudo apt update
-    sudo apt install ruby2.0 ruby2.0-dev ruby-switch
+    sudo apt-get update
+    sudo apt-get install ruby2.0 ruby2.0-dev ruby-switch
     ```
 
 - Set Ruby version

docs/wiki/feature/fcs.md

@@ -10,6 +10,7 @@ version:
   major: 3
   minor: 0
   patch: 0
+redirect_from: "/wiki/feature/laser-selfdesignate.html"
 ---
 
 ## 1. Overview

docs/wiki/feature/laser-selfdesignate.md

@@ -1,21 +0,0 @@
----
-layout: wiki
-title: Laser Self-Designate
-description: Allows gunners to lase their own targets.
-group: feature
-category: equipment
-parent: wiki
-mod: ace
-version:
-  major: 3
-  minor: 0
-  patch: 0
----
-
-## 1. Overview
-
-Allows gunners to lase their own targets. See [Feature: "FCS"]({{ site.baseUrl }}/wiki/feature/fcs.html) for more information.
-
-## 2. Dependencies
-
-{% include dependencies_list.md component="laser_selfdesignate" %}