A few more fixes

(cherry picked from commit 0cbab3fb6e)

.editorconfig

@@ -1,8 +1,8 @@
-# Indicate there is no need to continue trawling
-root = true
-
-# Cyan's source files use tabs... mostly...
-[*]
-end_of_line = crlf
-indent_style = tab
-indent_size = 4
+# Indicate there is no need to continue trawling
+root = true
+
+# Cyan's source files use tabs... mostly...
+[*]
+end_of_line = crlf
+indent_style = tab
+indent_size = 4

.gitignore

@@ -0,0 +1 @@
+build/*

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "MOULOpenSourceClientPlugin/SDK-binary"]
+	path = MOULOpenSourceClientPlugin/SDK-binary
+	url = https://foundry.openuru.org/gitblit/r/CWE-SDKs/SDK-binary-VS2010

.hgignore

@@ -1,18 +0,0 @@
-syntax: glob
-*.aps
-*.ncb
-*.opensdf
-*.pyc
-*.sdf
-*.suo
-*.user
-syntax: regexp
-Debug*/
-Release*/
-^MOULOpenSourceClientPlugin/Plasma20/Doxy/
-^MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/external/render/
-^MOULOpenSourceClientPlugin/Plasma20/test/
-^MOULOpenSourceClientPlugin/Plasma20/tools/
-^MOULOpenSourceClientPlugin/StaticSDKs/
-^patch/
-ipch/

CMakeLists.txt

@@ -0,0 +1,55 @@
+project(Plasma)
+cmake_minimum_required(VERSION 2.8)
+
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+
+# Find all 3rd-party libraries that are required
+find_package(OpenSSL REQUIRED)
+find_package(OpenAL REQUIRED)
+find_package(PythonLibs REQUIRED)
+find_package(EXPAT REQUIRED)
+find_package(ZLIB REQUIRED)
+find_package(PHYSX REQUIRED)  #TODO: Not required if we aren't building the client
+find_package(Ogg REQUIRED)    #TODO: Not required if we aren't building the client
+find_package(Vorbis REQUIRED) #TODO: Not required if we aren't building the client
+find_package(Speex REQUIRED)  #TODO: Not required if we aren't building the client
+#find_package(BINK REQUIRED)  #TODO: Find Bink, but don't require it if plPipeline isn't built...
+#                                    Or better yet, just eliminate bink altogether
+
+option(EXTERNAL_RELEASE "Is this release intended for the general public?" OFF)
+
+#TODO: Don't hard code this
+add_definitions(-DBUILD_TYPE=BUILD_TYPE_LIVE)
+
+if(EXTERNAL_RELEASE)
+	add_definitions(-DPLASMA_EXTERNAL_RELEASE)
+endif(EXTERNAL_RELEASE)
+
+set(PLASMA_TARGETS Client
+    CACHE STRING "Which set of plasma targets to build and use")
+set_property(CACHE PLASMA_TARGETS PROPERTY STRINGS
+             "Client" "Server" "Patcher" "Ethereal" "NoAvMsgs")
+
+if(PLASMA_TARGETS STREQUAL "Patcher")
+	add_definitions(-DPATCHER)
+endif(PLASMA_TARGETS STREQUAL "Patcher")
+
+if(PLASMA_TARGETS STREQUAL "Server")
+	add_definitions(-DSERVER)
+endif(PLASMA_TARGETS STREQUAL "Server")
+
+if(PLASMA_TARGETS STREQUAL "NoAvMsgs")
+	add_definitions(-DNO_AV_MSGS)
+endif(PLASMA_TARGETS STREQUAL "NoAvMsgs")
+
+if(PLASMA_TARGETS STREQUAL "Ethereal")
+	add_definitions(-DSTREAM_LOGGER)
+endif(PLASMA_TARGETS STREQUAL "Ethereal")
+
+if(MSVC)
+	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+	add_definitions(-D_SCL_SECURE_NO_WARNINGS)
+endif(MSVC)
+
+add_subdirectory(Sources/Plasma)
+# add_subdirectory(Sources/Tools)

Docs/ReleaseNotes/ReleaseNotes.txt

