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

Dropped feature list, introduced protocol version, ... #1004

Closed
wants to merge 8 commits into from
Closed

Dropped feature list, introduced protocol version, ... #1004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6321050
Dropped feature list, introduced protocol version, ...
TrickyLeifa Jul 5, 2024
71c71d8
Merge branch 'master' into featureless
TrickyLeifa Jul 9, 2024
2dfbf20
Added prompt when failing to connect to a server.
TrickyLeifa Jul 9, 2024
49f7137
Merge branch 'master' into featureless
Salanto Jul 10, 2024
e484d00
Tweaked logic for packet size checks,
TrickyLeifa Jul 11, 2024
647e0be
Merge branch 'featureless' of https://github.com/AttorneyOnline/AO2-C…
TrickyLeifa Jul 11, 2024
123ac5f
Merge branch 'master' into featureless
TrickyLeifa Jul 13, 2024
48f22ec
Merge branch 'master' into featureless
TrickyLeifa Jul 14, 2024
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
6 changes: 6 additions & 0 deletions src/aoapplication.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@ QString AOApplication::get_version_string()
return QString::number(RELEASE) + "." + QString::number(MAJOR_VERSION) + "." + QString::number(MINOR_VERSION);
}

QString AOApplication::get_protocol_version_string()
{
return QString::number(PROTOCOL_MAJOR_VERSION) + "." + QString::number(PROTOCOL_MINOR_VERSION) + "." + QString::number(PROTOCOL_PATCH_VERSION);
}

QString AOApplication::find_image(QStringList p_list)
{
QString image_path;
Expand All @@ -147,6 +152,7 @@ void AOApplication::server_disconnected()
construct_lobby();
destruct_courtroom();
}
w_lobby->set_connection_state(tr("Offline"));
Options::getInstance().setServerSubTheme(QString());
}

Expand Down
10 changes: 8 additions & 2 deletions src/aoapplication.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,14 @@ class AOApplication : public QObject
static QString get_version_string();

static const int RELEASE = 2;
static const int MAJOR_VERSION = 10;
static const int MINOR_VERSION = 1;
static const int MAJOR_VERSION = 11;
static const int MINOR_VERSION = 0;

static QString get_protocol_version_string();

static const int PROTOCOL_MAJOR_VERSION = 1;
static const int PROTOCOL_MINOR_VERSION = 0;
static const int PROTOCOL_PATCH_VERSION = 0;

void set_server_list(QVector<ServerInfo> &servers) { server_list = servers; }
QVector<ServerInfo> &get_server_list() { return server_list; }
Expand Down
Loading