Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace Purista with Roboto - everywhere #3406

Merged
merged 2 commits into from
Feb 25, 2016
Merged

Replace Purista with Roboto - everywhere #3406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f022ed
Replace Purista with Roboto - everywhere, close #3401
jonpas Feb 24, 2016
8f775df
Rename FontCSE macro to FONT_ACE
jonpas Feb 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/common/CfgLocationTypes.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class CfgLocationTypes {
class ACE_HashLocation {
color[] = {0,0,0,0};
drawStyle = "bananas";
font = "PuristaMedium";
font = "RobotoCondensed";
importance = 5;
name = "HashLocation";
shadow = 0;
Expand Down
2 changes: 1 addition & 1 deletion addons/common/HintConfig.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class RscTitles {
y = safeZoneY + 0.2 * safezoneH;
w = 0.2 * safeZoneW;
h = 0.1 * SafeZoneH;
font = "PuristaMedium";
font = "RobotoCondensed";
};
};
};
Expand Down
32 changes: 16 additions & 16 deletions addons/common/define.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,15 @@
// Listbox styles
#define LB_TEXTURES 0x10
#define LB_MULTI 0x20
#define FontCSE "PuristaMedium"
#define FONT_ACE "RobotoCondensed"

class ACE_gui_backgroundBase {
type = CT_STATIC;
idc = -1;
style = ST_PICTURE;
colorBackground[] = {0,0,0,0};
colorText[] = {1, 1, 1, 1};
font = FontCSE;
font = FONT_ACE;
text = "";
sizeEx = 0.032;
};
Expand Down Expand Up @@ -125,7 +125,7 @@ class ACE_gui_editBase
text = "";
size = 0.2;
style = "0x00 + 0x40";
font = "PuristaMedium";
font = "RobotoCondensed";
shadow = 2;
sizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
colorDisabled[] =
Expand Down Expand Up @@ -189,19 +189,19 @@ class ACE_gui_buttonBase {
animTexturePressed = "#(argb,8,8,3)color(1,1,1,1)";
animTextureDefault = "#(argb,8,8,3)color(1,1,1,1)";
period = 0.5;
font = FontCSE;
font = FONT_ACE;
soundClick[] = {"\A3\ui_f\data\sound\RscButton\soundClick",0.09,1};
soundPush[] = {"\A3\ui_f\data\sound\RscButton\soundPush",0.0,0};
soundEnter[] = {"\A3\ui_f\data\sound\RscButton\soundEnter",0.07,1};
soundEscape[] = {"\A3\ui_f\data\sound\RscButton\soundEscape",0.09,1};
class Attributes {
font = FontCSE;
font = FONT_ACE;
color = "#E5E5E5";
align = "center";
shadow = "true";
};
class AttributesImage {
font = FontCSE;
font = FONT_ACE;
color = "#E5E5E5";
align = "left";
shadow = "true";
Expand Down Expand Up @@ -229,7 +229,7 @@ class ACE_gui_staticBase {
w = 0.183825;
h = 0.104575;
style = ST_LEFT;
font = FontCSE;
font = FONT_ACE;
sizeEx = 0.03921;
colorText[] = {0.95, 0.95, 0.95, 1.0};
colorBackground[] = {0, 0, 0, 0};
Expand All @@ -240,7 +240,7 @@ class RscListBox;
class ACE_gui_listBoxBase : RscListBox{
type = CT_LISTBOX;
style = ST_MULTI;
font = FontCSE;
font = FONT_ACE;
sizeEx = 0.03921;
color[] = {1, 1, 1, 1};
colorText[] = {0.543, 0.5742, 0.4102, 1.0};
Expand Down Expand Up @@ -295,7 +295,7 @@ class ACE_gui_listNBox {
style =ST_MULTI;
w = 0.4;
h = 0.4;
font = FontCSE;
font = FONT_ACE;
sizeEx = 0.031;

autoScrollSpeed = -1;
Expand Down Expand Up @@ -375,7 +375,7 @@ class ACE_gui_comboBoxBase: RscCombo {
arrowEmpty = "";
arrowFull = "";
wholeHeight = 0.45;
font = FontCSE;
font = FONT_ACE;
sizeEx = 0.031;
soundSelect[] = {"\A3\ui_f\data\sound\RscCombo\soundSelect",0.1,1};
soundExpand[] = {"\A3\ui_f\data\sound\RscCombo\soundExpand",0.1,1};
Expand Down Expand Up @@ -463,22 +463,22 @@ class ACE_gui_mapBase {
colorGrid[] = {0.1,0.1,0.1,0.6};
colorGridMap[] = {0.1,0.1,0.1,0.6};
colorText[] = {1, 1, 1, 0.85};
font = "PuristaMedium";
font = "RobotoCondensed";
sizeEx = 0.0270000;
stickX[] = {0.20, {"Gamma", 1.00, 1.50} };
stickY[] = {0.20, {"Gamma", 1.00, 1.50} };
onMouseButtonClick = "";
onMouseButtonDblClick = "";

fontLabel = "PuristaMedium";
fontLabel = "RobotoCondensed";
sizeExLabel = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
fontGrid = "TahomaB";
sizeExGrid = 0.02;
fontUnits = "TahomaB";
sizeExUnits = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
fontNames = "PuristaMedium";
fontNames = "RobotoCondensed";
sizeExNames = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8) * 2";
fontInfo = "PuristaMedium";
fontInfo = "RobotoCondensed";
sizeExInfo = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
fontLevel = "TahomaB";
sizeExLevel = 0.02;
Expand All @@ -493,7 +493,7 @@ onMouseButtonDblClick = "";
y = "SafeZoneY + safezoneH - 4.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
w = "10 * ( ((safezoneW / safezoneH) min 1.2) / 40)";
h = "3.5 * ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
font = "PuristaMedium";
font = "RobotoCondensed";
sizeEx = "( ( ( ((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.8)";
colorBackground[] = {1,1,1,0.5};
color[] = {0,0,0,1};
Expand Down Expand Up @@ -787,4 +787,4 @@ onMouseButtonDblClick = "";
};
};

#endif
#endif
8 changes: 4 additions & 4 deletions addons/dagr/Dialog.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@
// Listbox styles
#define LB_TEXTURES 0x10
#define LB_MULTI 0x20
#define FontM "PuristaMedium"
#define FontM "RobotoCondensed"

class RscText;

class DAGR_Button {
idc = -1;
type = CT_BUTTON;
style = ST_LEFT;
font = "PuristaMedium";
font = "RobotoCondensed";
sizeEx = 0.02;
colorText[] = { 0, 1, 0, 1 };
colorFocused[] = { 0, 0, 0, 0 }; // border color for focused state
Expand Down Expand Up @@ -116,7 +116,7 @@ class DAGR_Menu_Pic {
text = "";
colorBackground[] = {};
colorText[] = {};
font = "PuristaMedium";
font = "RobotoCondensed";
sizeEx = 0.04;
waitForLoad = 0;
};
Expand All @@ -131,7 +131,7 @@ class DAGR_Menu_Text {
h = 0.15;
colorBackground[] = { 0, 0, 0, 0 };
colorText[] = { 0.239, 0.216, 0.153, 1 };
font = "PuristaMedium";
font = "RobotoCondensed";
sizeEx = 0.03;
waitForLoad = 0;
text = "";
Expand Down
4 changes: 2 additions & 2 deletions addons/dagr/RscTitles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class RscTitles {
text = "";
colorBackground[] = { 0, 0, 0, 0 };
colorText[] = { 0.239, 0.216, 0.153, 1 };
font = "PuristaMedium";
font = "RobotoCondensed";
sizeEx = 0.04;
waitForLoad = 0;
};
Expand All @@ -25,7 +25,7 @@ class RscTitles {
text = "";
colorBackground[] = {};
colorText[] = {};
font = "PuristaMedium";
font = "RobotoCondensed";
sizeEx = 0.02;
waitForLoad = 0;
};
Expand Down
2 changes: 1 addition & 1 deletion addons/finger/functions/fnc_perFrameEH.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ _iconSize = BASE_SIZE * _fovCorrection;
_drawColor set [3, ((_drawColor select 3) * (_timeLeftToShow / 0.5))];
};

drawIcon3D [QUOTE(PATHTOF(UI\fp_icon2.paa)), _drawColor, _pos, _iconSize, _iconSize, 0, _name, 1, 0.03, "PuristaMedium"];
drawIcon3D [QUOTE(PATHTOF(UI\fp_icon2.paa)), _drawColor, _pos, _iconSize, _iconSize, 0, _name, 1, 0.03, "RobotoCondensed"];
};
} count (GVAR(fingersHash) select 0);

Expand Down
2 changes: 1 addition & 1 deletion addons/frag/functions/fnc_drawTraces.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ private ["_color", "_index", "_lastPos", "_lastSpd", "_max", "_positions", "_sta
_lastPos = _pos2;
_lastSpd = _data1 select 1;
};
// drawIcon3D ["", [1,0,0,1], _lastPos, 0, 0, 0, format["%1m/s", _lastSpd], 1, 0.05, "PuristaMedium"];
// drawIcon3D ["", [1,0,0,1], _lastPos, 0, 0, 0, format["%1m/s", _lastSpd], 1, 0.05, "RobotoCondensed"];
} forEach GVAR(traces);
32 changes: 16 additions & 16 deletions addons/goggles/define.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@
////////////////

class RscPicture {
access = 0;
idc = -1;
type = CT_STATIC;
style = ST_PICTURE;
colorBackground[] = {0,0,0,0};
colorText[] = {1,1,1,1};
font = "puristaMedium";
sizeEx = 0;
lineSpacing = 0;
fixedWidth = 0;
shadow = 0;
text = "";
x = safezoneX;
y = safezoneY;
w = safezoneW;
h = safezoneH;
access = 0;
idc = -1;
type = CT_STATIC;
style = ST_PICTURE;
colorBackground[] = {0,0,0,0};
colorText[] = {1,1,1,1};
font = "RobotoCondensed";
sizeEx = 0;
lineSpacing = 0;
fixedWidth = 0;
shadow = 0;
text = "";
x = safezoneX;
y = safezoneY;
w = safezoneW;
h = safezoneH;
};
4 changes: 2 additions & 2 deletions addons/huntir/Dialog.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
#define ST_TILE_PICTURE 144
#define ST_WITH_RECT 160
#define ST_LINE 176
#define FontM "PuristaMedium"
#define FontM "RobotoCondensed"
#define __XA SafeZoneXAbs
#define __X SafeZoneX
#define __Y SafeZoneY
Expand Down Expand Up @@ -146,7 +146,7 @@ class ace_huntir_cam_dialog {
style = 48;
colorText[ ]={ 1,1,1,1 };
colorBackground[ ]={ 0.4,0.4,0.4,1 };
font = "PuristaMedium";
font = "RobotoCondensed";
sizeEx = 0.021;
lineSpacing = 1;
x = __X;
Expand Down
4 changes: 2 additions & 2 deletions addons/huntir/RscTitles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class RscTitles {
idc = 64432;
style = 0;
x = 0.497;y = 0.297;w = 0.2;h = 0.2;
font = "PuristaMedium";
font = "RobotoCondensed";
sizeEx = __FONTHEIGHT;
colorText[] = {1, 1, 1, 1};
colorBackground[]={0,0,0,0};
Expand All @@ -38,4 +38,4 @@ class RscTitles {
};
};
};
};
};
2 changes: 1 addition & 1 deletion addons/interaction/RscTitles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class ACE_Interaction_Button_Base {
access = 0;
type = 1;
text = "";
font = "PuristaMedium";
font = "RobotoCondensed";
sizeEx = "0.8 / 40 / (getResolution select 5)";
shadow = 2;

Expand Down
2 changes: 1 addition & 1 deletion addons/map/MapTweaks.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class Tree {
class Legend {
x = SafeZoneX+SafeZoneW-.340;
y = SafeZoneY+SafeZoneH-.152;
font = "PuristaMedium";
font = "RobotoCondensed";
w = .340;
h = .152;
sizeEx = 0.039210;
Expand Down
2 changes: 1 addition & 1 deletion addons/map_gestures/functions/fnc_drawMapGestures.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#define ICON_TEXT_ALIGN "left"
#define ICON_ANGLE 0
#define ICON_SHADOW 1
#define TEXT_FONT "PuristaBold"
#define TEXT_FONT "RobotoCondensedBold"
#define TEXT_ICON_RENDER_SIZE 20
#define TEXT_SIZE 0.030
#define TEXT_SHADOW 0
Expand Down
4 changes: 2 additions & 2 deletions addons/medical/ui/RscTitles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class Rsctitles {
h = "0.7 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.7)";
style = 0x00 + 0x100; // ST_LEFT + ST_SHADOW
font = "PuristaMedium";
font = "RobotoCondensed";
colorText[] = {0.95, 0.95, 0.95, 0.75};
colorBackground[] = {"(profilenamespace getVariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getVariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getVariable ['GUI_BCG_RGB_B',0.5])", "(profilenamespace getVariable ['GUI_BCG_RGB_A',0.9])"};
text = CSTRING(Injuries);
Expand Down Expand Up @@ -103,7 +103,7 @@ class Rsctitles {
h = "0.7 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.7)";
style = 0x00 + 0x100; // ST_LEFT + ST_SHADOW
font = "PuristaMedium";
font = "RobotoCondensed";
colorText[] = {0.95, 0.95, 0.95, 0.75};
colorBackground[] = {0,0,0,0.9};
text = "";
Expand Down
6 changes: 3 additions & 3 deletions addons/medical/ui/triagecard.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class GVAR(triageCard) {
w = "15 * (((safezoneW / safezoneH) min 1.2) / 40)";
h = "19 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
style = ST_LEFT + ST_SHADOW;
font = "PuristaMedium";
font = "RobotoCondensed";
SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
colorText[] = {0.0, 0.0, 0.0, 1};
colorBackground[] = {1,1,1,1};
Expand All @@ -26,7 +26,7 @@ class GVAR(triageCard) {
y = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) + (safezoneY + (safezoneH - (((safezoneW / safezoneH) min 1.2) / 1.2))/2)";
w = "5 * (((safezoneW / safezoneH) min 1.2) / 40)";
h = "5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
font = "PuristaMedium";
font = "RobotoCondensed";
SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
colorText[] = {1,1,0,1};
colorBackground[] = {0,0,0,0};
Expand All @@ -46,7 +46,7 @@ class GVAR(triageCard) {
h = "0.7 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 0.7)";
style = 0x02 + 0x100; // ST_LEFT + ST_SHADOW
font = "PuristaMedium";
font = "RobotoCondensed";
colorText[] = {0,0,0,1};
colorBackground[] = {0,0,0,0};
text = CSTRING(Actions_TriageCard);
Expand Down
2 changes: 1 addition & 1 deletion addons/medical_menu/ui/menu.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class GVAR(medicalMenu) {
w = "38 * (((safezoneW / safezoneH) min 1.2) / 40)";
h = "1 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
style = ST_LEFT + ST_SHADOW;
font = "PuristaMedium";
font = "RobotoCondensed";
SizeEx = "(((((safezoneW / safezoneH) min 1.2) / 1.2) / 25) * 1)";
colorText[] = {0.95, 0.95, 0.95, 0.75};
colorBackground[] = {"(profilenamespace getVariable ['GUI_BCG_RGB_R',0.69])","(profilenamespace getVariable ['GUI_BCG_RGB_G',0.75])","(profilenamespace getVariable ['GUI_BCG_RGB_B',0.5])", "(profilenamespace getVariable ['GUI_BCG_RGB_A',0.9])"};
Expand Down
2 changes: 1 addition & 1 deletion addons/nametags/functions/fnc_drawNameTagIcon.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ _fnc_parameters = {
_name,
2,
(0.05 * _scale),
"PuristaMedium"
"RobotoCondensed"
]
};

Expand Down
2 changes: 1 addition & 1 deletion addons/optionsmenu/gui/define.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,6 @@ class RscText;
// Listbox styles
#define LB_TEXTURES 0x10
#define LB_MULTI 0x20
#define FontCSE "PuristaMedium"
#define FontCSE "RobotoCondensed"

#endif
Loading