diff --git a/.gitignore b/.gitignore index fbb895bf..fd0bdcc2 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,10 @@ qkey installed.lst *.kdev4 hl2/* +bshift/* +baseq2/* +gangstawars/* +nightfire/* *.ico src/engine/ bin/ diff --git a/platform/base_postproc.pk3dir/postproc_dull.cfg b/platform/base_postproc.pk3dir/postproc_dull.cfg index 1f8a692d..ecb9f2fe 100644 --- a/platform/base_postproc.pk3dir/postproc_dull.cfg +++ b/platform/base_postproc.pk3dir/postproc_dull.cfg @@ -1,5 +1,5 @@ -// fake 3dfx voodoo settings -// aesthetic feature only +// 'dull' visual effects setting +// emulates the way HL looks on OpenGL seta gl_texturemode GL_LINEAR_MIPMAP_LINEAR seta d_mipcap 0 1000 diff --git a/platform/base_postproc.pk3dir/postproc_none.cfg b/platform/base_postproc.pk3dir/postproc_none.cfg index d34e1ed3..a888a33f 100644 --- a/platform/base_postproc.pk3dir/postproc_none.cfg +++ b/platform/base_postproc.pk3dir/postproc_none.cfg @@ -1,5 +1,4 @@ -// fake 3dfx voodoo settings -// aesthetic feature only +// standard video tweaks exec platform_default.cfg diff --git a/platform/base_postproc.pk3dir/postproc_software.cfg b/platform/base_postproc.pk3dir/postproc_software.cfg index 0c951fd5..c0902b88 100644 --- a/platform/base_postproc.pk3dir/postproc_software.cfg +++ b/platform/base_postproc.pk3dir/postproc_software.cfg @@ -1,5 +1,4 @@ -// fake 3dfx voodoo settings -// aesthetic feature only +// fake software renderer settings seta gl_texturemode GL_NEAREST_MIPMAP_NEAREST seta d_mipcap 0 1000 diff --git a/platform/base_postproc.pk3dir/postproc_unreal.cfg b/platform/base_postproc.pk3dir/postproc_unreal.cfg index f4abc01a..1a2d7352 100644 --- a/platform/base_postproc.pk3dir/postproc_unreal.cfg +++ b/platform/base_postproc.pk3dir/postproc_unreal.cfg @@ -1,5 +1,4 @@ -// fake 3dfx voodoo settings -// aesthetic feature only +// fake unreal engine 1 renderer settings seta gl_texturemode GL_NEAREST_MIPMAP_NEAREST seta d_mipcap 0 1000 diff --git a/platform/base_scripts.pk3dir/fonts/chat.font b/platform/base_scripts.pk3dir/fonts/chat.font index 74cddcd6..28804166 100644 --- a/platform/base_scripts.pk3dir/fonts/chat.font +++ b/platform/base_scripts.pk3dir/fonts/chat.font @@ -1,2 +1,2 @@ -path gfx/shell/arial.ttf -size 8 \ No newline at end of file +path fonts/ibm/IBMPlexSansCondensed-Medium.otf +size 12 \ No newline at end of file diff --git a/platform/base_scripts.pk3dir/fonts/font16.font b/platform/base_scripts.pk3dir/fonts/font16.font index 5040cfd9..15482597 100644 --- a/platform/base_scripts.pk3dir/fonts/font16.font +++ b/platform/base_scripts.pk3dir/fonts/font16.font @@ -1,2 +1,2 @@ -path gfx/shell/arial.ttf -size 16 +path fonts/ibm/IBMPlexSansCondensed-Medium.otf +size 16 \ No newline at end of file diff --git a/platform/base_scripts.pk3dir/fonts/font20.font b/platform/base_scripts.pk3dir/fonts/font20.font index 30abfa7c..2ac18956 100644 --- a/platform/base_scripts.pk3dir/fonts/font20.font +++ b/platform/base_scripts.pk3dir/fonts/font20.font @@ -1,2 +1,2 @@ -path gfx/shell/arial.ttf +path fonts/ibm/IBMPlexSansCondensed-Medium.otf size 20 \ No newline at end of file diff --git a/platform/base_scripts.pk3dir/fonts/fontcon.font b/platform/base_scripts.pk3dir/fonts/fontcon.font index d0a32e9f..9640243c 100644 --- a/platform/base_scripts.pk3dir/fonts/fontcon.font +++ b/platform/base_scripts.pk3dir/fonts/fontcon.font @@ -1,2 +1,2 @@ -path gfx/shell/arial.ttf +path fonts/squaregear/whitrabt.ttf size 12 \ No newline at end of file diff --git a/platform/base_scripts.pk3dir/fonts/menu_header.font b/platform/base_scripts.pk3dir/fonts/menu_header.font deleted file mode 100644 index bdb00899..00000000 --- a/platform/base_scripts.pk3dir/fonts/menu_header.font +++ /dev/null @@ -1,3 +0,0 @@ -rendersize "21 16" -path gfx/shell/arialbd.ttf -size 16 \ No newline at end of file diff --git a/platform/base_scripts.pk3dir/fonts/menu_label.font b/platform/base_scripts.pk3dir/fonts/menu_label.font deleted file mode 100644 index cf9a70dc..00000000 --- a/platform/base_scripts.pk3dir/fonts/menu_label.font +++ /dev/null @@ -1,2 +0,0 @@ -rendersize "10 11 12 14" -path gfx/shell/mssansserif.ttf \ No newline at end of file diff --git a/platform/base_scripts.pk3dir/fonts/menu_label_bold.font b/platform/base_scripts.pk3dir/fonts/menu_label_bold.font deleted file mode 100644 index 6f5c806a..00000000 --- a/platform/base_scripts.pk3dir/fonts/menu_label_bold.font +++ /dev/null @@ -1,2 +0,0 @@ -rendersize "14 12" -path gfx/shell/arialbd.ttf \ No newline at end of file diff --git a/platform/base_scripts.pk3dir/fonts/menu_main.font b/platform/base_scripts.pk3dir/fonts/menu_main.font deleted file mode 100644 index df0bb413..00000000 --- a/platform/base_scripts.pk3dir/fonts/menu_main.font +++ /dev/null @@ -1,3 +0,0 @@ -rendersize "14 11 12" -path gfx/shell/arial.ttf -size 12 \ No newline at end of file diff --git a/platform/base_scripts.pk3dir/fonts/ui.font b/platform/base_scripts.pk3dir/fonts/ui.font index 6891d4d2..3ff20c6b 100644 --- a/platform/base_scripts.pk3dir/fonts/ui.font +++ b/platform/base_scripts.pk3dir/fonts/ui.font @@ -1,4 +1,4 @@ color "255 255 255" alpha 255 size 12 -path gfx/shell/cabin.ttf +path fonts/ibm/IBMPlexSansCondensed-Medium.otf diff --git a/platform/base_textures.pk3dir/fonts/font16.font b/platform/base_textures.pk3dir/fonts/font16.font deleted file mode 100644 index 59d2200f..00000000 --- a/platform/base_textures.pk3dir/fonts/font16.font +++ /dev/null @@ -1,3 +0,0 @@ -name "16" -font "gfx/shell/arial" -size "16" diff --git a/platform/base_textures.pk3dir/fonts/font20.font b/platform/base_textures.pk3dir/fonts/font20.font deleted file mode 100644 index 5c117f52..00000000 --- a/platform/base_textures.pk3dir/fonts/font20.font +++ /dev/null @@ -1,3 +0,0 @@ -name "cr" -font "gfx/shell/arial" -size "20" diff --git a/platform/base_textures.pk3dir/fonts/fontcon.font b/platform/base_textures.pk3dir/fonts/fontcon.font deleted file mode 100644 index 9806bbd3..00000000 --- a/platform/base_textures.pk3dir/fonts/fontcon.font +++ /dev/null @@ -1,3 +0,0 @@ -name "font" -font "gfx/shell/arial" -size "12" diff --git a/platform/menu_fallback.pk3dir/fonts/menu_header.font b/platform/menu_fallback.pk3dir/fonts/menu_header.font new file mode 100644 index 00000000..b97ba0d3 --- /dev/null +++ b/platform/menu_fallback.pk3dir/fonts/menu_header.font @@ -0,0 +1,3 @@ +rendersize "21 16" +path fonts/nimbus/NimbusSanL-Bol.otf +size 16 \ No newline at end of file diff --git a/platform/menu_fallback.pk3dir/fonts/menu_label.font b/platform/menu_fallback.pk3dir/fonts/menu_label.font new file mode 100644 index 00000000..e3489dc0 --- /dev/null +++ b/platform/menu_fallback.pk3dir/fonts/menu_label.font @@ -0,0 +1,2 @@ +rendersize "10 11 12 14" +path fonts/nimbus/NimbusSanL-Reg.otf \ No newline at end of file diff --git a/platform/menu_fallback.pk3dir/fonts/menu_label_bold.font b/platform/menu_fallback.pk3dir/fonts/menu_label_bold.font new file mode 100644 index 00000000..10c8bfce --- /dev/null +++ b/platform/menu_fallback.pk3dir/fonts/menu_label_bold.font @@ -0,0 +1,2 @@ +rendersize "14 12" +path fonts/nimbus/NimbusSanL-Bol.otf \ No newline at end of file diff --git a/platform/menu_fallback.pk3dir/fonts/menu_main.font b/platform/menu_fallback.pk3dir/fonts/menu_main.font new file mode 100644 index 00000000..d61aca9b --- /dev/null +++ b/platform/menu_fallback.pk3dir/fonts/menu_main.font @@ -0,0 +1,3 @@ +rendersize "14 11 12" +path fonts/nimbus/NimbusSanL-Reg.otf +size 12 \ No newline at end of file diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-Bold.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-Bold.ttf new file mode 100644 index 00000000..4f5a57f2 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-Bold.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-BoldItalic.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-BoldItalic.ttf new file mode 100644 index 00000000..11184008 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-BoldItalic.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-Italic.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-Italic.ttf new file mode 100644 index 00000000..a49b9fbf Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-Italic.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-Medium.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-Medium.ttf new file mode 100644 index 00000000..069b8422 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-Medium.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-MediumItalic.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-MediumItalic.ttf new file mode 100644 index 00000000..0113ddbc Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-MediumItalic.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-Regular.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-Regular.ttf new file mode 100644 index 00000000..4b78301c Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-Regular.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-SemiBold.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-SemiBold.ttf new file mode 100644 index 00000000..bf78eb9f Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-SemiBold.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-SemiBoldItalic.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-SemiBoldItalic.ttf new file mode 100644 index 00000000..3546fa86 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin-SemiBoldItalic.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-Bold.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-Bold.ttf new file mode 100644 index 00000000..9e3a0de4 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-Bold.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-BoldItalic.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-BoldItalic.ttf new file mode 100644 index 00000000..a64317d6 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-BoldItalic.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-Italic.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-Italic.ttf new file mode 100644 index 00000000..339982a2 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-Italic.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-Medium.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-Medium.ttf new file mode 100644 index 00000000..b4184039 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-Medium.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-MediumItalic.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-MediumItalic.ttf new file mode 100644 index 00000000..e69bd9b8 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-MediumItalic.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-Regular.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-Regular.ttf new file mode 100644 index 00000000..5c8272a9 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-Regular.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-SemiBold.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-SemiBold.ttf new file mode 100644 index 00000000..aceac181 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-SemiBold.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-SemiBoldItalic.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-SemiBoldItalic.ttf new file mode 100644 index 00000000..c13b46e1 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_Condensed-SemiBoldItalic.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-Bold.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-Bold.ttf new file mode 100644 index 00000000..b20f1155 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-Bold.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-BoldItalic.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-BoldItalic.ttf new file mode 100644 index 00000000..c251f8fe Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-BoldItalic.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-Italic.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-Italic.ttf new file mode 100644 index 00000000..3b28ef29 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-Italic.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-Medium.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-Medium.ttf new file mode 100644 index 00000000..23bf0027 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-Medium.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-MediumItalic.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-MediumItalic.ttf new file mode 100644 index 00000000..c9fad3a2 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-MediumItalic.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-Regular.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-Regular.ttf new file mode 100644 index 00000000..31a04046 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-Regular.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-SemiBold.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-SemiBold.ttf new file mode 100644 index 00000000..b90ed609 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-SemiBold.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-SemiBoldItalic.ttf b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-SemiBoldItalic.ttf new file mode 100644 index 00000000..d759e1e7 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/cabin/Cabin_SemiCondensed-SemiBoldItalic.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/cabin/OFL.txt b/platform/menu_fonts.pk3dir/fonts/cabin/OFL.txt new file mode 100644 index 00000000..5fe9f51e --- /dev/null +++ b/platform/menu_fonts.pk3dir/fonts/cabin/OFL.txt @@ -0,0 +1,93 @@ +Copyright 2018 The Cabin Project Authors (https://github.com/impallari/Cabin.git) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-Bold.otf b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-Bold.otf new file mode 100644 index 00000000..80ecce90 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-Bold.otf differ diff --git a/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-BoldItalic.otf b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-BoldItalic.otf new file mode 100644 index 00000000..ae922e8b Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-BoldItalic.otf differ diff --git a/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-ExtraLight.otf b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-ExtraLight.otf new file mode 100644 index 00000000..5a07fa78 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-ExtraLight.otf differ diff --git a/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-ExtraLightItalic.otf b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-ExtraLightItalic.otf new file mode 100644 index 00000000..47c33ecc Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-ExtraLightItalic.otf differ diff --git a/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-Italic.otf b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-Italic.otf new file mode 100644 index 00000000..02a4ab4d Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-Italic.otf differ diff --git a/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-Light.otf b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-Light.otf new file mode 100644 index 00000000..56a26652 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-Light.otf differ diff --git a/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-LightItalic.otf b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-LightItalic.otf new file mode 100644 index 00000000..1774fbf6 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-LightItalic.otf differ diff --git a/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-Medium.otf b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-Medium.otf new file mode 100644 index 00000000..9f6f9297 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-Medium.otf differ diff --git a/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-MediumItalic.otf b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-MediumItalic.otf new file mode 100644 index 00000000..69982c8f Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-MediumItalic.otf differ diff --git a/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-Regular.otf b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-Regular.otf new file mode 100644 index 00000000..1a6171c1 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-Regular.otf differ diff --git a/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-SemiBold.otf b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-SemiBold.otf new file mode 100644 index 00000000..6f66d9cc Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-SemiBold.otf differ diff --git a/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-SemiBoldItalic.otf b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-SemiBoldItalic.otf new file mode 100644 index 00000000..7f344753 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-SemiBoldItalic.otf differ diff --git a/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-Text.otf b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-Text.otf new file mode 100644 index 00000000..a2b392b4 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-Text.otf differ diff --git a/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-TextItalic.otf b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-TextItalic.otf new file mode 100644 index 00000000..921a8870 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-TextItalic.otf differ diff --git a/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-Thin.otf b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-Thin.otf new file mode 100644 index 00000000..89946b22 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-Thin.otf differ diff --git a/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-ThinItalic.otf b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-ThinItalic.otf new file mode 100644 index 00000000..56b861ef Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/ibm/IBMPlexSansCondensed-ThinItalic.otf differ diff --git a/platform/menu_fonts.pk3dir/fonts/ibm/LICENSE.txt b/platform/menu_fonts.pk3dir/fonts/ibm/LICENSE.txt new file mode 100644 index 00000000..c35c4c61 --- /dev/null +++ b/platform/menu_fonts.pk3dir/fonts/ibm/LICENSE.txt @@ -0,0 +1,93 @@ +Copyright © 2017 IBM Corp. with Reserved Font Name "Plex" + +This Font Software is licensed under the SIL Open Font License, Version 1.1. + +This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/platform/menu_fonts.pk3dir/fonts/nimbus/NimbusSanL-Bol.otf b/platform/menu_fonts.pk3dir/fonts/nimbus/NimbusSanL-Bol.otf new file mode 100644 index 00000000..2c700817 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/nimbus/NimbusSanL-Bol.otf differ diff --git a/platform/menu_fonts.pk3dir/fonts/nimbus/NimbusSanL-BolIta.otf b/platform/menu_fonts.pk3dir/fonts/nimbus/NimbusSanL-BolIta.otf new file mode 100644 index 00000000..3867a30f Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/nimbus/NimbusSanL-BolIta.otf differ diff --git a/platform/menu_fonts.pk3dir/fonts/nimbus/NimbusSanL-Reg.otf b/platform/menu_fonts.pk3dir/fonts/nimbus/NimbusSanL-Reg.otf new file mode 100644 index 00000000..9cedff5e Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/nimbus/NimbusSanL-Reg.otf differ diff --git a/platform/menu_fonts.pk3dir/fonts/nimbus/NimbusSanL-RegIta.otf b/platform/menu_fonts.pk3dir/fonts/nimbus/NimbusSanL-RegIta.otf new file mode 100644 index 00000000..eca16723 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/nimbus/NimbusSanL-RegIta.otf differ diff --git a/platform/menu_fonts.pk3dir/fonts/nimbus/NumbusSanL.txt b/platform/menu_fonts.pk3dir/fonts/nimbus/NumbusSanL.txt new file mode 100644 index 00000000..6db90986 --- /dev/null +++ b/platform/menu_fonts.pk3dir/fonts/nimbus/NumbusSanL.txt @@ -0,0 +1,340 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 2 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, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. \ No newline at end of file diff --git a/platform/menu_fonts.pk3dir/fonts/squaregear/whitrabt.ttf b/platform/menu_fonts.pk3dir/fonts/squaregear/whitrabt.ttf new file mode 100644 index 00000000..38e1d766 Binary files /dev/null and b/platform/menu_fonts.pk3dir/fonts/squaregear/whitrabt.ttf differ diff --git a/platform/menu_fonts.pk3dir/fonts/squaregear/whitrabt.txt b/platform/menu_fonts.pk3dir/fonts/squaregear/whitrabt.txt new file mode 100644 index 00000000..8e32067e --- /dev/null +++ b/platform/menu_fonts.pk3dir/fonts/squaregear/whitrabt.txt @@ -0,0 +1,39 @@ +Font: White Rabbit +Created By: Matthew Welch +E-Mail: matt@squaregear.net +Web Address: http://www.squaregear.net/fonts/ + +My fonts are all free. You can use them for personal or commercial projects, +and I ask for no money. I would, however, love to hear from you. If you use +my fonts for something please e-mail me letting me know how you used it. Send +me a copy if you can or let me know where I can find your work. You are under +no obligation to do this, I just like to see how my fonts get used. + +About the font: + +White Rabbit is reminiscent of the characters displayed on all those +old low-res terminal screens. Smoothed out and cleaned up for 1999, +this is the font to use for all your computing applications. + +License: + +Copyright (C) 1999 by Matthew Welch + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this font software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + diff --git a/platform/menu_fonts.pk3dir/gfx/shell/arial.ttf b/platform/menu_fonts.pk3dir/gfx/shell/arial.ttf deleted file mode 100644 index feb95b0d..00000000 Binary files a/platform/menu_fonts.pk3dir/gfx/shell/arial.ttf and /dev/null differ diff --git a/platform/menu_fonts.pk3dir/gfx/shell/arialbd.ttf b/platform/menu_fonts.pk3dir/gfx/shell/arialbd.ttf deleted file mode 100644 index d0d857e2..00000000 Binary files a/platform/menu_fonts.pk3dir/gfx/shell/arialbd.ttf and /dev/null differ diff --git a/platform/menu_fonts.pk3dir/gfx/shell/cabin.ttf b/platform/menu_fonts.pk3dir/gfx/shell/cabin.ttf deleted file mode 100644 index 210e1e3a..00000000 Binary files a/platform/menu_fonts.pk3dir/gfx/shell/cabin.ttf and /dev/null differ diff --git a/platform/menu_fonts.pk3dir/gfx/shell/mssansserif.ttf b/platform/menu_fonts.pk3dir/gfx/shell/mssansserif.ttf deleted file mode 100644 index 56e4afe1..00000000 Binary files a/platform/menu_fonts.pk3dir/gfx/shell/mssansserif.ttf and /dev/null differ diff --git a/platform/platform_default.cfg b/platform/platform_default.cfg index 0840e5a3..7c61d66a 100644 --- a/platform/platform_default.cfg +++ b/platform/platform_default.cfg @@ -21,7 +21,7 @@ seta sv_gameplayfix_setmodelsize_qw 1 seta sv_gameplayfix_setmodelrealbox 1 // load console font in HL format seta gl_font 0 -seta gl_font CONCHARS?fmt=h +seta gl_font fonts/squaregear/whitrabt.ttf // sensible texture filtering default seta gl_texturemode GL_LINEAR_MIPMAP_LINEAR // sensible mipcap default diff --git a/src/client/view.qc b/src/client/view.qc index 5ea74ee2..9f6ff8b5 100644 --- a/src/client/view.qc +++ b/src/client/view.qc @@ -71,44 +71,28 @@ View_AddEvent(void(void) pCallback, float flTime) pSeat->m_iEventWeapon = pl.activeweapon; } +void +View_ClearEvents(void) +{ + pSeat->m_pEventCall = __NULL__; + pSeat->m_flEventTime = 0; + pSeat->m_flEventFrame = 0; + pSeat->m_flEventMdl = 0; + pSeat->m_iEventWeapon = 0; + + pSeat->m_eViewModelL.frame1time = 0.0f; + pSeat->m_eViewModel.frame1time = 0.0f; + pSeat->m_eMuzzleflash.modelindex = + pSeat->m_eMuzzleflashL.modelindex = + pSeat->m_eMuzzleflash.alpha = + pSeat->m_eMuzzleflashL.alpha = + pSeat->m_eMuzzleflash.frame1time = + pSeat->m_eMuzzleflashL.frame1time = 0; +} + void View_CalcViewport(int s, float fWinWidth, float fWinHeight) { -#if 0 - //FIXME: this is awkward. renderscene internally rounds to pixels. - //on the other hand, drawpic uses linear filtering and multisample and stuff. - //this means that there can be a pixel or so difference between scene and 2d. - //as a general rule, you won't notice unless there's some big drawfills. - switch (numclientseats) { - case 3: - if (!s) { - case 2: - video_res = [fWinWidth, fWinHeight * 0.5]; - video_mins = [0, (s & 1) * video_res[1]]; - break; - } - s++; - case 4: - video_res = [fWinWidth, fWinHeight] * 0.5; - video_mins = [(s&1) * video_res[0], (s / 2i) * video_res[1]]; - break; - default: - video_res = [fWinWidth, fWinHeight]; - video_mins = [0, 0]; - break; - } - - /* generate usable hud variables */ - if (autocvar_cg_hudAspect <= 0) { - g_hudmins = video_mins; - g_hudres = video_res; - } else { - g_hudmins = video_mins; - g_hudmins[0] += (video_res[0] / 2) - ((video_res[1] * autocvar_cg_hudAspect) / 2); - g_hudres[0] = video_res[1] * autocvar_cg_hudAspect; - g_hudres[1] = video_res[1]; - } -#else switch (numclientseats) { case 3: if (!s) { @@ -124,7 +108,7 @@ View_CalcViewport(int s, float fWinWidth, float fWinHeight) break; default: g_viewSeats[s].SetViewSize([fWinWidth, fWinHeight]); - g_viewSeats[s].SetViewPosition([0, 0]); + //g_viewSeats[s].SetViewPosition([0, 0]); break; } @@ -132,7 +116,6 @@ View_CalcViewport(int s, float fWinWidth, float fWinHeight) video_mins = g_viewSeats[s].m_vecPosition; g_hudmins = g_viewSeats[s].GetHUDCanvasPos(); g_hudres = g_viewSeats[s].GetHUDCanvasSize(); -#endif } void diff --git a/src/menu-fn/entry.qc b/src/menu-fn/entry.qc index 9e38b919..e2800000 100644 --- a/src/menu-fn/entry.qc +++ b/src/menu-fn/entry.qc @@ -301,15 +301,6 @@ m_draw(vector screensize) /* draw the actual widgets */ main_draw(); -#ifndef WEBMENU - /* HACK! after a custom game switches .fmf files, we need to force restart - * our menu. I'm so, so sorry. No, RendererRestarted doesn't see fs_game - * fast enough either. */ - if (cvar_string("fs_game") != games[gameinfo_current].gamedir) { - localcmd(sprintf("gameinfo_gamedir %s\nmenu_restart\n", cvar_string("fs_game"))); - } -#endif - oldtime = time; } diff --git a/src/menu-fn/m_customgame.qc b/src/menu-fn/m_customgame.qc index 14e96ce4..77e72d44 100644 --- a/src/menu-fn/m_customgame.qc +++ b/src/menu-fn/m_customgame.qc @@ -32,7 +32,6 @@ CMainButton customgame_btnDone; int g_iModInstallCache; string g_strModInstallCache; -#if 1 /* get installing id */ void game_getinstallcache(void) @@ -71,7 +70,6 @@ game_writeinstallcache(int id, string gamedir) fclose(fs_cache); } } -#endif int game_getpackageid(string pkgname) @@ -542,21 +540,17 @@ customgame_btnactivate_start(void) games_set(nextgame); -#if 0 - localcmd(sprintf("gamedir %s %s.fmf\nfs_changegame %s -\n", games[nextgame].gamedir, games[nextgame].gamedir, games[nextgame].gamedir)); -#else if (games[nextgame].info_type == GAMEINFO_MANIFEST) localcmd(sprintf("gamedir %s %s.fmf\nfs_changegame %s -\n", games[nextgame].gamedir, games[nextgame].gamedir, games[nextgame].gamedir)); else if (games[nextgame].info_type == GAMEINFO_LIBLIST) { /* some games/mods inherit other directories */ if (games[nextgame].fallback_dir) { - localcmd(sprintf("gamedir \"platform;%s;%s;%s\"\n", games[nextgame].base_dir, games[nextgame].fallback_dir, games[nextgame].gamedir)); + localcmd(sprintf("gamedir \"%s;%s;%s\"\n", games[nextgame].base_dir, games[nextgame].fallback_dir, games[nextgame].gamedir)); } else { - localcmd(sprintf("gamedir \"platform;%s;%s\"\n", games[nextgame].base_dir, games[nextgame].gamedir)); + localcmd(sprintf("gamedir \"%s;%s\"\n", games[nextgame].base_dir, games[nextgame].gamedir)); } } else - localcmd(sprintf("gamedir \"platform;%s;%s\"\n", games[nextgame].base_dir, games[nextgame].gamedir)); -#endif + localcmd(sprintf("gamedir \"%s;%s\"\n", games[nextgame].base_dir, games[nextgame].gamedir)); localcmd("stopmusic\nsnd_restart\nwait\nvid_reload\n"); localcmd("menu_restart\n"); @@ -564,7 +558,6 @@ customgame_btnactivate_start(void) localcmd("menu_musicstart\n"); } -#if 1 void customgame_installstart(int gameid) { @@ -589,6 +582,11 @@ customgame_installend(void) int gid = g_iModInstallCache; print(sprintf("Installation ended for %S!\n", g_strModInstallCache)); localcmd(sprintf("game %s\n", g_strModInstallCache)); + + localcmd("stopmusic\nsnd_restart\nwait\nvid_reload\n"); + localcmd("menu_restart\n"); + localcmd("menu_customgame\n"); + localcmd("menu_musicstart\n"); game_writeinstallcache(-1, g_strModInstallCache); } @@ -652,13 +650,11 @@ customgame_installframe(void) customgame_installend(); } -#endif /* download the .fmf and switch games immediately */ void customgame_btninstall_start(void) { -#if 1 int id = customgame_lbMods.GetSelected(); string st; @@ -674,10 +670,6 @@ customgame_btninstall_start(void) game_writeinstallcache(id, games[id].gamedir); customgame_installend(); -#else - int nextgame = customgame_lbMods.GetSelected(); - localcmd(sprintf("fs_changegame %s http://www.frag-net.com/mods/%s.fmf\n", games[nextgame].gamedir, games[nextgame].gamedir)); -#endif } void @@ -992,11 +984,9 @@ menu_customgame_draw(void) /* draw a frame with progress during package install */ -#if 1 if (g_iModInstallCache >= 0i) { customgame_installframe(); } -#endif customgame_sbMods.SetMax(gameinfo_count-1); #endif diff --git a/src/server/NSGameRules.qc b/src/server/NSGameRules.qc index 2310c226..4abbfc2a 100644 --- a/src/server/NSGameRules.qc +++ b/src/server/NSGameRules.qc @@ -101,6 +101,7 @@ NSGameRules::PlayerDisconnect(NSClientPlayer pl) pl.SetModelindex(0); pl.SetHealth(0); pl.SetTakedamage(DAMAGE_NO); + pl.SetTeam(0); } void