Skip to content

Commit

Permalink
Merge pull request #435 from jonpas/eol-lf
Browse files Browse the repository at this point in the history
Convert to LF line endings
  • Loading branch information
Killswitch00 authored Jul 14, 2016
2 parents 0b40642 + 1a76b36 commit 64034f5
Show file tree
Hide file tree
Showing 283 changed files with 22,013 additions and 21,997 deletions.
12 changes: 12 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true
charset = utf-8
indent_style = space
indent_size = 4
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false
4 changes: 4 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
* text=auto
*.png binary
*.jpg binary
*.paa binary
36 changes: 18 additions & 18 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
release/*
*.cache
*.pbo
texHeaders.bin
*.swp
*.swo
*.biprivatekey
Thumbs.db
*.log
/store/function_library/*
/store/wiki/*

*.7z

/addons/CBA_Project.sublime-workspace

*~
*#
release/*
*.cache
*.pbo
texHeaders.bin
*.swp
*.swo
*.biprivatekey
Thumbs.db
*.log
/store/function_library/*
/store/wiki/*

*.7z

/addons/CBA_Project.sublime-workspace

*~
*#
112 changes: 56 additions & 56 deletions addons/ai/CfgFunctions.hpp
Original file line number Diff line number Diff line change
@@ -1,56 +1,56 @@
// -----------------------------------------------------------------------------
// Automatically generated by 'functions_config.rb'
// DO NOT MANUALLY EDIT THIS FILE!
// -----------------------------------------------------------------------------

class CfgFunctions
{
class CBA
{
class Ai
{
// CBA_fnc_addWaypoint
class addWaypoint
{
description = "A function used to add a waypoint to a group. Parameters: - Group (Group or Object) - Position (XYZ, Object, Location or Group) Optional: - Radius (Scalar) - Waypoint Type (String) - Behaviour (String) - Combat Mode (String) - Speed Mode (String) - Formation (String) - Code To Execute at Each Waypoint (String) - TimeOut at each Waypoint (Array [Min, Med, Max]) - Waypoint Completion Radius (Scalar) Example: [this, this, 300, ""MOVE"", ""AWARE"", ""YELLOW"", ""FULL"", ""STAG COLUMN"", ""this spawn CBA_fnc_searchNearby"", [3,6,9]] Returns: Waypoint Author: Rommel";
file = "\x\cba\addons\ai\fnc_addWaypoint.sqf";
};
// CBA_fnc_clearWaypoints
class clearWaypoints
{
description = "A function used to correctly clear all waypoints from a group.";
file = "\x\cba\addons\ai\fnc_clearWaypoints.sqf";
};
// CBA_fnc_searchNearby
class searchNearby
{
description = "A function for a group to search a nearby building. Parameters: Group (Group or Object) Example: [group player] spawn CBA_fnc_searchNearby Returns: Nil Author: Rommel";
file = "\x\cba\addons\ai\fnc_searchNearby.sqf";
};
// CBA_fnc_taskAttack
class taskAttack
{
description = "A function for a group to attack a parsed location. Parameters: - Group (Group or Object) - Position (XYZ, Object, Location or Group) Optional: - Search Radius (Scalar) Example: [group player, getpos (player findNearestEnemy player), 100] call CBA_fnc_taskAttack Returns: Nil Author: Rommel";
file = "\x\cba\addons\ai\fnc_taskAttack.sqf";
};
// CBA_fnc_taskDefend
class taskDefend
{
description = "A function for a group to defend a parsed location. Groups will mount nearby static machine guns, and bunker in nearby buildings. They may also patrol the radius unless otherwise specified. Parameters: - Group (Group or Object) Optional: - Position (XYZ, Object, Location or Group) - Defend Radius (Scalar) - Building Size Threshold (Integer, default 2) - Can patrol (boolean) Example: [this] call CBA_fnc_taskDefend Returns: Nil Author: Rommel";
file = "\x\cba\addons\ai\fnc_taskDefend.sqf";
};
// CBA_fnc_taskPatrol
class taskPatrol
{
description = "A function for a group to randomly patrol a parsed radius and location. Parameters: - Group (Group or Object) Optional: - Position (XYZ, Object, Location or Group) - Radius (Scalar) - Waypoint Count (Scalar) - Waypoint Type (String) - Behaviour (String) - Combat Mode (String) - Speed Mode (String) - Formation (String) - Code To Execute at Each Waypoint (String) - TimeOut at each Waypoint (Array [Min, Med, Max]) Example: [this, getmarkerpos ""objective1""] call CBA_fnc_taskPatrol [this, this, 300, 7, ""MOVE"", ""AWARE"", ""YELLOW"", ""FULL"", ""STAG COLUMN"", ""this spawn CBA_fnc_searchNearby"", [3,6,9]] call CBA_fnc_taskPatrol;";
file = "\x\cba\addons\ai\fnc_taskPatrol.sqf";
};
// CBA_fnc_taskSearchArea
class taskSearchArea
{
description = "A function used to have AI search a given marker or trigger area indefinitely. Includes random building searches.";
file = "\x\cba\addons\ai\fnc_taskSearchArea.sqf";
};
};
};
};
// -----------------------------------------------------------------------------
// Automatically generated by 'functions_config.rb'
// DO NOT MANUALLY EDIT THIS FILE!
// -----------------------------------------------------------------------------

class CfgFunctions
{
class CBA
{
class Ai
{
// CBA_fnc_addWaypoint
class addWaypoint
{
description = "A function used to add a waypoint to a group. Parameters: - Group (Group or Object) - Position (XYZ, Object, Location or Group) Optional: - Radius (Scalar) - Waypoint Type (String) - Behaviour (String) - Combat Mode (String) - Speed Mode (String) - Formation (String) - Code To Execute at Each Waypoint (String) - TimeOut at each Waypoint (Array [Min, Med, Max]) - Waypoint Completion Radius (Scalar) Example: [this, this, 300, ""MOVE"", ""AWARE"", ""YELLOW"", ""FULL"", ""STAG COLUMN"", ""this spawn CBA_fnc_searchNearby"", [3,6,9]] Returns: Waypoint Author: Rommel";
file = "\x\cba\addons\ai\fnc_addWaypoint.sqf";
};
// CBA_fnc_clearWaypoints
class clearWaypoints
{
description = "A function used to correctly clear all waypoints from a group.";
file = "\x\cba\addons\ai\fnc_clearWaypoints.sqf";
};
// CBA_fnc_searchNearby
class searchNearby
{
description = "A function for a group to search a nearby building. Parameters: Group (Group or Object) Example: [group player] spawn CBA_fnc_searchNearby Returns: Nil Author: Rommel";
file = "\x\cba\addons\ai\fnc_searchNearby.sqf";
};
// CBA_fnc_taskAttack
class taskAttack
{
description = "A function for a group to attack a parsed location. Parameters: - Group (Group or Object) - Position (XYZ, Object, Location or Group) Optional: - Search Radius (Scalar) Example: [group player, getpos (player findNearestEnemy player), 100] call CBA_fnc_taskAttack Returns: Nil Author: Rommel";
file = "\x\cba\addons\ai\fnc_taskAttack.sqf";
};
// CBA_fnc_taskDefend
class taskDefend
{
description = "A function for a group to defend a parsed location. Groups will mount nearby static machine guns, and bunker in nearby buildings. They may also patrol the radius unless otherwise specified. Parameters: - Group (Group or Object) Optional: - Position (XYZ, Object, Location or Group) - Defend Radius (Scalar) - Building Size Threshold (Integer, default 2) - Can patrol (boolean) Example: [this] call CBA_fnc_taskDefend Returns: Nil Author: Rommel";
file = "\x\cba\addons\ai\fnc_taskDefend.sqf";
};
// CBA_fnc_taskPatrol
class taskPatrol
{
description = "A function for a group to randomly patrol a parsed radius and location. Parameters: - Group (Group or Object) Optional: - Position (XYZ, Object, Location or Group) - Radius (Scalar) - Waypoint Count (Scalar) - Waypoint Type (String) - Behaviour (String) - Combat Mode (String) - Speed Mode (String) - Formation (String) - Code To Execute at Each Waypoint (String) - TimeOut at each Waypoint (Array [Min, Med, Max]) Example: [this, getmarkerpos ""objective1""] call CBA_fnc_taskPatrol [this, this, 300, 7, ""MOVE"", ""AWARE"", ""YELLOW"", ""FULL"", ""STAG COLUMN"", ""this spawn CBA_fnc_searchNearby"", [3,6,9]] call CBA_fnc_taskPatrol;";
file = "\x\cba\addons\ai\fnc_taskPatrol.sqf";
};
// CBA_fnc_taskSearchArea
class taskSearchArea
{
description = "A function used to have AI search a given marker or trigger area indefinitely. Includes random building searches.";
file = "\x\cba\addons\ai\fnc_taskSearchArea.sqf";
};
};
};
};
32 changes: 16 additions & 16 deletions addons/ai/config.cpp
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#include "script_component.hpp"

class CfgPatches {
class ADDON {
author = "$STR_CBA_Author";
name = CSTRING(component);
url = "$STR_CBA_URL";
units[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"CBA_common"};
version = VERSION;
authors[] = {"Rommel"};
};
};

#include "CfgFunctions.hpp"
#include "script_component.hpp"

class CfgPatches {
class ADDON {
author = "$STR_CBA_Author";
name = CSTRING(component);
url = "$STR_CBA_URL";
units[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"CBA_common"};
version = VERSION;
authors[] = {"Rommel"};
};
};

#include "CfgFunctions.hpp"
126 changes: 63 additions & 63 deletions addons/ai/fnc_addWaypoint.sqf
Original file line number Diff line number Diff line change
@@ -1,63 +1,63 @@
/* ----------------------------------------------------------------------------
Function: CBA_fnc_addWaypoint
Description:
A function used to add a waypoint to a group.
Parameters:
- Group (Group or Object)
- Position (XYZ, Object, Location or Group)
Optional:
- Radius (Scalar)
- Waypoint Type (String)
- Behaviour (String)
- Combat Mode (String)
- Speed Mode (String)
- Formation (String)
- Code To Execute at Each Waypoint (String)
- TimeOut at each Waypoint (Array [Min, Med, Max])
- Waypoint Completion Radius (Scalar)
Example:
(begin example)
[this, this, 300, "MOVE", "AWARE", "YELLOW", "FULL", "STAG COLUMN", "this spawn CBA_fnc_searchNearby", [3,6,9]] call CBA_fnc_addWaypoint
(end)
Returns:
Waypoint
Author:
Rommel
---------------------------------------------------------------------------- */
#include "script_component.hpp"
params [
"_group",
"_position",
["_radius", 0, [0]],
["_type", "MOVE", [""]],
["_behaviour", "UNCHANGED", [""]],
["_combat", "NO CHANGE", [""]],
["_speed", "UNCHANGED", [""]],
["_formation", "NO CHANGE", [""]],
["_onComplete", "", [""]],
["_timeout", [0,0,0], [[]], 3],
["_compRadius", 0, [0]]
];
_group = _group call CBA_fnc_getGroup;
_position = _position call CBA_fnc_getPos;

