Commit 9fb06da7 authored by Jan Speichert's avatar Jan Speichert
Browse files

Update, userconfig eventually deleted

parent d0472549
#define MAJOR 1
#define MINOR 0
#define PATCHLVL 0
#define BUILD 95
#define BUILDDATE 2015-10-06 22:01:48.236000
\ No newline at end of file
#define PATCHLVL 1
#define BUILD 3
#define BUILDDATE 2016-01-28 15:39:38.822000
\ No newline at end of file
#include "script_component.hpp"
#include "\userconfig\sol_clearhud\usersettings.hpp"
//For each client, register the keybind
[] call CALLSTACK(FUNC(registerKeybind));
//deactivate the chat by default in MP and assign it to a handle
if (isMultiplayer) then {
if(sol_clearhud_nochat) then{
if (isMultiplayer && GVAR(activated)) then {
GVAR(handle) = [{clearRadio;}, 0, []] call CBA_fnc_addPerFrameHandler;
GVAR(activated) = true;
hint parseText "Chat <t color='#ff0000'>disabled</t>";
};
};
\ No newline at end of file
......@@ -11,7 +11,7 @@ NO_DEDICATED;
//Define a global variable, chat deactivated by default
if(isNil QGVAR(activated)) then {
GVAR(activated) = false;
GVAR(activated) = true;
};
ADDON = true;
\ No newline at end of file
sol\clearhud\addons\w_buttons
class CfgFunctions
{
class SOL
{
class w_buttons
{
class initOnGameStart
{
// SOL_fnc_Wbuttons_initOnGameStart
file = "\sol\clearhud\addons\w_buttons\Wbuttons_initOnGameStart.sqf";
preStart = 1;
};
};
};
};
\ No newline at end of file
class RscTitle;
class RscShortcutButton;
class RscButtonMenu;
class RscStandardDisplay;
class RscDisplayMain: RscStandardDisplay
{
//onLoad = "[""onLoad"",_this,""RscDisplayMain"",'GUI'] call (uinamespace getvariable 'BIS_fnc_initDisplay');";
//onLoad = QUOTE([ARR_4('onLoad',_this,'RscDisplayMain','GUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); _this execVM QUOTE(QUOTE(PATHTOF(script_initMainMenu.sqf))););
onMouseMoving = QUOTE(_this execVM QUOTE(QUOTE(PATHTOF(script_initMainMenu.sqf))););
class controlsBackground
{
class W_Title: RscTitle
{
idc = -1;
text = "GruppeW Server";
x = "25 * ( ((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX)";
y = "2.9 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + safezoneH - ( ((safezoneW / safezoneH) min 1.2) / 1.2))";
w = "12 * ( ((safezoneW / safezoneH) min 1.2) / 40)";
h = "1 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
colorBackground[] = {0.25,0.6,1,0.8};
};
};
class controls
{
class ButtonW_Baugrube: RscButtonMenu
{
idc = 11380;
onbuttonclick = QUOTE(_this execVM QUOTE(QUOTE(PATHTOF(script_handleWButtons.sqf))));
text = "Baugrube";
x = "25 * ( ((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX)";
y = "10.3 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + safezoneH - ( ((safezoneW / safezoneH) min 1.2) / 1.2))";
w = "12 * ( ((safezoneW / safezoneH) min 1.2) / 40)";
h = "2 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
tooltip = "Baugrube joinen";
colorBackground[] = {0,0,0.1,0.8};
};
class ButtonW_Server1: RscButtonMenu
{
idc = 11381;
onbuttonclick = QUOTE(_this execVM QUOTE(QUOTE(PATHTOF(script_handleWButtons.sqf))));
text = "Server #1";
x = "25 * ( ((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX)";
y = "4 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + safezoneH - ( ((safezoneW / safezoneH) min 1.2) / 1.2))";
w = "12 * ( ((safezoneW / safezoneH) min 1.2) / 40)";
h = "2 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
tooltip = "Server #1 joinen";
colorBackground[] = {0,0,0.1,0.8};
};
class ButtonW_Server2: RscButtonMenu
{
idc = 11382;
onbuttonclick = QUOTE(_this execVM QUOTE(QUOTE(PATHTOF(script_handleWButtons.sqf))));
text = "Server #2";
x = "25 * ( ((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX)";
y = "6.1 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + safezoneH - ( ((safezoneW / safezoneH) min 1.2) / 1.2))";
w = "12 * ( ((safezoneW / safezoneH) min 1.2) / 40)";
h = "2 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
tooltip = "Server #2 joinen";
colorBackground[] = {0,0,0.1,0.8};
};
class ButtonW_ServerT: RscButtonMenu
{
idc = 11383;
onbuttonclick = QUOTE(_this execVM QUOTE(QUOTE(PATHTOF(script_handleWButtons.sqf))));
text = "Testserver";
x = "25 * ( ((safezoneW / safezoneH) min 1.2) / 40) + (safezoneX)";
y = "8.2 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + safezoneH - ( ((safezoneW / safezoneH) min 1.2) / 1.2))";
w = "12 * ( ((safezoneW / safezoneH) min 1.2) / 40)";
h = "2 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
tooltip = "Testserver joinen";
colorBackground[] = {0,0,0.1,0.8};
};
};
};
class RscDisplayModLauncher: RscStandardDisplay
{
onMouseMoving = QUOTE(_this execVM QUOTE(QUOTE(PATHTOF(script_test.sqf))););
};
\ No newline at end of file
#include "script_component.hpp"
class CfgPatches
{
class ADDON
{
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"clearhud_main"};
version = VERSION;
author[] = {"Soldia"};
authorUrl = URL;
};
};
PRELOAD_ADDONS;
#include "RscDisplayMain.hpp"
//#include "CfgFunctions.hpp"
\ No newline at end of file
#define COMPONENT w_buttons
#include "\sol\clearhud\addons\main\script_mod.hpp"
// #define DEBUG_MODE_FULL
#include "\sol\clearhud\addons\main\script_macros.hpp"
\ No newline at end of file
/*
* Author: Soldia
* Handles Presses for Server-Buttons
*
* Arguments:
* 0: Display (from onLoad) <DISPLAY>
*
* Return Value:
* None
*
* Example:
* (findDisplay 0) execVM "script_loadWButtons.sqf";
*
* Public: No
*/
//#include "script_component.hpp"
disableSerialization;
#define CONTROL(display,ctrl) ((findDisplay display) displayCtrl ctrl)
//diag_log format ["%1", _this];
params ["_control"];
private ["_ipaddress","_port","_starttime","_serverfound"];
// Select IP and Port depending on Button
switch (ctrlIDC _control) do
{
case 11380:
{
_ipaddress = "5.9.37.16";
_port = "2353";
};
case 11381:
{
_ipaddress = "188.40.117.141";
_port = "2303";
};
case 11382:
{
_ipaddress = "5.9.37.16";
_port = "2313";
};
case 11383:
{
_ipaddress = "5.9.37.16";
_port = "2333";
};
default
{
_ipaddress = "188.40.117.141";
_port = "2303";
};
};
//-> MP IDD
ctrlActivate CONTROL(0,105);
waitUntil {!(isNull (findDisplay 8))};
//-> IP IDD
ctrlActivate CONTROL(8,103);
waitUntil {!(isNull (findDisplay 19))};
//-> Input of IP and Port
CONTROL(19,101) ctrlSetText _ipaddress;
CONTROL(19,102) ctrlSetText _port;
ctrlActivate CONTROL(19,1);
// Set Start Time and Serverfound Variable
_starttime = diag_tickTime;
_serverfound = false;
// Wait until any server is found
waitUntil {
//If we waited for more than 10 seconds, quit
if(diag_tickTime > (_starttime + 10000)) exitWith {
_serverfound = false
};
if(lbSize (CONTROL(8,102)) > 1) then {
_serverfound = true;
};
_serverfound
};
// If we got a server, join
if(_serverfound) then {
CONTROL(8,102) lbSetCurSel 0;
uiSleep 0.1;
if((ctrlText (CONTROL(8,129)) find "W") < 10) then {
if(ctrlEnabled CONTROL(8,105)) then {
ctrlActivate CONTROL(8,105);
};
};
};
\ No newline at end of file
/*
* Author: Soldia
* Configures all W Buttons
*
* Arguments:
* None
*
* Return Value:
* None
*
* Example:
* --
*
* Public: No
*/
//#include "script_component.hpp"
#define CONTROL(display,ctrl) ((findDisplay display) displayCtrl ctrl)
private ["_testserver"];
waitUntil {!isNull (findDisplay 0)};
//disableSerialization;
diag_log "Hallo";
diag_log format ["%1", ctrlType CONTROL(0,139)];
_testserver = isClass (configFile >> "CfgPatches" >> "Ares");
if (_testserver) then {
CONTROL(0,11380) ctrlEnable false;
CONTROL(0,11381) ctrlEnable false;
CONTROL(0,11382) ctrlEnable false;
} else {
CONTROL(0,11383) ctrlEnable false;
};
\ No newline at end of file
/*
* Author: Soldia
* Configures all W Buttons
*
* Arguments:
* None
*
* Return Value:
* None
*
* Example:
* --
*
* Public: No
*/
//#include "script_component.hpp"
#define CONTROL(display,ctrl) ((findDisplay display) displayCtrl ctrl)
private ["_testserver"];
waitUntil {!isNull (findDisplay 157)};
//disableSerialization;
diag_log "Hallo";
diag_log format ["%1", allControls (findDisplay 157)];
95
\ No newline at end of file
3
\ No newline at end of file
......@@ -35,7 +35,7 @@ buildNumber = int(buildNumber) + 1
platform = "arma3"
major = 1
minor = 0
subminor = 0
subminor = 1
buildmode = "Release"
stringVer = "%s_%s_%s_%s" %(major, minor, subminor, buildNumber)
......
1.0.0.95
\ No newline at end of file
1.0.1.3
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment