Merge branch 'arc-3-0-0' into 'dev'

Getting ready for arc 3.0.0-stable

See merge request morningstar/Arcturus-Community!424
This commit is contained in:
Remco 2021-04-06 20:22:45 +00:00
commit 2b1aee87f2
5 changed files with 37 additions and 14 deletions

View File

@ -11,10 +11,11 @@ TheGeneral's own words were "dont like it then dont use it". We did not like wha
Arcturus Morningstar is released under the [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0.txt). Arcturus Morningstar is released under the [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0.txt).
## Versions ## ## Versions ##
![image](https://img.shields.io/badge/VERSION-2.4.0-success.svg?style=for-the-badge&logo=appveyor) [![image](https://img.shields.io/badge/VERSION-3.0.0-success.svg?style=for-the-badge&logo=appveyor)](#)
![image](https://img.shields.io/badge/STATUS-STABLE-blue.svg?style=for-the-badge&logo=appveyor) [![image](https://img.shields.io/badge/STATUS-STABLE-blue.svg?style=for-the-badge&logo=appveyor)](#)
[![image](https://img.shields.io/discord/557240155040251905?style=for-the-badge&logo=discord&color=7289DA&label=DISCORD&logoColor=fff)](https://discord.gg/BzfFsTp)
Compiled Download: https://git.krews.org/morningstar/Arcturus-Community/releases Compiled Download: https://git.krews.org/morningstar/Arcturus-Community/-/releases
Client build: **PRODUCTION-201611291003-338511768** Client build: **PRODUCTION-201611291003-338511768**
@ -24,17 +25,36 @@ When making an bug report or a feature request use the template we provide so th
## Credits ## ## Credits ##
- TheGeneral - TheGeneral
- Capheus (Decompilation.)
- Harmonic
- Beny - Beny
- Claudio
- Alejandro - Alejandro
- Harmony - Capheus
- Quadral (Pathfinder)
- Skeletor - Skeletor
- z - Harmonic
- ArpyAge
- Mike - Mike
- Remco
- zGrav
- Quadral
- Harmony
- Swirny
- ArpyAge
- Mikkel
- Rodolfo
- Rasmus
- Kitt Mustang
- Snaiker
- nttzx
- necmi
- Dome
- Jose Flores
- Cam
- Oliver
- Narzo
- Tenshie
- MartenM
- Ridge
- SenpaiDipper
- Snaiker
- Thijmen
## Discord ## ## Discord ##

View File

@ -38,7 +38,7 @@ public final class Emulator {
public final static int MAJOR = 3; public final static int MAJOR = 3;
public final static int MINOR = 0; public final static int MINOR = 0;
public final static int BUILD = 0; public final static int BUILD = 0;
public final static String PREVIEW = "Beta 1"; public final static String PREVIEW = "";
public static final String version = "Arcturus Morningstar" + " " + MAJOR + "." + MINOR + "." + BUILD + " " + PREVIEW; public static final String version = "Arcturus Morningstar" + " " + MAJOR + "." + MINOR + "." + BUILD + " " + PREVIEW;
private static final String logo = private static final String logo =

View File

@ -16,7 +16,7 @@ public class AboutCommand extends Command {
} }
public static String credits = "Arcturus Morningstar is an opensource project based on Arcturus By TheGeneral \n" + public static String credits = "Arcturus Morningstar is an opensource project based on Arcturus By TheGeneral \n" +
"The Following people have all contributed to this emulator:\n" + "The Following people have all contributed to this emulator:\n" +
" TheGeneral\n Beny\n Alejandro\n Capheus\n Skeletor\n Harmonic\n Mike\n Remco\n zGrav \n Quadral \n Harmony\n Swirny\n ArpyAge\n Mikkel\n Rodolfo\n Rasmus\n Kitt Mustang\n Snaiker\n nttzx\n necmi\n Dome\n Jose Flores\n Cam\n Oliver\n Narzo\n Tenshie\n MartenM\n Ridge\n SenpaiDipper"; " TheGeneral\n Beny\n Alejandro\n Capheus\n Skeletor\n Harmonic\n Mike\n Remco\n zGrav \n Quadral \n Harmony\n Swirny\n ArpyAge\n Mikkel\n Rodolfo\n Rasmus\n Kitt Mustang\n Snaiker\n nttzx\n necmi\n Dome\n Jose Flores\n Cam\n Oliver\n Narzo\n Tenshie\n MartenM\n Ridge\n SenpaiDipper\n Snaiker\n Thijmen";
@Override @Override
public boolean handle(GameClient gameClient, String[] params) { public boolean handle(GameClient gameClient, String[] params) {

View File

@ -14,7 +14,10 @@ public class SaveWindowSettingsEvent extends MessageHandler {
windowSettings.width = this.packet.readInt(); windowSettings.width = this.packet.readInt();
windowSettings.height = this.packet.readInt(); windowSettings.height = this.packet.readInt();
windowSettings.openSearches = this.packet.readBoolean(); boolean openSearches = this.packet.readBoolean();
int unknown = this.packet.readInt(); windowSettings.openSearches = openSearches;
int unknownVar = this.packet.readInt();
int unknown = unknownVar;
} }
} }