@@ -1,18 +1,18 @@
-Welcome to MYST Online:UruLive!
-.
-.
-Thanks to all the fan contributors!
-.
-Release notes for build 918
-- Fixed Console documentation
-- Allow clickables while sitting or AFK
-- Fixed various JPEG issues
-- Free the cursor
-- Fixed improper calculated initial window size
-- Improved cursors
-- Removed broken share from Sharper's Office link
-- Fixed GreatZero stain glass to be random
-- Avatar physics updated
-- Fix pellet points stealing
-- Bink removed
-- Fixed remote code exec with Python.Cheat and RunFile
+Welcome to MYST Online:UruLive!
+.
+.
+Thanks to all the fan contributors!
+.
+Release notes for build 918
+- Fixed Console documentation
+- Allow clickables while sitting or AFK
+- Fixed various JPEG issues
+- Free the cursor
+- Fixed improper calculated initial window size
+- Improved cursors
+- Removed broken share from Sharper's Office link
+- Fixed GreatZero stain glass to be random
+- Avatar physics updated
+- Fix pellet points stealing
+- Bink removed
+- Fixed remote code exec with Python.Cheat and RunFile

MOULOpenSourceClientPlugin/COPYING.txt

@@ -1,41 +1,41 @@
-/*==COPYING==*
-
-CyanWorlds.com Engine - MMOG client, server and tools
-Copyright (C) 2011 Cyan Worlds, Inc.
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Additional permissions under GNU GPL version 3 section 7
-
-If you modify this Program, or any covered work, by linking or
-combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
-NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
-JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
-(or a modified version of those libraries),
-containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
-PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
-JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
-licensors of this Program grant you additional
-permission to convey the resulting work. Corresponding Source for a
-non-source form of such a combination shall include the source code for
-the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
-work.
-
-You can contact Cyan Worlds, Inc. by email legal@cyan.com
- or by snail mail at:
-      Cyan Worlds, Inc.
-      14617 N Newport Hwy
-      Mead, WA   99021
-
-*==COPYING==*/
+/*==COPYING==*
+
+CyanWorlds.com Engine - MMOG client, server and tools
+Copyright (C) 2011 Cyan Worlds, Inc.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Additional permissions under GNU GPL version 3 section 7
+
+If you modify this Program, or any covered work, by linking or
+combining it with any of RAD Game Tools Bink SDK, Autodesk 3ds Max SDK,
+NVIDIA PhysX SDK, Microsoft DirectX SDK, OpenSSL library, Independent
+JPEG Group JPEG library, Microsoft Windows Media SDK, or Apple QuickTime SDK
+(or a modified version of those libraries),
+containing parts covered by the terms of the Bink SDK EULA, 3ds Max EULA,
+PhysX SDK EULA, DirectX SDK EULA, OpenSSL and SSLeay licenses, IJG
+JPEG Library README, Windows Media SDK EULA, or QuickTime SDK EULA, the
+licensors of this Program grant you additional
+permission to convey the resulting work. Corresponding Source for a
+non-source form of such a combination shall include the source code for
+the parts of OpenSSL and IJG JPEG Library used as well as that of the covered
+work.
+
+You can contact Cyan Worlds, Inc. by email legal@cyan.com
+ or by snail mail at:
+      Cyan Worlds, Inc.
+      14617 N Newport Hwy
+      Mead, WA   99021
+
+*==COPYING==*/

MOULOpenSourceClientPlugin/CREDITS.txt

