Merge remote-tracking branch 'upstream/master' into installation

This commit is contained in:
BullHorn 2015-05-22 16:34:00 +03:00
commit 690a800884
2 changed files with 34 additions and 7 deletions

View File

@ -14,6 +14,28 @@
* Public: No
*/
#include "script_component.hpp"
//Start up a PFEH that scans all mines/explosives without defuseObjects attached and adds them
//Handles Editor Placed / Zeus / Scripted
if (isServer) then {
[{
private ["_explosive", "_helpers", "_defuseHelper"];
{
_explosive = _x;
_helpers = {
((typeOf _x) == "ACE_DefuseObject") && {(_x getVariable [QGVAR(Explosive), objNull]) == _explosive}
} count (attachedObjects _explosive);
if (_helpers == 0) then {
TRACE_3("Explosive without helper",_explosive,(getPosAsl _explosive),(typeOf _explosive));
_defuseHelper = createVehicle ["ACE_DefuseObject", (getPos _explosive), [], 0, "NONE"];
_defuseHelper attachTo [_explosive, [0,0,0], ""];
_defuseHelper setVariable [QGVAR(Explosive),_explosive,true];
};
} forEach allMines;
}, 5, []] call CBA_fnc_addPerFrameHandler;
};
if !(hasInterface) exitWith {};
GVAR(PlacedCount) = 0;
GVAR(Setup) = objNull;

View File

@ -15,24 +15,29 @@ This guide will explain how to get ACE3 up and running faster than you can say b
- Download [ACE3](https://github.com/acemod/ACE3/releases/latest).
- Know how to extract .zip files. Use [Google](https://www.google.com) if not sure.
## 3. Installation Guide
- Extract both CBA and ACE3 into your Arma 3 folder. By default this is located in:<br>
## 3. Install ACE3
- Extract both CBA and ACE3 .zip files into your Arma 3 folder. By default this is located in:<br>
32-Bit - `C:/Program Files/Steam/Steamapps/Common/Arma 3/`<br>
64-Bit - `C:/Program Files (x86)/Steam/Steamapps/Common/Arma 3/`
- After extraction you should have the `@ace` and `@CBA_A3` folders inside your Arma 3 folder.
## 4. Launch Arma 3 with ACE3
- Launch Arma 3 to start the official game Launcher.
- Click `Mods` and make sure the checkboxes next to `ace` and `CBA_A3` are ticked.
<img src="{{ site.baseurl }}/img/wiki/user/installation1-launcher.png" width="869" height="665" alt="Arma 3 Vanilla Launcher" />
- Click `Play`
## 4. Alternative launch methods
## 5. Alternative launch methods
### 4.1 Steam Launch Parameters
### 5.1 Steam Launch Parameters
- Not supported with the new Arma 3 Launcher
### 4.2 Arma3Sync
### 5.2 Arma3Sync
- Inspect `Addon Options` and verify the `Addon Search Directories` are leading to your Arma 3 folder.
- Return to the `Addons` tab and click `Refresh`.
- Drag and drop `@ace` and `@CBA_A3` from `Available Addons` into the `Addon Groups` list and make sure the checkboxes are ticked.
- Right-click inside `Addon Groups`, click `Create Group` and give it a name.
- Drag and drop `@ace` and `@CBA_A3` from `Available Addons` into the new Group you created inside `Addon Groups` and make sure the checkboxes are ticked.
<img src="{{ site.baseurl }}/img/wiki/user/installation2-a3s.png" width="529" height="222" alt="Arma3Sync Launcher" />
- Click `Start Game`
### 4.3 Play withSIX
### 5.3 Play withSIX