From be8146edeb278006be581c52063656dad9be8832 Mon Sep 17 00:00:00 2001 From: milesthenerd Date: Mon, 22 Feb 2021 19:54:23 -0600 Subject: [PATCH 1/6] Update README.md --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index eafc7ce7..5b1f48f3 100644 --- a/README.md +++ b/README.md @@ -70,6 +70,8 @@ A copy of the latest release build of the AM2R Community Updates, which can be i ## Installation This repository, being based on YellowAfterlife's source reconstruction, is installed in a very similar fashion. Please refer to his installation instructions [here](https://gitlab.com/yellowafterlife/AM2Rrc/-/tree/master/), but replace 1.1's `data.win` with the latest Community Update `AM2R.exe`. -Afterwards, replace the two blank shader assets with default GM:S shader skeletons or your own copy of each shader, as well as the accompanying script files for the Retro Palette Swapper: `pal_swap_init_system` and `pal_swap_set`. +Afterwards, replace the two blank shader assets with default GM:S shader skeletons or your own copy of each shader, as well as the accompanying script files for the Retro Palette Swapper: pal_swap_init_system and pal_swap_set. -Finally, you will need to install `modifiers.ini` as well as the `lang` and `mods` folders as datafiles within the GM:S project. The default ones do not contain the actual assets and are merely references. These can be copied over from your AM2R_15_2 folder. +WARNING: If the two above scripts are not replaced before opening the project file, GM:S 1.4 will replace them with references in the asset tree at Scripts/Lojical/Shaders/. This will produce numerous seemingly unrelated errors until they are deleted and replaced with the appropriately named scripts. + +Finally, you will need to install modifiers.ini as well as the lang and mods folders as datafiles within the GM:S project. The default ones do not contain the actual assets and are merely references. These can be copied over from your AM2R_15_2 folder. From ace8b8dd228fd99ebdc86f291fe373db9af32d13 Mon Sep 17 00:00:00 2001 From: milesthenerd Date: Tue, 2 Mar 2021 03:53:02 -0600 Subject: [PATCH 2/6] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5b1f48f3..2afc155d 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ You will need to replace them with default shader code in order for the project Finally, we have excluded the datafiles and changelog from this repository to further enforce the removal of trademarks. ## License -Please read our [license](https://github.com/Lojemiru/AM2R-Community-Updates/blob/main/LICENSE) before distributing, modifying, contributing to, or otherwise interacting with this project. +Please read our [license](https://github.com/lassiterm/AM2R-Multitroid/blob/main/LICENSE) before distributing, modifying, contributing to, or otherwise interacting with this project. ## Contributing Please read our [Contribution Guidelines](https://github.com/Lojemiru/AM2R-Community-Updates/blob/main/CONTRIBUTING.md) before opening any issues or creating pull requests. From a3c1e2b59b63c5bc631c20283c1f795239932613 Mon Sep 17 00:00:00 2001 From: milesthenerd Date: Tue, 2 Mar 2021 04:18:27 -0600 Subject: [PATCH 3/6] Update LICENSE --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index a0286b4e..8c9cb04d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2020 AM2R Community Updates Development Team +Copyright (c) 2021 AM2R Community Updates Development Team All rights reserved to the original code authors: Milton 'DoctorM64' Guasti and Martin Piecyk. From 1cbd3e9dded2f79eb5dea58e33f920b8bfe90748 Mon Sep 17 00:00:00 2001 From: milesthenerd Date: Sun, 14 Mar 2021 21:45:18 -0500 Subject: [PATCH 4/6] Update README.md --- README.md | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 2afc155d..e340ca72 100644 --- a/README.md +++ b/README.md @@ -3,24 +3,21 @@ ## Co-op Changes String compression scripts are by Homunculus: https://marketplace.yoyogames.com/assets/4560/strict -m5x7 font by Daniel Linssen: https://managore.itch.io/m5x7 - Special thanks to Lojical/Lojemiru and ShirtyScarab for help with programming and art. The source code here has the same requirements as the original repo in order for it to work. Only the code and my changes have been included. -Currently syncs all health, items, metroids, events, and power-ups. The Queen fight is synced, the reactor explosion sequence is synced, the transition to the credits at the end is synced, and death is synced. (There may be more things synced that I've forgotten about.) +Currently syncs all health, ammo, items, metroids, events, and power-ups. The Queen fight is synced, boss deaths are synced, the reactor explosion sequence is synced, the transition to the credits at the end is synced, and death is synced. If players die, progress will be kept for a better user experience. -Currently, pressing F1 will make an attempt to connect to the server. F2 will disconnect from the server. F3 will show the current random seed. F4 will toggle nametags. - -Put the ip and port of the server you want to connect to into the mod settings.ini. +There is a Multitroid Settings menu under Options that allows you to change whatever mod settings you need to and connect/disconnect. There is no longer a need to manually edit the mod_settings.ini. The server can be found here: https://github.com/lassiterm/AM2R-Server ## To-do List - - I've covered most of what I wanted to add, but if you have any suggestions, feel free to @milesthenerd in the AM2R Discord Server. + - The only remaining plan is to add a special game mode :) + - If you have any suggestions, feel free to @milesthenerd in the AM2R Discord Server. ## What is this? The source code for the AM2R Community Updates 1.5.x branch, free of copyrighted assets and trademarks. @@ -70,8 +67,6 @@ A copy of the latest release build of the AM2R Community Updates, which can be i ## Installation This repository, being based on YellowAfterlife's source reconstruction, is installed in a very similar fashion. Please refer to his installation instructions [here](https://gitlab.com/yellowafterlife/AM2Rrc/-/tree/master/), but replace 1.1's `data.win` with the latest Community Update `AM2R.exe`. -Afterwards, replace the two blank shader assets with default GM:S shader skeletons or your own copy of each shader, as well as the accompanying script files for the Retro Palette Swapper: pal_swap_init_system and pal_swap_set. - -WARNING: If the two above scripts are not replaced before opening the project file, GM:S 1.4 will replace them with references in the asset tree at Scripts/Lojical/Shaders/. This will produce numerous seemingly unrelated errors until they are deleted and replaced with the appropriately named scripts. +Afterwards, replace the two blank shader assets with default GM:S shader skeletons or your own copy of each shader, as well as the accompanying script files for the Retro Palette Swapper: `pal_swap_init_system` and `pal_swap_set`. -Finally, you will need to install modifiers.ini as well as the lang and mods folders as datafiles within the GM:S project. The default ones do not contain the actual assets and are merely references. These can be copied over from your AM2R_15_2 folder. +Finally, you will need to install `modifiers.ini` as well as the `lang` and `mods` folders as datafiles within the GM:S project. The default ones do not contain the actual assets and are merely references. These can be copied over from your AM2R_15_2 folder. From d90b1806f92324d9e976a422872bdff155ff56e5 Mon Sep 17 00:00:00 2001 From: milesthenerd Date: Wed, 7 Apr 2021 23:37:44 -0500 Subject: [PATCH 5/6] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index e340ca72..6604cbaf 100644 --- a/README.md +++ b/README.md @@ -70,3 +70,7 @@ This repository, being based on YellowAfterlife's source reconstruction, is inst Afterwards, replace the two blank shader assets with default GM:S shader skeletons or your own copy of each shader, as well as the accompanying script files for the Retro Palette Swapper: `pal_swap_init_system` and `pal_swap_set`. Finally, you will need to install `modifiers.ini` as well as the `lang` and `mods` folders as datafiles within the GM:S project. The default ones do not contain the actual assets and are merely references. These can be copied over from your AM2R_15_2 folder. + + +trackgit-views + From 5cf3b52b92c1d2601ff1a490247e022280e87d02 Mon Sep 17 00:00:00 2001 From: milesthenerd Date: Wed, 7 Apr 2021 23:38:51 -0500 Subject: [PATCH 6/6] Update README.md --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 6604cbaf..e340ca72 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,3 @@ This repository, being based on YellowAfterlife's source reconstruction, is inst Afterwards, replace the two blank shader assets with default GM:S shader skeletons or your own copy of each shader, as well as the accompanying script files for the Retro Palette Swapper: `pal_swap_init_system` and `pal_swap_set`. Finally, you will need to install `modifiers.ini` as well as the `lang` and `mods` folders as datafiles within the GM:S project. The default ones do not contain the actual assets and are merely references. These can be copied over from your AM2R_15_2 folder. - - -trackgit-views -