From d88bd76041ff0f30412260a5662c57bdac46309f Mon Sep 17 00:00:00 2001 From: Victor Diego Alejandro Diaz Urbaneja <49420637+sodomon2@users.noreply.github.com> Date: Wed, 9 Sep 2020 01:25:51 -0400 Subject: [PATCH 1/5] Update README_es_ES.md --- README_es_ES.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README_es_ES.md b/README_es_ES.md index 44a34a1c..1382d88b 100644 --- a/README_es_ES.md +++ b/README_es_ES.md @@ -155,6 +155,11 @@ sudo xbps-install -S base-devel python3 audiofile-devel SDL2-devel glew-devel sudo xbps-install -S base-devel python3 audiofile-devel-32bit SDL2-devel-32bit glew-devel-32bit ``` +##### Alpine Linux - (compilando para 32 bits y 64 bits) +``` +sudo apk add build-base python3 audiofile-dev sdl2-dev glew-dev +``` + #### Compila el ejecutable. Ejecuta `make` para compilar (por defecto `VERSION=us`) From 9ee16a3ef6337354e7b18f8a2bbf9552c874194e Mon Sep 17 00:00:00 2001 From: s4Ys369 <69868583+s4Ys369@users.noreply.github.com> Date: Sat, 3 Oct 2020 19:10:55 -0400 Subject: [PATCH 2/5] Bugfix: Discord Integration crashes Fix by PeachyPeach to stop crashes with Discord Integration when enter later Bowser courses and fights early --- src/pc/discord/discordrpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pc/discord/discordrpc.c b/src/pc/discord/discordrpc.c index f814f4d5..6ce0aebe 100644 --- a/src/pc/discord/discordrpc.c +++ b/src/pc/discord/discordrpc.c @@ -186,7 +186,7 @@ static void set_state(void) { // when exiting a stage the act doesn't get reset if (gCurrActNum && gCurrCourseNum) { // any stage over 19 is a special stage without acts - if (gCurrCourseNum < 19) { + if (gCurrCourseNum <= COURSE_STAGES_MAX) { void **actNameTbl; #ifndef VERSION_EU actNameTbl = segmented_to_virtual(seg2_act_name_table); From e6d2e7afea17d9d2b2d3fcc6e389488ba1146ced Mon Sep 17 00:00:00 2001 From: s4Ys369 <69868583+s4Ys369@users.noreply.github.com> Date: Fri, 9 Oct 2020 11:40:45 -0400 Subject: [PATCH 3/5] Revert "Bugfix: Discord Integration crashes" --- src/pc/discord/discordrpc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pc/discord/discordrpc.c b/src/pc/discord/discordrpc.c index 6ce0aebe..f814f4d5 100644 --- a/src/pc/discord/discordrpc.c +++ b/src/pc/discord/discordrpc.c @@ -186,7 +186,7 @@ static void set_state(void) { // when exiting a stage the act doesn't get reset if (gCurrActNum && gCurrCourseNum) { // any stage over 19 is a special stage without acts - if (gCurrCourseNum <= COURSE_STAGES_MAX) { + if (gCurrCourseNum < 19) { void **actNameTbl; #ifndef VERSION_EU actNameTbl = segmented_to_virtual(seg2_act_name_table); From 2750d7aaf29d8d1d9ca0c3612c3d1f109038d4a5 Mon Sep 17 00:00:00 2001 From: TeeVenDick Date: Wed, 14 Oct 2020 23:17:02 +0800 Subject: [PATCH 4/5] Added Bahasa Melayu translation of readme --- README.md | 2 +- README_ms_MY.md | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 README_ms_MY.md diff --git a/README.md b/README.md index 86d7bd43..ce9742bc 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Run `./extract_assets.py --clean && make clean` or `make distclean` to remove RO Please contribute **first** to the [nightly branch](https://github.com/sm64pc/sm64ex/tree/nightly/). New functionality will be merged to master once they're considered to be well-tested. -*Read this in other languages: [Español](README_es_ES.md), [Português](README_pt_BR.md) or [简体中文](README_zh_CN.md).* +*Read this in other languages: [Español](README_es_ES.md), [Português](README_pt_BR.md), [简体中文](README_zh_CN.md) atau [Bahasa Melayu](README_ms_MY.md).* ## New features diff --git a/README_ms_MY.md b/README_ms_MY.md new file mode 100644 index 00000000..c8709bb6 --- /dev/null +++ b/README_ms_MY.md @@ -0,0 +1,30 @@ +# sm64ex +Fork dari [sm64-port/sm64-port](https://github.com/sm64-port/sm64-port) dengan ciri tambahan. + +Jangan ragu-ragu untuk melaporkan pepijat dan memberi sumbangan, tetapi ingat, tidak boleh **memuat naik aset berhak cipta**. +Jalankan `./extract_assets.py --clean && make clean` atau `make distclean` untuk membuang kandungan yang berasal dari ROM. + +Sila sumbangkan **dahulu** ke [nightly branch](https://github.com/sm64pc/sm64ex/tree/nightly/). Fungsi baru akan digabungkan ke master setelah siap diuji. + +*Baca ini dalam bahasa lain: [Español](README_es_ES.md), [Português](README_pt_BR.md), [简体中文](README_zh_CN.md) atau [Bahasa Melayu](README_ms_MY.md).* + +## Ciri-ciri baru + + * Menu pilihan dengan pelbagai tetapan, termasuk pemetaan semula butang. + * Pilihan untuk pemuatan data luaran (setakat ini hanya tekstur dan papan suara yang dipasang), memberikan sokongan untuk pek tekstur tersuai. + * Pilihan untuk rupa kamera analog dan tetikus (menggunakan [Puppycam](https://github.com/FazanaJ/puppycam)). + * Pilihan untuk perender berasaskan OpenGL1.3 untuk mesin yang lebih tua, serta perender asli GL2.1, D3D11 dan D3D12 dari Emill's [n64-fast3d-engine](https://github.com/Emill/n64-fast3d-engine/). + * Pilihan untuk menyahaktifkan jarak lukisan. + * Pilihan untuk pembaikan model dan tekstur (mis. Tekstur asap). + * Langkau cutscenes pengenalan Peach & Lakitu dengan pilihan CLI `--skip-intro`. + * Menu cheats di Options (aktifkan dengan `--cheats` atau dengan menekan L tiga kali di menu pause). + * Sokongan untuk kedua-dua fail simpanan little-endian dan big-endian (bermaksud anda boleh menggunakan fail simpan dari sm64-port dan kebanyakan emulator), serta format simpanan berasaskan teks pilihan. + +Perubahan terbaru di Nightly telah memindahkan laluan fail simpan dan konfigurasi ke `%HOMEPATH%\AppData\Roaming\sm64pc` pada Windows dan `$HOME/.local/share/sm64pc` di Linux. Tingkah laku ini dapat diubah dengan `--savepath` pilihan CLI. +For example `--savepath .` akan membaca simpanan dari direktori semasa (yang tidak selalu sepadan dengan direktori exe, tetapi selalunya ia berlaku); + `--savepath '!'` akan membaca simpanan dari direktori executable. + +## Pembangunan +Untuk arahan pembangunan, sila rujuk di [wiki](https://github.com/sm64pc/sm64ex/wiki). + +**Pastikan anda mempunyai MXE terlebih dahulu sebelum cuba compile untuk Windows di Linux dan WSL. Ikuti panduan di wiki.** From d67df4ce903c9dea17773916a3571cd1eb9eaf31 Mon Sep 17 00:00:00 2001 From: TeeVenDick Date: Fri, 16 Oct 2020 12:51:22 +0800 Subject: [PATCH 5/5] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ce9742bc..dbf736bb 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Run `./extract_assets.py --clean && make clean` or `make distclean` to remove RO Please contribute **first** to the [nightly branch](https://github.com/sm64pc/sm64ex/tree/nightly/). New functionality will be merged to master once they're considered to be well-tested. -*Read this in other languages: [Español](README_es_ES.md), [Português](README_pt_BR.md), [简体中文](README_zh_CN.md) atau [Bahasa Melayu](README_ms_MY.md).* +*Read this in other languages: [Español](README_es_ES.md), [Português](README_pt_BR.md), [简体中文](README_zh_CN.md) or [Bahasa Melayu](README_ms_MY.md).* ## New features