Compare commits
No commits in common. "4e01841693f2df0c61b7060c5bdf46ec063e1082" and "02be2d6f9827aba0a8c30487195690e0efeb8df5" have entirely different histories.
4e01841693
...
02be2d6f98
|
@ -12557,10 +12557,13 @@ SPTASK_STATE_FINISHED_DP = 4
|
||||||
MAX_VERSION_LENGTH = 32
|
MAX_VERSION_LENGTH = 32
|
||||||
|
|
||||||
--- @type integer
|
--- @type integer
|
||||||
MINOR_VERSION_NUMBER = 2
|
MINOR_VERSION_NUMBER = 1
|
||||||
|
|
||||||
|
--- @type integer
|
||||||
|
PATCH_VERSION_NUMBER = 0
|
||||||
|
|
||||||
--- @type string
|
--- @type string
|
||||||
SM64COOPDX_VERSION = "v1.0.3"
|
SM64COOPDX_VERSION = "v1.0.1"
|
||||||
|
|
||||||
--- @type integer
|
--- @type integer
|
||||||
VERSION_NUMBER = 37
|
VERSION_NUMBER = 37
|
||||||
|
|
|
@ -4463,6 +4463,7 @@
|
||||||
## [version.h](#version.h)
|
## [version.h](#version.h)
|
||||||
- MAX_VERSION_LENGTH
|
- MAX_VERSION_LENGTH
|
||||||
- MINOR_VERSION_NUMBER
|
- MINOR_VERSION_NUMBER
|
||||||
|
- PATCH_VERSION_NUMBER
|
||||||
- SM64COOPDX_VERSION
|
- SM64COOPDX_VERSION
|
||||||
- VERSION_NUMBER
|
- VERSION_NUMBER
|
||||||
- VERSION_REGION
|
- VERSION_REGION
|
||||||
|
|
|
@ -1156,7 +1156,7 @@ static s32 obj_is_in_view(struct GraphNodeObject *node, Mat4 matrix) {
|
||||||
// visibly pop in or out at the edge of the screen.
|
// visibly pop in or out at the edge of the screen.
|
||||||
//
|
//
|
||||||
// Half of the fov in in-game angle units instead of degrees.
|
// Half of the fov in in-game angle units instead of degrees.
|
||||||
s16 halfFov = ((get_first_person_enabled() ? gFirstPersonCamera.fov : not_zero(gCurGraphNodeCamFrustum->fov, gOverrideFOV)) / 2.0f + 1.0f) * 32768.0f / 180.0f + 0.5f;
|
s16 halfFov = (get_first_person_enabled() ? gFirstPersonCamera.fov : not_zero(gCurGraphNodeCamFrustum->fov, gOverrideFOV) / 2.0f + 1.0f) * 32768.0f / 180.0f + 0.5f;
|
||||||
|
|
||||||
f32 divisor = coss(halfFov);
|
f32 divisor = coss(halfFov);
|
||||||
if (divisor == 0) { divisor = 1; }
|
if (divisor == 0) { divisor = 1; }
|
||||||
|
|
|
@ -6,6 +6,7 @@
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
||||||
|
#include "pc_main.h"
|
||||||
#include "platform.h"
|
#include "platform.h"
|
||||||
#include "configfile.h"
|
#include "configfile.h"
|
||||||
#include "cliopts.h"
|
#include "cliopts.h"
|
||||||
|
@ -56,6 +57,8 @@ struct FunctionConfigOption {
|
||||||
/*
|
/*
|
||||||
*Config options and default values
|
*Config options and default values
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
static_assert(NUM_SAVE_FILES == 4); // update this if more save slots are added
|
||||||
char configSaveNames[4][MAX_SAVE_NAME_STRING] = {
|
char configSaveNames[4][MAX_SAVE_NAME_STRING] = {
|
||||||
"SM64",
|
"SM64",
|
||||||
"SM64",
|
"SM64",
|
||||||
|
@ -681,6 +684,8 @@ NEXT_OPTION:
|
||||||
|
|
||||||
fs_close(file);
|
fs_close(file);
|
||||||
|
|
||||||
|
if ((int)configWindow.msaa > WAPI.get_max_msaa()) { configWindow.msaa = WAPI.get_max_msaa(); }
|
||||||
|
|
||||||
if (configFrameLimit < 30) { configFrameLimit = 30; }
|
if (configFrameLimit < 30) { configFrameLimit = 30; }
|
||||||
if (configFrameLimit > 3000) { configFrameLimit = 3000; }
|
if (configFrameLimit > 3000) { configFrameLimit = 3000; }
|
||||||
|
|
||||||
|
|
|
@ -47,10 +47,11 @@ void djui_panel_host_message_do_host(UNUSED struct DjuiBase* caller) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void djui_panel_host_message_create(struct DjuiBase* caller) {
|
void djui_panel_host_message_create(struct DjuiBase* caller) {
|
||||||
|
f32 warningLines = 0;
|
||||||
char* warningMessage = NULL;
|
char* warningMessage = NULL;
|
||||||
bool hideHostButton = false;
|
bool hideHostButton = false;
|
||||||
|
|
||||||
f32 warningLines = 8;
|
warningLines = 7;
|
||||||
warningMessage = calloc(512, sizeof(char));
|
warningMessage = calloc(512, sizeof(char));
|
||||||
snprintf(warningMessage, 512, DLANG(HOST_MESSAGE, WARN_SOCKET), configHostPort);
|
snprintf(warningMessage, 512, DLANG(HOST_MESSAGE, WARN_SOCKET), configHostPort);
|
||||||
|
|
||||||
|
|
|
@ -87,9 +87,7 @@ static void djui_panel_mod_menu_mod_create_element(struct DjuiBase* parent, int
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case MOD_MENU_ELEMENT_MAX: {
|
case MOD_MENU_ELEMENT_MAX:
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4397,10 +4397,11 @@ char gSmluaConstants[] = ""
|
||||||
"COOP_OBJ_FLAG_LUA = (1 << 1)\n"
|
"COOP_OBJ_FLAG_LUA = (1 << 1)\n"
|
||||||
"COOP_OBJ_FLAG_NON_SYNC = (1 << 2)\n"
|
"COOP_OBJ_FLAG_NON_SYNC = (1 << 2)\n"
|
||||||
"COOP_OBJ_FLAG_INITIALIZED = (1 << 3)\n"
|
"COOP_OBJ_FLAG_INITIALIZED = (1 << 3)\n"
|
||||||
"SM64COOPDX_VERSION = 'v1.0.3'\n"
|
"SM64COOPDX_VERSION = 'v1.0.1'\n"
|
||||||
"VERSION_TEXT = 'v'\n"
|
"VERSION_TEXT = 'v'\n"
|
||||||
"VERSION_NUMBER = 37\n"
|
"VERSION_NUMBER = 37\n"
|
||||||
"MINOR_VERSION_NUMBER = 2\n"
|
"MINOR_VERSION_NUMBER = 1\n"
|
||||||
|
"PATCH_VERSION_NUMBER = 0\n"
|
||||||
"VERSION_REGION = 'JP'\n"
|
"VERSION_REGION = 'JP'\n"
|
||||||
"VERSION_REGION = 'EU'\n"
|
"VERSION_REGION = 'EU'\n"
|
||||||
"VERSION_REGION = 'SH'\n"
|
"VERSION_REGION = 'SH'\n"
|
||||||
|
|
|
@ -96,7 +96,7 @@ C_FIELD bool mod_storage_save_number(const char* key, f32 value) {
|
||||||
// this assumes mod_storage_load will only ever be called by Lua
|
// this assumes mod_storage_load will only ever be called by Lua
|
||||||
static char str[MAX_KEY_VALUE_LENGTH];
|
static char str[MAX_KEY_VALUE_LENGTH];
|
||||||
if (floor(value) == value) {
|
if (floor(value) == value) {
|
||||||
snprintf(str, MAX_KEY_VALUE_LENGTH, "%lld", (s64)value);
|
snprintf(str, MAX_KEY_VALUE_LENGTH, "%d", (s64)value);
|
||||||
} else {
|
} else {
|
||||||
snprintf(str, MAX_KEY_VALUE_LENGTH, "%f", value);
|
snprintf(str, MAX_KEY_VALUE_LENGTH, "%f", value);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
#ifndef VERSION_H
|
#ifndef VERSION_H
|
||||||
#define VERSION_H
|
#define VERSION_H
|
||||||
|
|
||||||
#define SM64COOPDX_VERSION "v1.0.3"
|
#define SM64COOPDX_VERSION "v1.0.1"
|
||||||
|
|
||||||
// internal version
|
// internal version
|
||||||
#define VERSION_TEXT "v"
|
#define VERSION_TEXT "v"
|
||||||
#define VERSION_NUMBER 37
|
#define VERSION_NUMBER 37
|
||||||
#define MINOR_VERSION_NUMBER 2
|
#define MINOR_VERSION_NUMBER 1
|
||||||
|
#define PATCH_VERSION_NUMBER 0
|
||||||
|
|
||||||
#if defined(VERSION_JP)
|
#if defined(VERSION_JP)
|
||||||
#define VERSION_REGION "JP"
|
#define VERSION_REGION "JP"
|
||||||
|
|
Loading…
Reference in New Issue