diff --git a/Packaging/nix/README.txt b/Packaging/nix/README.txt new file mode 100644 index 000000000..ee9176602 --- /dev/null +++ b/Packaging/nix/README.txt @@ -0,0 +1,33 @@ +# DevilutionX +Diablo build for modern operating systems + +Discord: https://discord.gg/aQBQdDe +GitHub: https://github.com/diasurgical/devilutionX + +# How To Install: + - Extract the files in the zip. + - Install libsdl2 libsdl2-mixer libsdl2-ttf + - Copy diabdat.mpq from your CD, or GoG install folder, to the DevilutionX install folder; Make sure it is all lowercase. + - Run ./devilutionx + +# Multiplayer + - TCP/IP only requires the host to expose port 6112 + - UPD/IP requires that all players expose port 6112 (currently disabled) + +All games are encrypted and password protected. + +# Save Games and configurations +The configurations and save games are located in: +~/.local/share/diasurgical/devilution + +# Credits + - See list of contributors https://github.com/diasurgical/devilutionX/graphs/contributors + +# Legal +This software is being released to the Public Domain. No assets of Diablo are being provided. You must own a copy of Diablo and have access to the assets beforehand in order to use this software. + +Battle.net(R) - Copyright (C) 1996 Blizzard Entertainment, Inc. All rights reserved. Battle.net and Blizzard Entertainment are trademarks or registered trademarks of Blizzard Entertainment, Inc. in the U.S. and/or other countries. + +Diablo(R) - Copyright (C) 1996 Blizzard Entertainment, Inc. All rights reserved. Diablo and Blizzard Entertainment are trademarks or registered trademarks of Blizzard Entertainment, Inc. in the U.S. and/or other countries. + +This software is in no way associated with or endorsed by Blizzard Entertainment(R). diff --git a/Packaging/pi/README.txt b/Packaging/pi/README.txt new file mode 100644 index 000000000..edeb9c456 --- /dev/null +++ b/Packaging/pi/README.txt @@ -0,0 +1,36 @@ +# DevilutionX +Diablo build for modern operating systems + +Discord: https://discord.gg/aQBQdDe +GitHub: https://github.com/diasurgical/devilutionX + +# How To Install: + - Extract the files in the zip. + - Install libsdl2 libsdl2-mixer libsdl2-ttf + - Copy diabdat.mpq from your CD, or GoG install folder, to the DevilutionX install folder; Make sure it is all lowercase. + - Run ./devilutionx + +# Raspberry Pi performance + - For the best experience set upscale=0 in diablo.ini and set the system resolution to 640x480 + +# Multiplayer + - TCP/IP only requires the host to expose port 6112 + - UPD/IP requires that all players expose port 6112 (currently disabled) + +All games are encrypted and password protected. + +# Save Games and configurations +The configurations and save games are located in: +~/.local/share/diasurgical/devilution + +# Credits + - See list of contributors https://github.com/diasurgical/devilutionX/graphs/contributors + +# Legal +This software is being released to the Public Domain. No assets of Diablo are being provided. You must own a copy of Diablo and have access to the assets beforehand in order to use this software. + +Battle.net(R) - Copyright (C) 1996 Blizzard Entertainment, Inc. All rights reserved. Battle.net and Blizzard Entertainment are trademarks or registered trademarks of Blizzard Entertainment, Inc. in the U.S. and/or other countries. + +Diablo(R) - Copyright (C) 1996 Blizzard Entertainment, Inc. All rights reserved. Diablo and Blizzard Entertainment are trademarks or registered trademarks of Blizzard Entertainment, Inc. in the U.S. and/or other countries. + +This software is in no way associated with or endorsed by Blizzard Entertainment(R). diff --git a/Packaging/windows/README.txt b/Packaging/windows/README.txt new file mode 100644 index 000000000..cbb3b0690 --- /dev/null +++ b/Packaging/windows/README.txt @@ -0,0 +1,32 @@ +# DevilutionX +Diablo build for modern operating systems + +Discord: https://discord.gg/aQBQdDe +GitHub: https://github.com/diasurgical/devilutionX + +# How To Install: + - Extract the files in the zip + - Copy diabdat.mpq from your CD, or GoG install folder, to the DevilutionX install folder. + - Run devilutionx.exe + +# Multiplayer + - TCP/IP only requires the host to expose port 6112 + - UPD/IP requires that all players expose port 6112 (currently disabled) + +All games are encrypted and password protected. + +# Save Games and configurations +The configurations and save games are located in: +C:\Users\[username]\AppData\Roaming\diasurgical\devilution + +# Credits + - See list of contributors https://github.com/diasurgical/devilutionX/graphs/contributors + +# Legal +This software is being released to the Public Domain. No assets of Diablo are being provided. You must own a copy of Diablo and have access to the assets beforehand in order to use this software. + +Battle.net(R) - Copyright (C) 1996 Blizzard Entertainment, Inc. All rights reserved. Battle.net and Blizzard Entertainment are trademarks or registered trademarks of Blizzard Entertainment, Inc. in the U.S. and/or other countries. + +Diablo(R) - Copyright (C) 1996 Blizzard Entertainment, Inc. All rights reserved. Diablo and Blizzard Entertainment are trademarks or registered trademarks of Blizzard Entertainment, Inc. in the U.S. and/or other countries. + +This software is in no way associated with or endorsed by Blizzard Entertainment(R). diff --git a/SourceX/DiabloUI/selconn.cpp b/SourceX/DiabloUI/selconn.cpp index 1a57fb556..ca2f2f56d 100644 --- a/SourceX/DiabloUI/selconn.cpp +++ b/SourceX/DiabloUI/selconn.cpp @@ -22,7 +22,9 @@ UiArtText SELCONNECT_DIALOG_DESCRIPTION(selconn_Description, { 35, 275, 205, 66 UiListItem SELCONN_DIALOG_ITEMS[] = { #ifndef NONET { "Client-Server (TCP)", 0 }, +#ifdef BUGGY { "Peer-to-Peer (UDP)", 1 }, +#endif { "Loopback", 2 }, #else { "Loopback", 0 },