private ["_waypoint"];
_waypoint = _group addWaypoint [_position, _radius];

_waypoint setWaypointType _type;
_waypoint setWaypointBehaviour _behaviour;
_waypoint setWaypointCombatMode _combat;
_waypoint setWaypointSpeed _speed;
_waypoint setWaypointFormation _formation;
_waypoint setWaypointStatements ["TRUE", _onComplete];
_waypoint setWaypointTimeout _timeout;
_waypoint setWaypointCompletionRadius _compRadius;

_waypoint
/* ----------------------------------------------------------------------------
Function: CBA_fnc_addWaypoint
Description:
A function used to add a waypoint to a group.
Parameters:
- Group (Group or Object)
- Position (XYZ, Object, Location or Group)
Optional:
- Radius (Scalar)
- Waypoint Type (String)
- Behaviour (String)
- Combat Mode (String)
- Speed Mode (String)
- Formation (String)
- Code To Execute at Each Waypoint (String)
- TimeOut at each Waypoint (Array [Min, Med, Max])
- Waypoint Completion Radius (Scalar)
Example:
(begin example)
[this, this, 300, "MOVE", "AWARE", "YELLOW", "FULL", "STAG COLUMN", "this spawn CBA_fnc_searchNearby", [3,6,9]] call CBA_fnc_addWaypoint
(end)
Returns:
Waypoint
Author:
Rommel
---------------------------------------------------------------------------- */
#include "script_component.hpp"
params [
"_group",
"_position",
["_radius", 0, [0]],
["_type", "MOVE", [""]],
["_behaviour", "UNCHANGED", [""]],
["_combat", "NO CHANGE", [""]],
["_speed", "UNCHANGED", [""]],
["_formation", "NO CHANGE", [""]],
["_onComplete", "", [""]],
["_timeout", [0,0,0], [[]], 3],
["_compRadius", 0, [0]]
];
_group = _group call CBA_fnc_getGroup;
_position = _position call CBA_fnc_getPos;

private ["_waypoint"];
_waypoint = _group addWaypoint [_position, _radius];

_waypoint setWaypointType _type;
_waypoint setWaypointBehaviour _behaviour;
_waypoint setWaypointCombatMode _combat;
_waypoint setWaypointSpeed _speed;
_waypoint setWaypointFormation _formation;
_waypoint setWaypointStatements ["TRUE", _onComplete];
_waypoint setWaypointTimeout _timeout;
_waypoint setWaypointCompletionRadius _compRadius;

_waypoint
Loading

0 comments on commit 64034f5

Please sign in to comment.