From a0b5f28b38809356aeee0075b0a712a47d8e63dc Mon Sep 17 00:00:00 2001 From: MysterD Date: Sun, 18 Oct 2020 22:21:25 -0700 Subject: [PATCH 1/4] Beta 2 release --- src/pc/network/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pc/network/version.c b/src/pc/network/version.c index 7ee4b14b..849ce60c 100644 --- a/src/pc/network/version.c +++ b/src/pc/network/version.c @@ -3,7 +3,7 @@ #include "types.h" static char sVersionString[MAX_VERSION_LENGTH] = { 0 }; -#ifdef UNSTABLE_BRANCH +//#ifdef UNSTABLE_BRANCH #define VERSION_TEXT "unst " #else #define VERSION_TEXT "beta " From dd9013214550ecf31cdc44b95e0bf54f94d44af3 Mon Sep 17 00:00:00 2001 From: MysterD Date: Sun, 18 Oct 2020 22:24:37 -0700 Subject: [PATCH 2/4] Whoops, actual release --- src/pc/network/version.c | 2 +- src/pc/network/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pc/network/version.c b/src/pc/network/version.c index 849ce60c..7ee4b14b 100644 --- a/src/pc/network/version.c +++ b/src/pc/network/version.c @@ -3,7 +3,7 @@ #include "types.h" static char sVersionString[MAX_VERSION_LENGTH] = { 0 }; -//#ifdef UNSTABLE_BRANCH +#ifdef UNSTABLE_BRANCH #define VERSION_TEXT "unst " #else #define VERSION_TEXT "beta " diff --git a/src/pc/network/version.h b/src/pc/network/version.h index 573456d6..1dc7d0a4 100644 --- a/src/pc/network/version.h +++ b/src/pc/network/version.h @@ -1,7 +1,7 @@ #ifndef VERSION_H #define VERSION_H -#define UNSTABLE_BRANCH +//#define UNSTABLE_BRANCH #define VERSION_NUMBER 2 #define MAX_VERSION_LENGTH 10 From dae94fe9a665f693f3fa7c807891aed5ee8c32cc Mon Sep 17 00:00:00 2001 From: MegaMech Date: Sun, 14 Feb 2021 03:11:19 -0700 Subject: [PATCH 3/4] Link to build instructions --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6d584a15..7db0f111 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ Online cooperative multiplayer mod for SM64, aiming to synchronize all entities and every level for two players. Fork of [sm64pc/sm64ex](https://github.com/sm64pc/sm64ex). +Build instructions are available on the [sm64ex wiki](https://github.com/sm64pc/sm64ex/wiki). + Feel free to report bugs and contribute, but remember, there must be **no upload of any copyrighted asset**. Run `./extract_assets.py --clean && make clean` or `make distclean` to remove ROM-originated content. From b68d5b107a1606356060796dfa97b489b9b3b856 Mon Sep 17 00:00:00 2001 From: Avery Date: Sat, 6 Mar 2021 21:07:55 -0800 Subject: [PATCH 4/4] make discord max party size equal to MAX_PLAYERS --- src/pc/network/discord/lobby.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pc/network/discord/lobby.c b/src/pc/network/discord/lobby.c index d556dad7..1d2561f3 100644 --- a/src/pc/network/discord/lobby.c +++ b/src/pc/network/discord/lobby.c @@ -18,7 +18,7 @@ static void on_lobby_create_callback(UNUSED void* data, enum EDiscordResult resu gCurActivity.type = DiscordActivityType_Playing; snprintf(gCurActivity.party.id, 128, "%lld", lobby->id); gCurActivity.party.size.current_size = 1; - gCurActivity.party.size.max_size = 2; + gCurActivity.party.size.max_size = MAX_PLAYERS; char secretJoin[128] = ""; snprintf(secretJoin, 128, "%lld:%s", lobby->id, lobby->secret); @@ -59,7 +59,7 @@ void discord_lobby_create(void) { struct IDiscordLobbyTransaction* txn = { 0 }; DISCORD_REQUIRE(app.lobbies->get_lobby_create_transaction(app.lobbies, &txn)); - txn->set_capacity(txn, 2); + txn->set_capacity(txn, MAX_PLAYERS); txn->set_type(txn, DiscordLobbyType_Public); //txn->set_metadata(txn, "a", "123"); @@ -94,4 +94,4 @@ struct IDiscordLobbyEvents* discord_lobby_initialize(void) { events.on_member_disconnect = on_member_disconnect; events.on_network_message = discord_network_on_message; return &events; -} \ No newline at end of file +}