@@ -1,79 +1,79 @@
-/*==CREDITS.txt==*
-
-LEGAL
--------
-MYST is a registered trademark of Cyan Worlds, Inc. All rights reserved.
-
-NVIDIA (formerly AGEIA)-provider of the PhysX physics engine. AGEIA™ and
-PhysX™ are trademarks of AGEIA Technologies, Inc. and are used under license.
-
-Uses Bink Video. Copyright C 1997-2006 by RAD Game Tools, Inc.
-
-FaceGen Modeller 2.1 Singular Inversions, Inc.
-
-Artbeats Digital Film Library Artbeats
-
-This product includes software developed by the OpenSSL Project for use in
-the OpenSSL Toolkit (http://www.openssl.org/)
-
-Free Type The FreeType Project is copyright C 1996-2000 by David Turner,
-
-Robert Wilhelm, and Werner Lemberg. All rights reserved.
-
-Python Copyright C 2001, 2002 Python Software Foundation. All rights
-reserved.
-
-Boost Copyright C 2002 CrystalClear Software, inc. Permission to use, copy,
-modify, distribute and sell this software for any purpose is hereby granted
-without fee.
-
-Speex (libspeex) © 2002-2003, Jean-Marc Valin/Xiph.Org Foundation
-Ogg (libogg) Copyright (c) 2002, Xiph.org Foundation
-Vorbis (libvorbis) Copyright (c) 2002-2008 Xiph.org Foundation
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-• Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-• Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the
-distribution.
-• Neither the name of the Xiph.org Foundation nor the names of its
-contributors may be used to endorse or promote products derived
-from this software without specific prior written permission.
-
-This software is provided by the copyright holders and contributors “as
-is” and any express or implied warranties, including, but not limited
-to, the implied warranties of merchantability and fitness for a
-particular purpose are disclaimed. In no event shall the foundation or
-contributors be liable for any direct, indirect, incidental, special,
-exemplary, or consequential damages (including, but not limited to,
-procurement of substitute goods or services; loss of use, data, or
-profits; or business interruption) however caused and on any theory of
-liability, whether in contract, strict liability, or tort (including
-negligence or otherwise) arising in any way out of the use of this
-software, even if advised of the possibility of such damage.
-
-LibJpeg Libpng versions 1.0.7, July 1, 2000, through 1.2.5, October 3, 2002,
-are Copyright C 2000-2002 Glenn Randers-Pehrson
-
-zLib zlib C1995-2002 Jean-loup Gailly and Mark Adler
-
-Expat Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and
-Clark Cooper
-Expat Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
-
-Uses OpenAL 3D Audio - http://openal.org
-
-Friends of Sironka Dance Troupe Some sounds and vocal recording provided by
-the Friends of Sironka Dance Troupe, nonexclusively licensed by Cyan, used
-by permission.
-
-Burn You Up, Burn You Down performed by Peter Gabriel. Written by Peter
-Gabriel, Neil Sparkes and Karl Wallinger. Published by Real World Music
-Limited/Universal Music Limited. Peter Gabriel appears courtesy of Real
-World Records'/ Geffen Records and EMI Records.
-
-*==CREDITS==*/
+/*==CREDITS.txt==*
+
+LEGAL
+-------
+MYST is a registered trademark of Cyan Worlds, Inc. All rights reserved.
+
+NVIDIA (formerly AGEIA)-provider of the PhysX physics engine. AGEIA™ and
+PhysX™ are trademarks of AGEIA Technologies, Inc. and are used under license.
+
+Uses Bink Video. Copyright C 1997-2006 by RAD Game Tools, Inc.
+
+FaceGen Modeller 2.1 Singular Inversions, Inc.
+
+Artbeats Digital Film Library Artbeats
+
+This product includes software developed by the OpenSSL Project for use in
+the OpenSSL Toolkit (http://www.openssl.org/)
+
+Free Type The FreeType Project is copyright C 1996-2000 by David Turner,
+
+Robert Wilhelm, and Werner Lemberg. All rights reserved.
+
+Python Copyright C 2001, 2002 Python Software Foundation. All rights
+reserved.
+
+Boost Copyright C 2002 CrystalClear Software, inc. Permission to use, copy,
+modify, distribute and sell this software for any purpose is hereby granted
+without fee.
+
+Speex (libspeex) © 2002-2003, Jean-Marc Valin/Xiph.Org Foundation
+Ogg (libogg) Copyright (c) 2002, Xiph.org Foundation
+Vorbis (libvorbis) Copyright (c) 2002-2008 Xiph.org Foundation
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+• Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+• Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in
+the documentation and/or other materials provided with the
+distribution.
+• Neither the name of the Xiph.org Foundation nor the names of its
+contributors may be used to endorse or promote products derived
+from this software without specific prior written permission.
+
+This software is provided by the copyright holders and contributors “as
+is” and any express or implied warranties, including, but not limited
+to, the implied warranties of merchantability and fitness for a
+particular purpose are disclaimed. In no event shall the foundation or
+contributors be liable for any direct, indirect, incidental, special,
+exemplary, or consequential damages (including, but not limited to,
+procurement of substitute goods or services; loss of use, data, or
+profits; or business interruption) however caused and on any theory of
+liability, whether in contract, strict liability, or tort (including
+negligence or otherwise) arising in any way out of the use of this
+software, even if advised of the possibility of such damage.
+
+LibJpeg Libpng versions 1.0.7, July 1, 2000, through 1.2.5, October 3, 2002,
+are Copyright C 2000-2002 Glenn Randers-Pehrson
+
+zLib zlib C1995-2002 Jean-loup Gailly and Mark Adler
+
+Expat Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and
+Clark Cooper
+Expat Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers.
+
+Uses OpenAL 3D Audio - http://openal.org
+
+Friends of Sironka Dance Troupe Some sounds and vocal recording provided by
+the Friends of Sironka Dance Troupe, nonexclusively licensed by Cyan, used
+by permission.
+
+Burn You Up, Burn You Down performed by Peter Gabriel. Written by Peter
+Gabriel, Neil Sparkes and Karl Wallinger. Published by Real World Music
+Limited/Universal Music Limited. Peter Gabriel appears courtesy of Real
+World Records'/ Geffen Records and EMI Records.
+
+*==CREDITS==*/