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

Update GUI with new Event Server join button and update IP address for servers #219

Merged
merged 4 commits into from
Oct 23, 2023
Merged

Update GUI with new Event Server join button and update IP address for servers #219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d2b575a
Added event button and updated IPs
pool011 Oct 23, 2023
c60f786
String table fixed
pool011 Oct 23, 2023
94d869a
Increment menu height by one
pool011 Oct 23, 2023
6fd1f6a
Add tooltip for event server and fix ts tooltip
pool011 Oct 23, 2023
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
18 changes: 12 additions & 6 deletions addons/optionsmenu/gui/mainMenu.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class RscDisplayMain : RscStandardDisplay {
class Controls;
};
class GroupMultiplayer: GroupSingleplayer {
h = "(8 * 1.5) * (pixelH * pixelGrid * 2)";
h = "(9 * 1.5) * (pixelH * pixelGrid * 2)";
class Controls : Controls {
class Campaigns;
class joinTac2 : Campaigns {
Expand All @@ -17,24 +17,30 @@ class RscDisplayMain : RscStandardDisplay {
tooltip = CSTRING(joinTac2_tooltip);
y = "(3 * 1.5) * (pixelH * pixelGrid * 2) + (pixelH)";
action = "";
onbuttonclick = "connectToServer ['75.6.53.62', 2302, ''];";
onbuttonclick = "connectToServer ['75.6.53.50', 2302, ''];";
Onload = "";
};
class joinTS1 : joinTac2 {
text = CSTRING(joinTS1_text);
tooltip = CSTRING(joinTS1_tooltip);
tooltip = CSTRING(joinTS_tooltip);
y = "(4 * 1.5) * (pixelH * pixelGrid * 2) + (pixelH)";
onbuttonclick = "connectToServer ['75.6.53.62', 2402, ''];";
onbuttonclick = "connectToServer ['75.6.53.50', 2402, ''];";
};
class joinTS2 : joinTS1 {
text = CSTRING(joinTS2_text);
y = "(5 * 1.5) * (pixelH * pixelGrid * 2) + (pixelH)";
onbuttonclick = "connectToServer ['75.6.53.62', 2502, ''];";
onbuttonclick = "connectToServer ['75.6.53.50', 2502, ''];";
};
class joinTS3 : joinTS1 {
text = CSTRING(joinTS3_text);
y = "(6 * 1.5) * (pixelH * pixelGrid * 2) + (pixelH)";
onbuttonclick = "connectToServer ['75.6.53.62', 2602, ''];";
onbuttonclick = "connectToServer ['75.6.53.50', 2602, ''];";
};
class joinTSE : joinTS1 {
text = CSTRING(joinTSE_text);
tooltip = CSTRING(joinTSE_tooltip);
y = "(7 * 1.5) * (pixelH * pixelGrid * 2) + (pixelH)";
onbuttonclick = "connectToServer ['75.6.53.50', 2902, ''];";
};
};
};
Expand Down
12 changes: 9 additions & 3 deletions addons/optionsmenu/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,20 @@
<Key ID="STR_cav_optionsmenu_joinTS1_text">
<English>Join Training Server 1</English>
</Key>
<Key ID="STR_cav_optionsmenu_joinTac1_tooltip">
<Key ID="STR_cav_optionsmenu_joinTS_tooltip">
<English>Join the member only training server!</English>
</Key>
<Key ID="STR_cav_optionsmenu_joinTS2_text">
<English>Join Training Server 1</English>
<English>Join Training Server 2</English>
</Key>
<Key ID="STR_cav_optionsmenu_joinTS3_text">
<English>Join Training Server 1</English>
<English>Join Training Server 3</English>
</Key>
<Key ID="STR_cav_optionsmenu_joinTSE_text">
<English>Join Event Server</English>
</Key>
<Key ID="STR_cav_optionsmenu_joinTSE_tooltip">
<English>Join the 7Cav Event Server!</English>
</Key>

<Key ID="STR_cav_optionsmenu_CavJoin_tooltip">
Expand Down
Loading