Taiko_Stuff/OpenTaiko
1
0
Fork 0
mirror of synced 2025-01-30 11:37:34 +01:00
Code Releases Activity

0.6.0.39 - Minor updates (#783)

Browse Source 
- The default font for most languages (when a skin doesn't include a font for that language) has been set to Noto Sans JP
- The font size for the Offset text on the Calibration screen can now be adjusted
- Fixed the user rename screen being off-center for resolutions other than 1920x1080
- Lua security update
This commit is contained in:
DragonRatTiger / リュウコ 2025-01-16 02:18:47 -06:00 committed by GitHub
parent a028f6997a
commit e489de89a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
19 changed files with 264 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
FDK/src/02.Input/CInputKeyboard.cs
View File

@ -16,6 +16,10 @@ public class CInputKeyboard : CInputButtonsBase, IInputDevice, IDisposable {
} }
private void KeyDown(IKeyboard keyboard, Key key, int keyCode) { private void KeyDown(IKeyboard keyboard, Key key, int keyCode) {
#if DEBUG
if (IMGUI_WindowIsFocused) return;
#endif
var keyNum = DeviceConstantConverter.DIKtoKey(key); var keyNum = DeviceConstantConverter.DIKtoKey(key);
if ((int)keyNum >= this.ButtonStates.Length || keyNum == SlimDXKeys.Key.Unknown) return; if ((int)keyNum >= this.ButtonStates.Length || keyNum == SlimDXKeys.Key.Unknown) return;
@ -23,6 +27,9 @@ public class CInputKeyboard : CInputButtonsBase, IInputDevice, IDisposable {
} }
private void KeyUp(IKeyboard keyboard, Key key, int keyCode) { private void KeyUp(IKeyboard keyboard, Key key, int keyCode) {
#if DEBUG
if (IMGUI_WindowIsFocused) return;
#endif
var keyNum = DeviceConstantConverter.DIKtoKey(key); var keyNum = DeviceConstantConverter.DIKtoKey(key);
if ((int)keyNum >= this.ButtonStates.Length || keyNum == SlimDXKeys.Key.Unknown) return; if ((int)keyNum >= this.ButtonStates.Length || keyNum == SlimDXKeys.Key.Unknown) return;
@ -32,4 +39,6 @@ public class CInputKeyboard : CInputButtonsBase, IInputDevice, IDisposable {
private void KeyChar(IKeyboard keyboard, char ch) { private void KeyChar(IKeyboard keyboard, char ch) {
} }
public bool IMGUI_WindowIsFocused = false;
} }

26
OpenTaiko/Lang/de/lang.json
View File

@ -1,12 +1,12 @@
{ {
// The folder's name is used as the ID, which is used to identify which localized data to use. // The folder's name is used as the ID, which is used to identify which localized data to use.
// This includes TJAs with localized titles/subtitles (i.e. TITLEJA/SUBTITLEJA) and Lua scripts which utilize the "lang" variable. // This includes TJAs with localized titles/subtitles (i.e. TITLEJA/SUBTITLEJA) and Lua scripts which utilize the "lang" variable.
// It is STRONGLY recommended that you use a two-letter language code that follows the ISO 639 standard. Keep the ID lowercased. // It is STRONGLY recommended that you use a two-letter language code that follows the ISO 639 standard. Keep the ID lowercased.
// If you aren't sure which code fits your language, please refer to https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes // If you aren't sure which code fits your language, please refer to https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes
// "Language" should include the name of your language in its native text, as well as its English variant in parentheses. // "Language" should include the name of your language in its native text, as well as its English variant in parentheses.
// i.e. "日本語 (Japanese)" // i.e. "日本語 (Japanese)"
"Language": "Deutsch (German)", "Language": "Deutsch (German)",
"Version": "0.6.0.0", "Version": "0.6.0.0",
"Entries": { "Entries": {
@ -613,10 +613,10 @@
"MOD_FUN_AVALANCHE": "Lawine", "MOD_FUN_AVALANCHE": "Lawine",
"MOD_FUN_MINESWEEPER": "Minesweeper" "MOD_FUN_MINESWEEPER": "Minesweeper"
}, },
// In the case that a key is missing, this message will display, with the name of the missing/unknown key. // In the case that a key is missing, this message will display, with the name of the missing/unknown key.
"InvalidKey": "TASTE NICHT GEFUNDEN: {0}", "InvalidKey": "TASTE NICHT GEFUNDEN: {0}",
// If a skin does not include a font for a specific language, the game will fallback to this language's fonts. This ensures that all text for all languages can be clearly read. // If a skin does not include a font for a specific language, the game will fallback to this language's fonts. This ensures that all text for all languages can be clearly read.
// Font name can be a file, or the name of an already installed font (i.e. "Arial"). If using a font name instead of a file name, please ensure that the user already has this font installed on their computer. // Font name can be a file, or the name of an already installed font (i.e. "Arial"). If using a font name instead of a file name, please ensure that the user already has this font installed on their computer.
"FontName": "Arial", "FontName": "../font.ttf",
"BoxFontName": "font.ttf" "BoxFontName": "../font.ttf"
} }

26
OpenTaiko/Lang/en/lang.json
View File

@ -1,13 +1,13 @@
{ {
// The folder's name is used as the ID, which is used to identify which localized data to use. // The folder's name is used as the ID, which is used to identify which localized data to use.
// This includes TJAs with localized titles/subtitles (i.e. TITLEJA/SUBTITLEJA) and Lua scripts which utilize the "lang" variable. // This includes TJAs with localized titles/subtitles (i.e. TITLEJA/SUBTITLEJA) and Lua scripts which utilize the "lang" variable.
// It is STRONGLY recommended that you use a two-letter language code that follows the ISO 639 standard. Keep the ID lowercased. // It is STRONGLY recommended that you use a two-letter language code that follows the ISO 639 standard. Keep the ID lowercased.
// If you aren't sure which code fits your language, please refer to https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes // If you aren't sure which code fits your language, please refer to https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes
// "Language" should include the name of your language in its native text, as well as its English variant in parentheses. // "Language" should include the name of your language in its native text, as well as its English variant in parentheses.
// i.e. "日本語 (Japanese)" // i.e. "日本語 (Japanese)"
"Language": "English", "Language": "English",
"Version": "0.6.0.0", "Version": "0.6.0.0",
"Entries": { "Entries": {
// Common // Common
@ -613,10 +613,10 @@
"MOD_FUN_AVALANCHE": "Avalanche", "MOD_FUN_AVALANCHE": "Avalanche",
"MOD_FUN_MINESWEEPER": "Minesweeper" "MOD_FUN_MINESWEEPER": "Minesweeper"
}, },
// In the case that a key is missing, this message will display, with the name of the missing/unknown key. // In the case that a key is missing, this message will display, with the name of the missing/unknown key.
"InvalidKey": "KEY NOT FOUND: {0}", "InvalidKey": "KEY NOT FOUND: {0}",
// If a skin does not include a font for a specific language, the game will fallback to this language's fonts. This ensures that all text for all languages can be clearly read. // If a skin does not include a font for a specific language, the game will fallback to this language's fonts. This ensures that all text for all languages can be clearly read.
// Font name can be a file, or the name of an already installed font (i.e. "Arial"). If using a font name instead of a file name, please ensure that the user already has this font installed on their computer. // Font name can be a file, or the name of an already installed font (i.e. "Arial"). If using a font name instead of a file name, please ensure that the user already has this font installed on their computer.
"FontName": "Arial", "FontName": "../font.ttf",
"BoxFontName": "font.ttf" "BoxFontName": "../font.ttf"
} }

28
OpenTaiko/Lang/es/lang.json
View File

@ -1,13 +1,13 @@
{ {
// The folder's name is used as the ID, which is used to identify which localized data to use. // The folder's name is used as the ID, which is used to identify which localized data to use.
// This includes TJAs with localized titles/subtitles (i.e. TITLEJA/SUBTITLEJA) and Lua scripts which utilize the "lang" variable. // This includes TJAs with localized titles/subtitles (i.e. TITLEJA/SUBTITLEJA) and Lua scripts which utilize the "lang" variable.
// It is STRONGLY recommended that you use a two-letter language code that follows the ISO 639 standard. Keep the ID lowercased. // It is STRONGLY recommended that you use a two-letter language code that follows the ISO 639 standard. Keep the ID lowercased.
// If you aren't sure which code fits your language, please refer to https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes // If you aren't sure which code fits your language, please refer to https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes
// "Language" should include the name of your language in its native text, as well as its English variant in parentheses. // "Language" should include the name of your language in its native text, as well as its English variant in parentheses.
// i.e. "日本語 (Japanese)" // i.e. "日本語 (Japanese)"
"Language": "Español (Spanish)", "Language": "Español (Spanish)",
"Version": "0.6.0.0", "Version": "0.6.0.0",
"Entries": { "Entries": {
// Common // Common
@ -616,10 +616,10 @@
"MOD_FUN_AVALANCHE": "Avalancha", "MOD_FUN_AVALANCHE": "Avalancha",
"MOD_FUN_MINESWEEPER": "Buscaminas" "MOD_FUN_MINESWEEPER": "Buscaminas"
}, },
// In the case that a key is missing, this message will display, with the name of the missing/unknown key. // In the case that a key is missing, this message will display, with the name of the missing/unknown key.
"InvalidKey": "KEY NOT FOUND: {0}", "InvalidKey": "KEY NOT FOUND: {0}",
// If a skin does not include a font for a specific language, the game will fallback to this language's fonts. This ensures that all text for all languages can be clearly read. // If a skin does not include a font for a specific language, the game will fallback to this language's fonts. This ensures that all text for all languages can be clearly read.
// Font name can be a file, or the name of an already installed font (i.e. "Arial"). If using a font name instead of a file name, please ensure that the user already has this font installed on their computer. // Font name can be a file, or the name of an already installed font (i.e. "Arial"). If using a font name instead of a file name, please ensure that the user already has this font installed on their computer.
"FontName": "Arial", "FontName": "../font.ttf",
"BoxFontName": "font.ttf" "BoxFontName": "../font.ttf"
} }

0
OpenTaiko/Lang/ja/NotoSansJP-Medium.ttf → OpenTaiko/Lang/font.ttf
View File

93
OpenTaiko/Lang/font_LICENSE.txt Normal file
View File

@ -0,0 +1,93 @@
Copyright 2014-2021 Adobe (http://www.adobe.com/), with Reserved Font Name 'Source'
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL
-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.
The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.
DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.
"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).
"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).
"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.
"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.
PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:
1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.
2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.
3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.
5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.
TERMINATION
This license becomes null and void if any of the above conditions are
not met.
DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.

28
OpenTaiko/Lang/fr/lang.json
View File

@ -1,13 +1,13 @@
{ {
// The folder's name is used as the ID, which is used to identify which localized data to use. // The folder's name is used as the ID, which is used to identify which localized data to use.
// This includes TJAs with localized titles/subtitles (i.e. TITLEJA/SUBTITLEJA) and Lua scripts which utilize the "lang" variable. // This includes TJAs with localized titles/subtitles (i.e. TITLEJA/SUBTITLEJA) and Lua scripts which utilize the "lang" variable.
// It is STRONGLY recommended that you use a two-letter language code that follows the ISO 639 standard. Keep the ID lowercased. // It is STRONGLY recommended that you use a two-letter language code that follows the ISO 639 standard. Keep the ID lowercased.
// If you aren't sure which code fits your language, please refer to https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes // If you aren't sure which code fits your language, please refer to https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes
// "Language" should include the name of your language in its native text, as well as its English variant in parentheses. // "Language" should include the name of your language in its native text, as well as its English variant in parentheses.
// i.e. "日本語 (Japanese)" // i.e. "日本語 (Japanese)"
"Language": "Français (French)", "Language": "Français (French)",
"Version": "0.6.0.0", "Version": "0.6.0.0",
"Entries": { "Entries": {
// Common // Common
@ -615,10 +615,10 @@
"MOD_FUN_AVALANCHE": "Avalanche", "MOD_FUN_AVALANCHE": "Avalanche",
"MOD_FUN_MINESWEEPER": "Démineur" "MOD_FUN_MINESWEEPER": "Démineur"
}, },
// In the case that a key is missing, this message will display, with the name of the missing/unknown key. // In the case that a key is missing, this message will display, with the name of the missing/unknown key.
"InvalidKey": "KEY NOT FOUND: {0}", "InvalidKey": "KEY NOT FOUND: {0}",
// If a skin does not include a font for a specific language, the game will fallback to this language's fonts. This ensures that all text for all languages can be clearly read. // If a skin does not include a font for a specific language, the game will fallback to this language's fonts. This ensures that all text for all languages can be clearly read.
// Font name can be a file, or the name of an already installed font (i.e. "Arial"). If using a font name instead of a file name, please ensure that the user already has this font installed on their computer. // Font name can be a file, or the name of an already installed font (i.e. "Arial"). If using a font name instead of a file name, please ensure that the user already has this font installed on their computer.
"FontName": "Arial", "FontName": "../font.ttf",
"BoxFontName": "Arial" "BoxFontName": "../font.ttf"
} }

28
OpenTaiko/Lang/ja/lang.json
View File

@ -1,13 +1,13 @@
{ {
// The folder's name is used as the ID, which is used to identify which localized data to use. // The folder's name is used as the ID, which is used to identify which localized data to use.
// This includes TJAs with localized titles/subtitles (i.e. TITLEJA/SUBTITLEJA) and Lua scripts which utilize the "lang" variable. // This includes TJAs with localized titles/subtitles (i.e. TITLEJA/SUBTITLEJA) and Lua scripts which utilize the "lang" variable.
// It is STRONGLY recommended that you use a two-letter language code that follows the ISO 639 standard. Keep the ID lowercased. // It is STRONGLY recommended that you use a two-letter language code that follows the ISO 639 standard. Keep the ID lowercased.
// If you aren't sure which code fits your language, please refer to https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes // If you aren't sure which code fits your language, please refer to https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes
// "Language" should include the name of your language in its native text, as well as its English variant in parentheses. // "Language" should include the name of your language in its native text, as well as its English variant in parentheses.
// i.e. "日本語 (Japanese)" // i.e. "日本語 (Japanese)"
"Language": "日本語 (Japanese)", "Language": "日本語 (Japanese)",
"Version": "0.6.0.0", "Version": "0.6.0.0",
"Entries": { "Entries": {
// Common // Common
@ -615,10 +615,10 @@
"MOD_FUN_AVALANCHE": "雪崩", "MOD_FUN_AVALANCHE": "雪崩",
"MOD_FUN_MINESWEEPER": "掃海" "MOD_FUN_MINESWEEPER": "掃海"
}, },
// In the case that a key is missing, this message will display, with the name of the missing/unknown key. // In the case that a key is missing, this message will display, with the name of the missing/unknown key.
"InvalidKey": "KEY NOT FOUND: {0}", "InvalidKey": "KEY NOT FOUND: {0}",
// If a skin does not include a font for a specific language, the game will fallback to this language's fonts. This ensures that all text for all languages can be clearly read. // If a skin does not include a font for a specific language, the game will fallback to this language's fonts. This ensures that all text for all languages can be clearly read.
// Font name can be a file, or the name of an already installed font (i.e. "Arial"). If using a font name instead of a file name, please ensure that the user already has this font installed on their computer. // Font name can be a file, or the name of an already installed font (i.e. "Arial"). If using a font name instead of a file name, please ensure that the user already has this font installed on their computer.
"FontName": "NotoSansJP-Medium.ttf", "FontName": "../font.ttf",
"BoxFontName": "NotoSansJP-Regular.ttf" "BoxFontName": "NotoSansJP-Regular.ttf"
} }

28
OpenTaiko/Lang/nl/lang.json
View File

@ -1,13 +1,13 @@
{ {
// The folder's name is used as the ID, which is used to identify which localized data to use. // The folder's name is used as the ID, which is used to identify which localized data to use.
// This includes TJAs with localized titles/subtitles (i.e. TITLEJA/SUBTITLEJA) and Lua scripts which utilize the "lang" variable. // This includes TJAs with localized titles/subtitles (i.e. TITLEJA/SUBTITLEJA) and Lua scripts which utilize the "lang" variable.
// It is STRONGLY recommended that you use a two-letter language code that follows the ISO 639 standard. Keep the ID lowercased. // It is STRONGLY recommended that you use a two-letter language code that follows the ISO 639 standard. Keep the ID lowercased.
// If you aren't sure which code fits your language, please refer to https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes // If you aren't sure which code fits your language, please refer to https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes
// "Language" should include the name of your language in its native text, as well as its English variant in parentheses. // "Language" should include the name of your language in its native text, as well as its English variant in parentheses.
// i.e. "日本語 (Japanese)" // i.e. "日本語 (Japanese)"
"Language": "Nederlands (Dutch)", "Language": "Nederlands (Dutch)",
"Version": "0.6.0.0", "Version": "0.6.0.0",
"Entries": { "Entries": {
// Common // Common
@ -613,10 +613,10 @@
"MOD_FUN_AVALANCHE": "Lawine", "MOD_FUN_AVALANCHE": "Lawine",
"MOD_FUN_MINESWEEPER": "Minesweeper" "MOD_FUN_MINESWEEPER": "Minesweeper"
}, },
// In the case that a key is missing, this message will display, with the name of the missing/unknown key. // In the case that a key is missing, this message will display, with the name of the missing/unknown key.
"InvalidKey": "KEY NOT FOUND: {0}", "InvalidKey": "KEY NOT FOUND: {0}",
// If a skin does not include a font for a specific language, the game will fallback to this language's fonts. This ensures that all text for all languages can be clearly read. // If a skin does not include a font for a specific language, the game will fallback to this language's fonts. This ensures that all text for all languages can be clearly read.
// Font name can be a file, or the name of an already installed font (i.e. "Arial"). If using a font name instead of a file name, please ensure that the user already has this font installed on their computer. // Font name can be a file, or the name of an already installed font (i.e. "Arial"). If using a font name instead of a file name, please ensure that the user already has this font installed on their computer.
"FontName": "Arial", "FontName": "../font.ttf",
"BoxFontName": "font.ttf" "BoxFontName": "../font.ttf"
} }

26
OpenTaiko/Lang/ru/lang.json
View File

@ -1,13 +1,13 @@
{ {
// The folder's name is used as the ID, which is used to identify which localized data to use. // The folder's name is used as the ID, which is used to identify which localized data to use.
// This includes TJAs with localized titles/subtitles (i.e. TITLEJA/SUBTITLEJA) and Lua scripts which utilize the "lang" variable. // This includes TJAs with localized titles/subtitles (i.e. TITLEJA/SUBTITLEJA) and Lua scripts which utilize the "lang" variable.
// It is STRONGLY recommended that you use a two-letter language code that follows the ISO 639 standard. Keep the ID lowercased. // It is STRONGLY recommended that you use a two-letter language code that follows the ISO 639 standard. Keep the ID lowercased.
// If you aren't sure which code fits your language, please refer to https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes // If you aren't sure which code fits your language, please refer to https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes
// "Language" should include the name of your language in its native text, as well as its English variant in parentheses. // "Language" should include the name of your language in its native text, as well as its English variant in parentheses.
// i.e. "日本語 (Japanese)" // i.e. "日本語 (Japanese)"
"Language": "Русский (Russian)", "Language": "Русский (Russian)",
"Version": "0.6.0.0", "Version": "0.6.0.0",
"Entries": { "Entries": {
// Common // Common
@ -613,10 +613,10 @@
"MOD_FUN_AVALANCHE": "Лавина", "MOD_FUN_AVALANCHE": "Лавина",
"MOD_FUN_MINESWEEPER": "Тральщик" "MOD_FUN_MINESWEEPER": "Тральщик"
}, },
// In the case that a key is missing, this message will display, with the name of the missing/unknown key. // In the case that a key is missing, this message will display, with the name of the missing/unknown key.
"InvalidKey": "КЛЮЧ НЕ НАЙДЕН: {0}", "InvalidKey": "КЛЮЧ НЕ НАЙДЕН: {0}",
// If a skin does not include a font for a specific language, the game will fallback to this language's fonts. This ensures that all text for all languages can be clearly read. // If a skin does not include a font for a specific language, the game will fallback to this language's fonts. This ensures that all text for all languages can be clearly read.
// Font name can be a file, or the name of an already installed font (i.e. "Arial"). If using a font name instead of a file name, please ensure that the user already has this font installed on their computer. // Font name can be a file, or the name of an already installed font (i.e. "Arial"). If using a font name instead of a file name, please ensure that the user already has this font installed on their computer.
"FontName": "Arial", "FontName": "../font.ttf",
"BoxFontName": "font.ttf" "BoxFontName": "../font.ttf"
} }

5
OpenTaiko/src/Common/CSkin.cs
View File

@ -1506,6 +1506,10 @@ internal class CSkin : IDisposable {
Config_KeyAssign_Move = int.Parse(strParam); Config_KeyAssign_Move = int.Parse(strParam);
break; break;
} }
case nameof(Config_Calibration_Font_Scale): {
Config_Calibration_Font_Scale = int.Parse(strParam);
break;
}
case nameof(Config_Calibration_OffsetText): { case nameof(Config_Calibration_OffsetText): {
string[] strSplit = strParam.Split(','); string[] strSplit = strParam.Split(',');
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
@ -7678,6 +7682,7 @@ internal class CSkin : IDisposable {
public int[] Config_KeyAssign_Font = new int[] { 308, 64 }; public int[] Config_KeyAssign_Font = new int[] { 308, 64 };
public int Config_KeyAssign_Move = 20; public int Config_KeyAssign_Move = 20;
public int Config_Calibration_Font_Scale = 30;
public int[] Config_Calibration_OffsetText = new int[] { 300, 288 }; public int[] Config_Calibration_OffsetText = new int[] { 300, 288 };
public int[] Config_Calibration_InfoText = new int[] { 8, 550 }; public int[] Config_Calibration_InfoText = new int[] { 8, 550 };
public Rectangle[] Config_Calibration_Highlights = new Rectangle[] { public Rectangle[] Config_Calibration_Highlights = new Rectangle[] {

19
OpenTaiko/src/Common/ImGuiDebugWindow.cs
View File

@ -12,6 +12,11 @@ namespace OpenTaiko;
FOR DEBUGGING! This class is intended for developers only! FOR DEBUGGING! This class is intended for developers only!
*/ */
public static class ImGuiDebugWindow { public static class ImGuiDebugWindow {
#region Public for debugging
public static bool DisableKeyboardInputs = false;
public static string OverrideBGPreset = "";
#endregion
private static bool showImGuiDemoWindow = false; private static bool showImGuiDemoWindow = false;
private static Assembly assemblyinfo = Assembly.GetExecutingAssembly(); private static Assembly assemblyinfo = Assembly.GetExecutingAssembly();
@ -44,6 +49,8 @@ public static class ImGuiDebugWindow {
#region Debug Info #region Debug Info
ImGui.Checkbox("Show ImGui Demo Window", ref showImGuiDemoWindow); ImGui.Checkbox("Show ImGui Demo Window", ref showImGuiDemoWindow);
if (showImGuiDemoWindow) { ImGui.ShowDemoWindow(); } if (showImGuiDemoWindow) { ImGui.ShowDemoWindow(); }
if (ImGui.Checkbox("Disable Keyboard Inputs to OpenTaiko", ref DisableKeyboardInputs))
((CInputKeyboard)OpenTaiko.InputManager.Keyboard).IMGUI_WindowIsFocused = DisableKeyboardInputs;
ImGui.Separator(); ImGui.Separator();
ImGui.Text($"Game Version: {OpenTaiko.VERSION}"); ImGui.Text($"Game Version: {OpenTaiko.VERSION}");
@ -169,7 +176,7 @@ public static class ImGuiDebugWindow {
ImGui.Text($"ID: {OpenTaiko.SaveFileInstances[save].data.SaveId}"); ImGui.Text($"ID: {OpenTaiko.SaveFileInstances[save].data.SaveId}");
ImGui.InputText("Name", ref OpenTaiko.SaveFileInstances[save].data.Name, 64); ImGui.InputText("Name", ref OpenTaiko.SaveFileInstances[save].data.Name, 64);
if (ImGui.Button("Update")) { if (ImGui.Button("Update###UPDATE_PROFILE")) {
OpenTaiko.SaveFileInstances[save].tApplyHeyaChanges(); OpenTaiko.SaveFileInstances[save].tApplyHeyaChanges();
OpenTaiko.NamePlate.tNamePlateRefreshTitles(save); OpenTaiko.NamePlate.tNamePlateRefreshTitles(save);
} }
@ -204,7 +211,7 @@ public static class ImGuiDebugWindow {
ImGui.InputInt("Title Type", ref OpenTaiko.SaveFileInstances[save].data.TitleType); ImGui.InputInt("Title Type", ref OpenTaiko.SaveFileInstances[save].data.TitleType);
if (ImGui.Button("Update")) { if (ImGui.Button("Update###UPDATE_NAMEPLATE")) {
OpenTaiko.SaveFileInstances[save].tApplyHeyaChanges(); OpenTaiko.SaveFileInstances[save].tApplyHeyaChanges();
OpenTaiko.NamePlate.tNamePlateRefreshTitles(save); OpenTaiko.NamePlate.tNamePlateRefreshTitles(save);
} }
@ -241,7 +248,7 @@ public static class ImGuiDebugWindow {
ImGui.EndCombo(); ImGui.EndCombo();
} }
if (ImGui.Button("Update")) { if (ImGui.Button("Update###UPDATE_DAN")) {
OpenTaiko.SaveFileInstances[save].tApplyHeyaChanges(); OpenTaiko.SaveFileInstances[save].tApplyHeyaChanges();
OpenTaiko.NamePlate.tNamePlateRefreshTitles(save); OpenTaiko.NamePlate.tNamePlateRefreshTitles(save);
} }
@ -264,6 +271,7 @@ public static class ImGuiDebugWindow {
switch (OpenTaiko.rCurrentStage.eStageID) { switch (OpenTaiko.rCurrentStage.eStageID) {
case CStage.EStage.SongSelect: case CStage.EStage.SongSelect:
case CStage.EStage.DanDojoSelect:
System.Numerics.Vector4 normal = new System.Numerics.Vector4(1, 1, 1, 1); System.Numerics.Vector4 normal = new System.Numerics.Vector4(1, 1, 1, 1);
System.Numerics.Vector4 diff = new System.Numerics.Vector4(0.5f, 1, 0.5f, 1); System.Numerics.Vector4 diff = new System.Numerics.Vector4(0.5f, 1, 0.5f, 1);
@ -273,6 +281,11 @@ public static class ImGuiDebugWindow {
ImGui.TextColored(OpenTaiko.ConfigIni.bTokkunMode ? diff : normal, ImGui.TextColored(OpenTaiko.ConfigIni.bTokkunMode ? diff : normal,
"Training Mode: " + OpenTaiko.ConfigIni.bTokkunMode); "Training Mode: " + OpenTaiko.ConfigIni.bTokkunMode);
ImGui.InputText("Set BG Preset", ref OverrideBGPreset, 1024);
ImGui.Text("Type any preset name to override for the next selected song.\nLeave blank to disable this.");
ImGui.NewLine();
for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) { for (int i = 0; i < OpenTaiko.ConfigIni.nPlayerCount; i++) {
bool modifiedstats = bool modifiedstats =

4
OpenTaiko/src/Helpers/HScenePreset.cs
View File

@ -34,6 +34,10 @@ class HScenePreset {
bool sectionIsValid = _ps != null ? ((Dictionary<string, DBSkinPreset.SkinScene>)_ps).Count > 0 : false; bool sectionIsValid = _ps != null ? ((Dictionary<string, DBSkinPreset.SkinScene>)_ps).Count > 0 : false;
#if DEBUG
if (!string.IsNullOrWhiteSpace(ImGuiDebugWindow.OverrideBGPreset))
return ((Dictionary<string, DBSkinPreset.SkinScene>)_ps).TryGetValue(ImGuiDebugWindow.OverrideBGPreset, out var value) ? value : null;
#endif
var preset = (sectionIsValid var preset = (sectionIsValid
&& OpenTaiko.stageSongSelect.rChoosenSong.strScenePreset != null && OpenTaiko.stageSongSelect.rChoosenSong.strScenePreset != null
&& ((Dictionary<string, DBSkinPreset.SkinScene>)_ps).ContainsKey(OpenTaiko.stageSongSelect.rChoosenSong.strScenePreset)) && ((Dictionary<string, DBSkinPreset.SkinScene>)_ps).ContainsKey(OpenTaiko.stageSongSelect.rChoosenSong.strScenePreset))

1
OpenTaiko/src/Lua/CLuaScript.cs
View File

@ -170,6 +170,7 @@ class CLuaScript : IDisposable {
LuaScript = new Lua(); LuaScript = new Lua();
LuaScript.LoadCLRPackage(); LuaScript.LoadCLRPackage();
LuaScript.State.Encoding = Encoding.UTF8; LuaScript.State.Encoding = Encoding.UTF8;
LuaSecurity.Secure(LuaScript);
try { try {
LuaScript.DoFile($"{strDir}/Script.lua"); LuaScript.DoFile($"{strDir}/Script.lua");

28
OpenTaiko/src/Lua/LuaSecurity.cs Normal file
View File

@ -0,0 +1,28 @@
using NLua;
namespace OpenTaiko {
public static class LuaSecurity {
public static void Secure(Lua lua) {
lua.DoString(@"
for k, _ in pairs(os) do
if k ~= ""time"" then
os[k] = nil
end
end
for k, _ in pairs(io) do
io[k] = nil
end
io = nil
for k, _ in pairs(debug) do
debug[k] = nil
end
debug = nil
while #package.searchers > 0 do
table.remove(package.searchers);
end
");
}
}
}

2
OpenTaiko/src/Stages/04.Config/CActCalibrationMode.cs
View File

@ -8,7 +8,7 @@ internal class CActCalibrationMode : CActivity {
public override void Activate() { public override void Activate() {
//hitSound = TJAPlayer3.SoundManager.tCreateSound($@"Global{Path.DirectorySeparatorChar}HitSounds{Path.DirectorySeparatorChar}" + TJAPlayer3.Skin.hsHitSoundsInformations.don[0], ESoundGroup.SoundEffect); //hitSound = TJAPlayer3.SoundManager.tCreateSound($@"Global{Path.DirectorySeparatorChar}HitSounds{Path.DirectorySeparatorChar}" + TJAPlayer3.Skin.hsHitSoundsInformations.don[0], ESoundGroup.SoundEffect);
font = HPrivateFastFont.tInstantiateMainFont(30); font = HPrivateFastFont.tInstantiateMainFont(OpenTaiko.Skin.Config_Calibration_Font_Scale);
base.Activate(); base.Activate();
} }

12
OpenTaiko/src/Stages/05.SongSelect/CActSelectPopupMenu.cs
View File

@ -87,14 +87,16 @@ internal class CActSelectPopupMenu : CActivity {
OpenTaiko.tDisposeSafely(ref prvFont); OpenTaiko.tDisposeSafely(ref prvFont);
InitializePrvFont(); InitializePrvFont();
using (var bitmap = prvFont.DrawText(stqMenuTitle.cItem.str項目名, Color.White, Color.Black, null, 30)) { using (var bitmap = prvFont.DrawText(stqMenuTitle.cItem?.str項目名 ?? "", Color.White, Color.Black, null, 30)) {
OpenTaiko.tDisposeSafely(ref stqMenuTitle.txName); OpenTaiko.tDisposeSafely(ref stqMenuTitle.txName);
stqMenuTitle.txName = OpenTaiko.tテクスチャの生成(bitmap, false); stqMenuTitle.txName = OpenTaiko.tテクスチャの生成(bitmap, false);
} }
for (int i = 0; i < lciMenuItems.Length; i++) { if (lciMenuItems != null) {
using (var bitmap = prvFont.DrawText(lciMenuItems[i].cItem.str項目名, Color.White, Color.Black, null, 30)) { for (int i = 0; i < lciMenuItems.Length; i++) {
OpenTaiko.tDisposeSafely(ref lciMenuItems[i].txName); using (var bitmap = prvFont.DrawText(lciMenuItems[i].cItem?.str項目名 ?? "", Color.White, Color.Black, null, 30)) {
lciMenuItems[i].txName = OpenTaiko.tテクスチャの生成(bitmap, false); OpenTaiko.tDisposeSafely(ref lciMenuItems[i].txName);
lciMenuItems[i].txName = OpenTaiko.tテクスチャの生成(bitmap, false);
}
} }
} }
} }

1
OpenTaiko/src/Stages/07.Game/Taiko/ScriptBG.cs
View File

@ -127,6 +127,7 @@ class ScriptBG : IDisposable {
LuaScript = new Lua(); LuaScript = new Lua();
LuaScript.State.Encoding = Encoding.UTF8; LuaScript.State.Encoding = Encoding.UTF8;
LuaSecurity.Secure(LuaScript);
LuaScript["func"] = new ScriptBGFunc(Textures, Path.GetDirectoryName(filePath)); LuaScript["func"] = new ScriptBGFunc(Textures, Path.GetDirectoryName(filePath));

4
OpenTaiko/src/Stages/11.Heya/CStageHeya.cs
View File

@ -465,8 +465,8 @@ class CStageHeya : CStage {
CTexture text_tex = TitleTextureKey.ResolveTitleTexture(textInputTitle); CTexture text_tex = TitleTextureKey.ResolveTitleTexture(textInputTitle);
CTexture text_info = TitleTextureKey.ResolveTitleTexture(textInputInfo); CTexture text_info = TitleTextureKey.ResolveTitleTexture(textInputInfo);
text_info.t2D_DisplayImage_AnchorCenter(960, 540); text_info.t2D_DisplayImage_AnchorCenter(GameWindowSize.Width / 2, GameWindowSize.Height / 2);
text_tex.t2D_DisplayImage_AnchorCenter(960, 540 + text_info.szTextureSize.Height); text_tex.t2D_DisplayImage_AnchorCenter(GameWindowSize.Width / 2, GameWindowSize.Height / 2 + text_info.szTextureSize.Height);
} }
#endregion #endregion