Skip to content
This repository has been archived by the owner on Nov 30, 2024. It is now read-only.

Commit

Permalink
UI-Changes
Browse files Browse the repository at this point in the history
  • Loading branch information
BlaiZephyr committed Dec 10, 2023
1 parent dd546e5 commit d6c9bfd
Show file tree
Hide file tree
Showing 10 changed files with 67 additions and 21 deletions.
48 changes: 43 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,50 @@
[![DDraceNetwork](https://cdn.discordapp.com/attachments/1056897504211370004/1176966640504676486/gui_logo.png?ex=6570ca9a&is=655e559a&hm=0d179414b9c0859fe17bd1d34279119cb1145fc47f490c2f333c1b49b344cf76&)](https://ddnet.org) [![](https://github.com/ddnet/ddnet/workflows/Build/badge.svg)](https://github.com/ddnet/ddnet/actions?query=workflow%3ABuild+event%3Apush+branch%3Amaster) [![](https://codecov.io/gh/ddnet/ddnet/branch/master/graph/badge.svg)](https://codecov.io/gh/ddnet/ddnet/branch/master)

Extended ddnet client with some new futures
![StA](https://cdn.discordapp.com/attachments/1141459005395435692/1182843102864613446/gui_logo.png?ex=65862b7b&is=6573b67b&hm=dc7a2bd1b5b33cc503dbcbfff79c30fd5e36416eef959131be912637e712b0f2&)

Instalation
-------
### What is StA?

Download the exe from [Discord server](https://discord.gg/MratBSWsMP), or build it using the build instuctions from the main repository.
Then put the .exe file (or replace) with DDNet.exe into DDNet folder
StA client is extended version of DDNet client that have more in game futures, custom color etc.
![FUTURES](https://cdn.discordapp.com/attachments/1056897504211370004/1182862820619059280/FEATURES.png?ex=65863dd8&is=6573c8d8&hm=c4c6dcb8fdde981a0c0f8d1cb7f04b47f64535a167f1f885371321bfe4712020&)

- ✅Auto login on specific DDNet and KoG Servers (GER10 for DDNet | GER3 for KoG)
- ✅Better animation using LERP
- ✅Custom colors for console(with opacity settings)

![png](https://i.imgur.com/QAPSvSr.png)

- ✅Custom colors in TAB

![png](https://i.imgur.com/A9wGGtb.png)
- ✅PlayerAssets(Profiles from T-Client)
![png](https://i.imgur.com/agtBLGU.jpeg)
- ✅BindWheel that allows you use command and bind just using command circle

![png](https://i.imgur.com/VZ0htwS.png)
![png](https://i.imgur.com/yUMwSMe.png)
![png](https://i.imgur.com/WP5ksYI.png)

- ✅Better tee display, so you can see how many peoples are frozen while playing in team

![png](https://i.imgur.com/Ml3TyBZ.png)
![png](https://i.imgur.com/FoVW4Ho.png)

- ✅ STA TAB in Controls

![png](https://i.imgur.com/w0dnoJQ.png)


![SourseCode](https://cdn.discordapp.com/attachments/1056897504211370004/1182861395306479766/SC.png?ex=65863c85&is=6573c785&hm=de8d52675f98e4be84eb1784734f8f950bbecea0acc63649b585a2be1c7c0b16&)
## If you wish to get the game source code WRITE TO ME BY FOLLOWING LINKS
[Discord](https://discordapp.com/users/479926515908214795) or send me friend request - **stormaxd**
Telegram - @StormArq

![instal](https://cdn.discordapp.com/attachments/1056897504211370004/1182862820161892403/INSTALL.png?ex=65863dd8&is=6573c8d8&hm=584ca3907f28a8c792267748108e4c8fcd78c530b4c3a9aa80b993c37c30aa73&)

You can download client by using ~~Download Link~~ or [Release link](https://github.com/StormAxs/StA-Extended-DDNet-Client/releases)


_Download the exe from [Discord server](https://discord.gg/MratBSWsMP)_



Expand Down
Binary file modified data/gui_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/menuimages/demos.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/menuimages/editor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/menuimages/local_server.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/menuimages/play_game.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified data/menuimages/settings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified other/icons/DDNet.ico
Binary file not shown.
9 changes: 6 additions & 3 deletions src/game/client/components/menus_settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1300,6 +1300,7 @@ void CMenus::DoJoystickBar(const CUIRect *pRect, float Current, float Tolerance,
Handle.Draw(SliderColor, IGraphics::CORNER_ALL, Handle.h / 2.0f);
}


void CMenus::RenderSettingsControls(CUIRect MainView)
{
// this is kinda slow, but whatever
Expand Down Expand Up @@ -1490,13 +1491,14 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
DoSettingsControlsButtons(32, 44, MiscSettings);
}
}
//sta
// sta
{

BindWheelSettings.HSplitTop(Margin, nullptr, &BindWheelSettings);
BindWheelSettings.HSplitTop(80.0f, &BindWheelSettings, 0);
if(s_ScrollRegion.AddRect(BindWheelSettings))
{
BindWheelSettings.Draw(ColorRGBA(1, 1, 1, 0.25f), IGraphics::CORNER_ALL, 10.0f);
BindWheelSettings.Draw(vec4(1, 1, 1, 0.15f), IGraphics::CORNER_ALL, 10.0f);
BindWheelSettings.VMargin(Margin, &BindWheelSettings);

BindWheelSettings.HSplitTop(HeaderHeight, &Button, &BindWheelSettings);
Expand Down Expand Up @@ -1526,6 +1528,7 @@ void CMenus::ResetSettingsControls()
g_Config.m_UiControllerSens = 100;
}


void CMenus::RenderSettingsGraphics(CUIRect MainView)
{
CUIRect Button;
Expand Down Expand Up @@ -3486,7 +3489,7 @@ void CMenus::RenderSettingsStA(CUIRect MainView)
g_Config.m_ClShowpred ^= 1;

Left.HSplitTop(20.0f, &Button, &Left);
if(DoButton_CheckBox(&g_Config.m_ClAutoVerify, Localize("Auto Verify"), g_Config.m_ClAutoVerify, &Button))
if(DoButton_CheckBox(&g_Config.m_ClAutoVerify, Localize("Server Auto Whitelist"), g_Config.m_ClAutoVerify, &Button))
g_Config.m_ClAutoVerify ^= 1;

}
Expand Down
31 changes: 18 additions & 13 deletions src/game/client/components/menus_start.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ void CMenus::RenderStartMenu(CUIRect MainView)
Graphics()->TextureSet(g_pData->m_aImages[IMAGE_BANNER].m_Id);
Graphics()->QuadsBegin();
Graphics()->SetColor(1, 1, 1, 1);
IGraphics::CQuadItem QuadItem(MainView.w / 2 - 170, 60, 360, 103);
IGraphics::CQuadItem QuadItem(MainView.w / 2 - 230, 45, 510, 103);
Graphics()->QuadsDrawTL(&QuadItem, 1);
Graphics()->QuadsEnd();

Expand Down Expand Up @@ -104,9 +104,12 @@ void CMenus::RenderStartMenu(CUIRect MainView)
NewPage = PAGE_NEWS;

CUIRect Menu;

MainView.VMargin(VMargin, &Menu);
Menu.HSplitBottom(25.0f, &Menu, 0);
Menu.HSplitBottom(15.0f, &Menu, 0);

MainView.VSplitLeft(570.0f, &Menu, nullptr);
Menu.VSplitLeft(Menu.w / 1.49, nullptr, &Menu);
Menu.HSplitBottom(40.0f, &Menu, &Button);
static CButtonContainer s_QuitButton;
bool UsedEscape = false;
Expand All @@ -121,21 +124,23 @@ void CMenus::RenderStartMenu(CUIRect MainView)
Client()->Quit();
}
}
//Main buttons


Menu.HSplitBottom(100.0f, &Menu, 0);
Menu.HSplitBottom(40.0f, &Menu, &Button);
Menu.HSplitBottom(55.0f, &Menu, &Button);
static CButtonContainer s_SettingsButton;
if(DoButton_Menu(&s_SettingsButton, Localize("Settings"), 0, &Button, g_Config.m_ClShowStartMenuImages ? "settings" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, vec4(0.0f, 0.0f, 0.0f, 0.5f), vec4(0.0f, 0.0f, 0.0f, 0.25f)) || CheckHotKey(KEY_S))
if(DoButton_Menu(&s_SettingsButton, Localize(""), 0, &Button, g_Config.m_ClShowStartMenuImages ? "settings" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, vec4(0.0f, 0.0f, 0.0f, 0.5f), vec4(0.0f, 0.0f, 0.0f, 0.25f)) || CheckHotKey(KEY_S))
NewPage = PAGE_SETTINGS;

Menu.HSplitBottom(5.0f, &Menu, 0); // little space
Menu.HSplitBottom(40.0f, &Menu, &Button);
Menu.HSplitBottom(55.0f, &Menu, &Button);
static CButtonContainer s_LocalServerButton;

if(!is_process_alive(m_ServerProcess.m_Process))
KillServer();

if(DoButton_Menu(&s_LocalServerButton, m_ServerProcess.m_Process ? Localize("Stop server") : Localize("Run server"), 0, &Button, g_Config.m_ClShowStartMenuImages ? "local_server" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, vec4(0.0f, 0.0f, 0.0f, 0.5f), m_ServerProcess.m_Process ? vec4(0.0f, 1.0f, 0.0f, 0.25f) : vec4(0.0f, 0.0f, 0.0f, 0.25f)) || (CheckHotKey(KEY_R) && Input()->KeyPress(KEY_R)))
if(DoButton_Menu(&s_LocalServerButton, m_ServerProcess.m_Process ? Localize("") : Localize(""), 0, &Button, g_Config.m_ClShowStartMenuImages ? "local_server" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, vec4(0.0f, 0.0f, 0.0f, 0.5f), m_ServerProcess.m_Process ? vec4(0.0f, 1.0f, 0.0f, 0.25f) : vec4(0.0f, 0.0f, 0.0f, 0.25f)) || (CheckHotKey(KEY_R) && Input()->KeyPress(KEY_R)))
{
if(m_ServerProcess.m_Process)
{
Expand Down Expand Up @@ -164,9 +169,9 @@ void CMenus::RenderStartMenu(CUIRect MainView)
static bool EditorHotkeyWasPressed = true;
static float EditorHotKeyChecktime = 0.0f;
Menu.HSplitBottom(5.0f, &Menu, 0); // little space
Menu.HSplitBottom(40.0f, &Menu, &Button);
Menu.HSplitBottom(55.0f, &Menu, &Button);
static CButtonContainer s_MapEditorButton;
if(DoButton_Menu(&s_MapEditorButton, Localize("Editor"), 0, &Button, g_Config.m_ClShowStartMenuImages ? "editor" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, vec4(0.0f, 0.0f, 0.0f, 0.5f), m_pClient->Editor()->HasUnsavedData() ? vec4(0.0f, 1.0f, 0.0f, 0.25f) : vec4(0.0f, 0.0f, 0.0f, 0.25f)) || (!EditorHotkeyWasPressed && Client()->LocalTime() - EditorHotKeyChecktime < 0.1f && CheckHotKey(KEY_E)))
if(DoButton_Menu(&s_MapEditorButton, Localize(""), 0, &Button, g_Config.m_ClShowStartMenuImages ? "editor" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, vec4(0.0f, 0.0f, 0.0f, 0.5f), m_pClient->Editor()->HasUnsavedData() ? vec4(0.0f, 1.0f, 0.0f, 0.25f) : vec4(0.0f, 0.0f, 0.0f, 0.25f)) || (!EditorHotkeyWasPressed && Client()->LocalTime() - EditorHotKeyChecktime < 0.1f && CheckHotKey(KEY_E)))
{
g_Config.m_ClEditor = 1;
Input()->MouseModeRelative();
Expand All @@ -179,25 +184,25 @@ void CMenus::RenderStartMenu(CUIRect MainView)
}

Menu.HSplitBottom(5.0f, &Menu, 0); // little space
Menu.HSplitBottom(40.0f, &Menu, &Button);
Menu.HSplitBottom(55.0f, &Menu, &Button);
static CButtonContainer s_DemoButton;
if(DoButton_Menu(&s_DemoButton, Localize("Demos"), 0, &Button, g_Config.m_ClShowStartMenuImages ? "demos" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, vec4(0.0f, 0.0f, 0.0f, 0.5f), vec4(0.0f, 0.0f, 0.0f, 0.25f)) || CheckHotKey(KEY_D))
if(DoButton_Menu(&s_DemoButton, Localize(""), 0, &Button, g_Config.m_ClShowStartMenuImages ? "demos" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, vec4(0.0f, 0.0f, 0.0f, 0.5f), vec4(0.0f, 0.0f, 0.0f, 0.25f)) || CheckHotKey(KEY_D))
{
NewPage = PAGE_DEMOS;
}

Menu.HSplitBottom(5.0f, &Menu, 0); // little space
Menu.HSplitBottom(40.0f, &Menu, &Button);
Menu.HSplitBottom(55.0f, &Menu, &Button);
static CButtonContainer s_PlayButton;
if(DoButton_Menu(&s_PlayButton, Localize("Play", "Start menu"), 0, &Button, g_Config.m_ClShowStartMenuImages ? "play_game" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, vec4(0.0f, 0.0f, 0.0f, 0.5f), vec4(0.0f, 0.0f, 0.0f, 0.25f)) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER) || CheckHotKey(KEY_P))
if(DoButton_Menu(&s_PlayButton, Localize("", "Start menu"), 0, &Button, g_Config.m_ClShowStartMenuImages ? "play_game" : 0, IGraphics::CORNER_ALL, Rounding, 0.5f, vec4(0.0f, 0.0f, 0.0f, 0.5f), vec4(0.0f, 0.0f, 0.0f, 0.25f)) || UI()->ConsumeHotkey(CUI::HOTKEY_ENTER) || CheckHotKey(KEY_P))
{
NewPage = g_Config.m_UiPage >= PAGE_INTERNET && g_Config.m_UiPage <= PAGE_FAVORITES ? g_Config.m_UiPage : PAGE_INTERNET;
}

// render version
CUIRect VersionUpdate, CurVersion;
MainView.HSplitBottom(30.0f, 0, 0);
MainView.HSplitBottom(20.0f, 0, &VersionUpdate);
MainView.HSplitBottom(55.0f, 0, &VersionUpdate);

VersionUpdate.VSplitRight(50.0f, &CurVersion, 0);
VersionUpdate.VMargin(VMargin, &VersionUpdate);
Expand Down

0 comments on commit d6c9bfd

Please sign in to comment.