From e9cbae4306fcd4550615997e1b85a5d214c0daf5 Mon Sep 17 00:00:00 2001 From: nearbyplayer <3721216+nearbyplayer@users.noreply.github.com> Date: Sat, 23 Sep 2017 11:15:53 -0400 Subject: [PATCH 01/26] Initial commit --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 1 + 2 files changed, 675 insertions(+) create mode 100644 LICENSE create mode 100644 README.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..9cecc1d4 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. 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 +them 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 prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. 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. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey 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; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If 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 convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU 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 that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + 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. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +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. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + 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 +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + 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 . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program 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, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU 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 Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md new file mode 100644 index 00000000..e2e586d7 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# esx_voice \ No newline at end of file From 3ea1ec67201ce0db052c11df3a2452865da5854e Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Sat, 23 Sep 2017 16:27:37 -0400 Subject: [PATCH 02/26] update(files): Push all Files --- .editorconfig | 9 +++++++ README.md | 33 ++++++++++++++++++++++++- __resource.lua | 15 ++++++++++++ client/main.lua | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 .editorconfig create mode 100644 __resource.lua create mode 100644 client/main.lua diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..4bfca33b --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +indent_size = 2 +indent_style = space +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true diff --git a/README.md b/README.md index e2e586d7..6e381f32 100644 --- a/README.md +++ b/README.md @@ -1 +1,32 @@ -# esx_voice \ No newline at end of file +# esx_voice +FXServer ESX Voice + + +#### Description +This is a proximity voice controller script. The default control for this is `Left Control + H` (QWERTY). + +#### Download + +**1) Using [fvm](https://github.com/qlaffont/fvm-installer)** +``` +fvm install --save --folder=esx esx-org/esx_voice +``` + +**2) Manually** +- Download https://github.com/ESX-Org/esx_voice/releases/latest +- Put it in resource/[esx] directory + +**3) Using Git** + +``` +cd resouces +git clone https://github.com/ESX-Org/esx_voice +``` + +#### Installation + +1) Add `start esx_voice` to your server.cfg + + +#### Credits +Original Script by [aabbfive](https://github.com/aabbfive/voicecontroller) diff --git a/__resource.lua b/__resource.lua new file mode 100644 index 00000000..f3fcc699 --- /dev/null +++ b/__resource.lua @@ -0,0 +1,15 @@ +--[[ + +-- ESX Voice +-- Original Author of Script: github.com/aabbfive +-- Edited by: nearbyplayer + +--]] + +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'ESX Voice Controller' + +version '1.0.0' + +client_script 'client/main.lua' diff --git a/client/main.lua b/client/main.lua new file mode 100644 index 00000000..dfa3c14a --- /dev/null +++ b/client/main.lua @@ -0,0 +1,64 @@ +--[[ + +-- ESX Voice +-- Original Author of Script: github.com/aabbfive +-- Edited by: nearbyplayer + +--]] + +local voice = {default = 5.0, shout = 12.0, whisper = 1.0, current = 0, level = nil} + +function drawLevel(r, g, b, a) + SetTextFont(4) + SetTextProportional(1) + SetTextScale(0.5, 0.5) + SetTextColour(r, g, b, a) + SetTextDropShadow(0, 0, 0, 0, 255) + SetTextEdge(1, 0, 0, 0, 255) + SetTextDropShadow() + SetTextOutline() + SetTextEntry("STRING") + AddTextComponentString("~y~Voice:~s~ " .. voice.level) + DrawText(0.175, 0.92) +end + +AddEventHandler('onClientMapStart', function() + if voice.current == 0 then + NetworkSetTalkerProximity(voice.default) + elseif voice.current == 1 then + NetworkSetTalkerProximity(voice.shout) + elseif voice.current == 2 then + NetworkSetTalkerProximity(voice.whisper) + end +end) + +Citizen.CreateThread(function() + while true do + Citizen.Wait(0) + if IsControlJustPressed(1, 74) and IsControlPressed(1, 21) then + voice.current = (voice.current + 1) % 3 + if voice.current == 0 then + NetworkSetTalkerProximity(voice.default) + voice.level = "Normal" + elseif voice.current == 1 then + NetworkSetTalkerProximity(voice.shout) + voice.level = "Shout" + elseif voice.current == 2 then + NetworkSetTalkerProximity(voice.whisper) + voice.level = "Whisper" + end + end + if voice.current == 0 then + voice.level = "Normal" + elseif voice.current == 1 then + voice.level = "Shout" + elseif voice.current == 2 then + voice.level = "Whisper" + end + if NetworkIsPlayerTalking(PlayerId()) then + drawLevel(41, 128, 185, 255) + elseif not NetworkIsPlayerTalking(PlayerId()) then + drawLevel(185, 185, 185, 255) + end + end +end) From 5f251a03459d40e80b8213571b3382af9471d325 Mon Sep 17 00:00:00 2001 From: nearbyplayer <3721216+nearbyplayer@users.noreply.github.com> Date: Sat, 23 Sep 2017 18:59:00 -0400 Subject: [PATCH 03/26] docs(readme): Fixed Typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6e381f32..1588f62b 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ FXServer ESX Voice #### Description -This is a proximity voice controller script. The default control for this is `Left Control + H` (QWERTY). +This is a proximity voice controller script. The default control for this is `Left Shift + H` (QWERTY). #### Download From 323452cc55e829581bd72438d714e424f457e26d Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 10 Jun 2018 11:07:47 +0200 Subject: [PATCH 04/26] Cleanup, added locale system --- __resource.lua | 17 ++++---- client/main.lua | 114 ++++++++++++++++++++++++++---------------------- config.lua | 2 + locales/en.lua | 6 +++ locales/sv.lua | 6 +++ 5 files changed, 83 insertions(+), 62 deletions(-) create mode 100644 config.lua create mode 100644 locales/en.lua create mode 100644 locales/sv.lua diff --git a/__resource.lua b/__resource.lua index f3fcc699..b4ce5711 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,15 +1,14 @@ ---[[ - --- ESX Voice --- Original Author of Script: github.com/aabbfive --- Edited by: nearbyplayer - ---]] - resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Voice Controller' version '1.0.0' +version '1.1.0' -client_script 'client/main.lua' +client_scripts { + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/sv.lua', + 'config.lua', + 'client/main.lua' +} \ No newline at end of file diff --git a/client/main.lua b/client/main.lua index dfa3c14a..e0797571 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,64 +1,72 @@ ---[[ - --- ESX Voice --- Original Author of Script: github.com/aabbfive --- Edited by: nearbyplayer - ---]] +local Keys = { + ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, + ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, + ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, + ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, + ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, + ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, + ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, + ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, + ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 +} local voice = {default = 5.0, shout = 12.0, whisper = 1.0, current = 0, level = nil} function drawLevel(r, g, b, a) - SetTextFont(4) - SetTextProportional(1) - SetTextScale(0.5, 0.5) - SetTextColour(r, g, b, a) - SetTextDropShadow(0, 0, 0, 0, 255) - SetTextEdge(1, 0, 0, 0, 255) - SetTextDropShadow() - SetTextOutline() - SetTextEntry("STRING") - AddTextComponentString("~y~Voice:~s~ " .. voice.level) - DrawText(0.175, 0.92) + SetTextFont(4) + SetTextProportional(1) + SetTextScale(0.5, 0.5) + SetTextColour(r, g, b, a) + SetTextDropShadow(0, 0, 0, 0, 255) + SetTextEdge(1, 0, 0, 0, 255) + SetTextDropShadow() + SetTextOutline() + + BeginTextCommandDisplayText("STRING") + AddTextComponentSubstringPlayerName(_U('voice', voice.level)) + EndTextCommandDisplayText(0.175, 0.92) end AddEventHandler('onClientMapStart', function() - if voice.current == 0 then - NetworkSetTalkerProximity(voice.default) - elseif voice.current == 1 then - NetworkSetTalkerProximity(voice.shout) - elseif voice.current == 2 then - NetworkSetTalkerProximity(voice.whisper) - end + if voice.current == 0 then + NetworkSetTalkerProximity(voice.default) + elseif voice.current == 1 then + NetworkSetTalkerProximity(voice.shout) + elseif voice.current == 2 then + NetworkSetTalkerProximity(voice.whisper) + end end) Citizen.CreateThread(function() - while true do - Citizen.Wait(0) - if IsControlJustPressed(1, 74) and IsControlPressed(1, 21) then - voice.current = (voice.current + 1) % 3 - if voice.current == 0 then - NetworkSetTalkerProximity(voice.default) - voice.level = "Normal" - elseif voice.current == 1 then - NetworkSetTalkerProximity(voice.shout) - voice.level = "Shout" - elseif voice.current == 2 then - NetworkSetTalkerProximity(voice.whisper) - voice.level = "Whisper" - end - end - if voice.current == 0 then - voice.level = "Normal" - elseif voice.current == 1 then - voice.level = "Shout" - elseif voice.current == 2 then - voice.level = "Whisper" - end - if NetworkIsPlayerTalking(PlayerId()) then - drawLevel(41, 128, 185, 255) - elseif not NetworkIsPlayerTalking(PlayerId()) then - drawLevel(185, 185, 185, 255) - end - end + while true do + Citizen.Wait(1) + + if IsControlJustPressed(1, Keys['H']) and IsControlPressed(1, Keys['LEFTSHIFT']) then + voice.current = (voice.current + 1) % 3 + if voice.current == 0 then + NetworkSetTalkerProximity(voice.default) + voice.level = _U('normal') + elseif voice.current == 1 then + NetworkSetTalkerProximity(voice.shout) + voice.level = _U('shout') + elseif voice.current == 2 then + NetworkSetTalkerProximity(voice.whisper) + voice.level = _U('whisper') + end + end + + if voice.current == 0 then + voice.level = _U('normal') + elseif voice.current == 1 then + voice.level = _U('shout') + elseif voice.current == 2 then + voice.level = _U('whisper') + end + + if NetworkIsPlayerTalking(PlayerId()) then + drawLevel(41, 128, 185, 255) + elseif not NetworkIsPlayerTalking(PlayerId()) then + drawLevel(185, 185, 185, 255) + end + end end) diff --git a/config.lua b/config.lua new file mode 100644 index 00000000..ad83260a --- /dev/null +++ b/config.lua @@ -0,0 +1,2 @@ +Config = {} +Config.Locale = 'en' \ No newline at end of file diff --git a/locales/en.lua b/locales/en.lua new file mode 100644 index 00000000..01cd867f --- /dev/null +++ b/locales/en.lua @@ -0,0 +1,6 @@ +Locales ['en'] = { + ['voice'] = '~y~Voice: ~s~%s', + ['normal'] = 'normal', + ['shout'] = 'shout', + ['whisper'] = 'whisper', +} diff --git a/locales/sv.lua b/locales/sv.lua new file mode 100644 index 00000000..68c3bd49 --- /dev/null +++ b/locales/sv.lua @@ -0,0 +1,6 @@ +Locales ['sv'] = { + ['voice'] = '~y~Röst: ~s~%s', + ['normal'] = 'prata', + ['shout'] = 'skrik', + ['whisper'] = 'viska', +} From 09f62e4a3fbef6538893d512322409c9b1800593 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 10 Jun 2018 11:08:27 +0200 Subject: [PATCH 05/26] Fixed manifest --- __resource.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/__resource.lua b/__resource.lua index b4ce5711..007e830b 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,7 +2,6 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Voice Controller' -version '1.0.0' version '1.1.0' client_scripts { From abeeba4433c6d90f7ca9fd905ac6152f7c244347 Mon Sep 17 00:00:00 2001 From: Mroczny <33167112+Mrocznv@users.noreply.github.com> Date: Sun, 10 Jun 2018 12:00:16 +0200 Subject: [PATCH 06/26] pl translation --- locales/pl.lua | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 locales/pl.lua diff --git a/locales/pl.lua b/locales/pl.lua new file mode 100644 index 00000000..687bc3b6 --- /dev/null +++ b/locales/pl.lua @@ -0,0 +1,6 @@ +Locales ['pl'] = { + ['voice'] = '~y~Głos: ~s~%s', + ['normal'] = 'normalny', + ['shout'] = 'krzyk', + ['whisper'] = 'szept', +} From 27cb794cfbfbdd748b5b6001c83cd9f5ca8e8c54 Mon Sep 17 00:00:00 2001 From: Mroczny <33167112+Mrocznv@users.noreply.github.com> Date: Sun, 10 Jun 2018 12:15:08 +0200 Subject: [PATCH 07/26] pl translation in _resource --- __resource.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/__resource.lua b/__resource.lua index 007e830b..0f4a5f20 100644 --- a/__resource.lua +++ b/__resource.lua @@ -7,7 +7,8 @@ version '1.1.0' client_scripts { '@es_extended/locale.lua', 'locales/en.lua', + 'locales/pl.lua', 'locales/sv.lua', 'config.lua', 'client/main.lua' -} \ No newline at end of file +} From ba681415a4daded25e685da0620c13d2d3e224a0 Mon Sep 17 00:00:00 2001 From: AdrineX Date: Tue, 12 Jun 2018 18:18:50 +0300 Subject: [PATCH 08/26] add Finnish lang.. --- __resource.lua | 1 + locales/fi.lua | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 locales/fi.lua diff --git a/__resource.lua b/__resource.lua index 0f4a5f20..0b56ee52 100644 --- a/__resource.lua +++ b/__resource.lua @@ -7,6 +7,7 @@ version '1.1.0' client_scripts { '@es_extended/locale.lua', 'locales/en.lua', + 'locales/fi.lua', 'locales/pl.lua', 'locales/sv.lua', 'config.lua', diff --git a/locales/fi.lua b/locales/fi.lua new file mode 100644 index 00000000..8a893f25 --- /dev/null +++ b/locales/fi.lua @@ -0,0 +1,6 @@ +Locales ['fi'] = { + ['voice'] = '~y~Puhe: ~s~%s', + ['normal'] = 'normaali', + ['shout'] = 'huuto', + ['whisper'] = 'kuiskaus', +} From c4e07962989cacd33e2bb5fbec69e61ecb816f86 Mon Sep 17 00:00:00 2001 From: younesskhinit <41778325+younesskhinit@users.noreply.github.com> Date: Fri, 27 Jul 2018 19:17:47 +0200 Subject: [PATCH 09/26] Add French Language (#8) * Add French Language * Add French Language --- __resource.lua | 31 ++++++++++++++++--------------- locales/fr.lua | 6 ++++++ 2 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 locales/fr.lua diff --git a/__resource.lua b/__resource.lua index 0b56ee52..4d5d89ab 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,15 +1,16 @@ -resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' - -description 'ESX Voice Controller' - -version '1.1.0' - -client_scripts { - '@es_extended/locale.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/pl.lua', - 'locales/sv.lua', - 'config.lua', - 'client/main.lua' -} +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'ESX Voice Controller' + +version '1.1.0' + +client_scripts { + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fi.lua', + 'locales/pl.lua', + 'locales/sv.lua', + 'locales/fr.lua', + 'config.lua', + 'client/main.lua' +} diff --git a/locales/fr.lua b/locales/fr.lua new file mode 100644 index 00000000..e97ad36f --- /dev/null +++ b/locales/fr.lua @@ -0,0 +1,6 @@ +Locales ['fr'] = { + ['voice'] = '~y~Voix: ~s~%s', + ['normal'] = 'Normal', + ['shout'] = 'Crier', + ['whisper'] = 'Chuchoter', +} From 2d3a34d9908f368b02917da616656e5b6cac8326 Mon Sep 17 00:00:00 2001 From: MajorMarcin Date: Fri, 27 Jul 2018 20:56:14 +0200 Subject: [PATCH 10/26] fix fr translations change to lowercase --- locales/fr.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/fr.lua b/locales/fr.lua index e97ad36f..ba5c0f39 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,6 +1,6 @@ Locales ['fr'] = { ['voice'] = '~y~Voix: ~s~%s', - ['normal'] = 'Normal', - ['shout'] = 'Crier', - ['whisper'] = 'Chuchoter', + ['normal'] = 'normal', + ['shout'] = 'crier', + ['whisper'] = 'chuchoter', } From 5a1bb285faa66999b65312df80f191bb2fb1f1bd Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:56:22 -0400 Subject: [PATCH 11/26] Repo Update --- .editorconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.editorconfig b/.editorconfig index 4bfca33b..9b425256 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,9 +1,9 @@ root = true [*] -indent_size = 2 -indent_style = space -end_of_line = lf +indent_size = 4 +indent_style = tab +end_of_line = crlf charset = utf-8 trim_trailing_whitespace = true -insert_final_newline = true +insert_final_newline = true \ No newline at end of file From 635469670744c695d8610138b7554c02a2f3c916 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 2 Dec 2018 21:06:26 +0100 Subject: [PATCH 12/26] Enforce 2 space indent on locale files --- locales/en.lua | 8 ++++---- locales/fi.lua | 8 ++++---- locales/fr.lua | 8 ++++---- locales/pl.lua | 8 ++++---- locales/sv.lua | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/locales/en.lua b/locales/en.lua index 01cd867f..6b7fc11e 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,6 +1,6 @@ Locales ['en'] = { - ['voice'] = '~y~Voice: ~s~%s', - ['normal'] = 'normal', - ['shout'] = 'shout', - ['whisper'] = 'whisper', + ['voice'] = '~y~Voice: ~s~%s', + ['normal'] = 'normal', + ['shout'] = 'shout', + ['whisper'] = 'whisper', } diff --git a/locales/fi.lua b/locales/fi.lua index 8a893f25..7550b283 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -1,6 +1,6 @@ Locales ['fi'] = { - ['voice'] = '~y~Puhe: ~s~%s', - ['normal'] = 'normaali', - ['shout'] = 'huuto', - ['whisper'] = 'kuiskaus', + ['voice'] = '~y~Puhe: ~s~%s', + ['normal'] = 'normaali', + ['shout'] = 'huuto', + ['whisper'] = 'kuiskaus', } diff --git a/locales/fr.lua b/locales/fr.lua index ba5c0f39..3920a163 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,6 +1,6 @@ Locales ['fr'] = { - ['voice'] = '~y~Voix: ~s~%s', - ['normal'] = 'normal', - ['shout'] = 'crier', - ['whisper'] = 'chuchoter', + ['voice'] = '~y~Voix: ~s~%s', + ['normal'] = 'normal', + ['shout'] = 'crier', + ['whisper'] = 'chuchoter', } diff --git a/locales/pl.lua b/locales/pl.lua index 687bc3b6..7962786b 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -1,6 +1,6 @@ Locales ['pl'] = { - ['voice'] = '~y~Głos: ~s~%s', - ['normal'] = 'normalny', - ['shout'] = 'krzyk', - ['whisper'] = 'szept', + ['voice'] = '~y~Głos: ~s~%s', + ['normal'] = 'normalny', + ['shout'] = 'krzyk', + ['whisper'] = 'szept', } diff --git a/locales/sv.lua b/locales/sv.lua index 68c3bd49..c5c716e9 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,6 +1,6 @@ Locales ['sv'] = { - ['voice'] = '~y~Röst: ~s~%s', - ['normal'] = 'prata', - ['shout'] = 'skrik', - ['whisper'] = 'viska', + ['voice'] = '~y~Röst: ~s~%s', + ['normal'] = 'prata', + ['shout'] = 'skrik', + ['whisper'] = 'viska', } From b24629249edc234aa5f9e67df1205828ab2a29a3 Mon Sep 17 00:00:00 2001 From: renildomarcio Date: Sun, 2 Dec 2018 18:09:43 -0200 Subject: [PATCH 13/26] Brazilian translation (#6) * Create br.lua Up * Proper indent and resource manifest --- __resource.lua | 33 +++++++++++++++++---------------- locales/br.lua | 6 ++++++ 2 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 locales/br.lua diff --git a/__resource.lua b/__resource.lua index 4d5d89ab..d314d63b 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,16 +1,17 @@ -resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' - -description 'ESX Voice Controller' - -version '1.1.0' - -client_scripts { - '@es_extended/locale.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/pl.lua', - 'locales/sv.lua', - 'locales/fr.lua', - 'config.lua', - 'client/main.lua' -} +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'ESX Voice Controller' + +version '1.1.0' + +client_scripts { + '@es_extended/locale.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/fi.lua', + 'locales/fr.lua', + 'locales/pl.lua', + 'locales/sv.lua', + 'config.lua', + 'client/main.lua' +} diff --git a/locales/br.lua b/locales/br.lua new file mode 100644 index 00000000..207f3111 --- /dev/null +++ b/locales/br.lua @@ -0,0 +1,6 @@ +Locales ['br'] = { + ['voice'] = '~y~Voz: ~s~%s', + ['normal'] = 'normal', + ['shout'] = 'gritar', + ['whisper'] = 'sussurro', +} From 83e517330f852a6de10b86964d6a78dc302035b7 Mon Sep 17 00:00:00 2001 From: izio38 Date: Mon, 6 May 2019 14:42:42 +0200 Subject: [PATCH 14/26] fix( onesync global voices ) --- client/main.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/client/main.lua b/client/main.lua index e0797571..876e34cf 100644 --- a/client/main.lua +++ b/client/main.lua @@ -38,6 +38,7 @@ AddEventHandler('onClientMapStart', function() end) Citizen.CreateThread(function() + NetworkSetTalkerProximity(voice.default) while true do Citizen.Wait(1) From 5d3bfc59a679c9e3e82926add32f08a2c02d87ff Mon Sep 17 00:00:00 2001 From: izio38 Date: Fri, 17 May 2019 19:59:25 +0200 Subject: [PATCH 15/26] probably fix global voices --- client/main.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index 876e34cf..5a625b62 100644 --- a/client/main.lua +++ b/client/main.lua @@ -37,8 +37,11 @@ AddEventHandler('onClientMapStart', function() end end) +AddEventHandler('playerSpawned', function() + NetworkSetTalkerProximity(voice.default) +end + Citizen.CreateThread(function() - NetworkSetTalkerProximity(voice.default) while true do Citizen.Wait(1) From 16915289922750d02b7c39237a9cc103c2eee378 Mon Sep 17 00:00:00 2001 From: izio38 Date: Sat, 18 May 2019 07:02:13 +0200 Subject: [PATCH 16/26] typo --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index 5a625b62..c641f803 100644 --- a/client/main.lua +++ b/client/main.lua @@ -39,7 +39,7 @@ end) AddEventHandler('playerSpawned', function() NetworkSetTalkerProximity(voice.default) -end +end) Citizen.CreateThread(function() while true do From f408e3a56a8c048c2379cdf7b8219a031498a859 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 20 May 2019 23:04:04 +0200 Subject: [PATCH 17/26] Proper hud natives --- client/main.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index e0797571..f273eea7 100644 --- a/client/main.lua +++ b/client/main.lua @@ -14,10 +14,9 @@ local voice = {default = 5.0, shout = 12.0, whisper = 1.0, current = 0, level = function drawLevel(r, g, b, a) SetTextFont(4) - SetTextProportional(1) SetTextScale(0.5, 0.5) SetTextColour(r, g, b, a) - SetTextDropShadow(0, 0, 0, 0, 255) + SetTextDropshadow(0, 0, 0, 0, 255) SetTextEdge(1, 0, 0, 0, 255) SetTextDropShadow() SetTextOutline() From 70b56fb7c441b19dbd6fdcec9fa6cee8e91e2e22 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Fri, 31 May 2019 12:38:07 +0200 Subject: [PATCH 18/26] Remove unused text native --- client/main.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index f273eea7..59e36e29 100644 --- a/client/main.lua +++ b/client/main.lua @@ -17,7 +17,6 @@ function drawLevel(r, g, b, a) SetTextScale(0.5, 0.5) SetTextColour(r, g, b, a) SetTextDropshadow(0, 0, 0, 0, 255) - SetTextEdge(1, 0, 0, 0, 255) SetTextDropShadow() SetTextOutline() From 3177493519536c3d7de30324258d8fc98c762da3 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 7 Aug 2019 15:22:45 +0200 Subject: [PATCH 19/26] Optimized the code a bit --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index 59e36e29..9f03719d 100644 --- a/client/main.lua +++ b/client/main.lua @@ -63,7 +63,7 @@ Citizen.CreateThread(function() if NetworkIsPlayerTalking(PlayerId()) then drawLevel(41, 128, 185, 255) - elseif not NetworkIsPlayerTalking(PlayerId()) then + else drawLevel(185, 185, 185, 255) end end From 9e80de864f2632b058dce8077887deba0b60840d Mon Sep 17 00:00:00 2001 From: JHyeok Date: Tue, 3 Sep 2019 00:45:37 +0900 Subject: [PATCH 20/26] Add Korean Language --- __resource.lua | 1 + locales/ko.lua | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 locales/ko.lua diff --git a/__resource.lua b/__resource.lua index d314d63b..7d4e3ed8 100644 --- a/__resource.lua +++ b/__resource.lua @@ -12,6 +12,7 @@ client_scripts { 'locales/fr.lua', 'locales/pl.lua', 'locales/sv.lua', + 'locales/ko.lua', 'config.lua', 'client/main.lua' } diff --git a/locales/ko.lua b/locales/ko.lua new file mode 100644 index 00000000..c4c7fc64 --- /dev/null +++ b/locales/ko.lua @@ -0,0 +1,6 @@ +Locales ['ko'] = { + ['voice'] = '~y~목소리: ~s~%s', + ['normal'] = '보통', + ['shout'] = '외침', + ['whisper'] = '속삭임', +} From a791aebfd4d616ccaf9766a23b1fefd442bd56ed Mon Sep 17 00:00:00 2001 From: userMacieG Date: Fri, 11 Oct 2019 11:25:31 +0200 Subject: [PATCH 21/26] Update README.md --- README.md | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 1588f62b..fc5e3235 100644 --- a/README.md +++ b/README.md @@ -1,32 +1,28 @@ # esx_voice -FXServer ESX Voice - - -#### Description This is a proximity voice controller script. The default control for this is `Left Shift + H` (QWERTY). -#### Download +## Download & Installation -**1) Using [fvm](https://github.com/qlaffont/fvm-installer)** +### Using [fvm](https://github.com/qlaffont/fvm-installer) ``` fvm install --save --folder=esx esx-org/esx_voice ``` -**2) Manually** -- Download https://github.com/ESX-Org/esx_voice/releases/latest -- Put it in resource/[esx] directory - -**3) Using Git** - +### Using Git ``` -cd resouces -git clone https://github.com/ESX-Org/esx_voice +cd resources +git clone https://github.com/ESX-Org/esx_voice [esx]/esx_voice ``` -#### Installation +### Manually +- Download https://github.com/ESX-Org/esx_voice/archive/master.zip +- Put it in the `[esx]` directory -1) Add `start esx_voice` to your server.cfg +## Installation +Add this into your `server.cfg` +``` +start esx_voice +``` - -#### Credits -Original Script by [aabbfive](https://github.com/aabbfive/voicecontroller) +## Credits +[aabbfive](https://github.com/aabbfive/voicecontroller) - Original author From bc4f9507178d80226bc781edbe1c2f3bd2cfca2e Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 4 Jan 2020 13:05:17 +0100 Subject: [PATCH 22/26] Minor repo changes --- README.md | 12 ++++++++++++ __resource.lua | 2 +- client/main.lua | 16 ++-------------- config.lua | 5 +++-- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index fc5e3235..162d2aef 100644 --- a/README.md +++ b/README.md @@ -26,3 +26,15 @@ start esx_voice ## Credits [aabbfive](https://github.com/aabbfive/voicecontroller) - Original author + +# Legal +### License +esx_voice + +Copyright (C) 2015-2020 Jérémie N'gadi + +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/. diff --git a/__resource.lua b/__resource.lua index d314d63b..bbf4a86a 100644 --- a/__resource.lua +++ b/__resource.lua @@ -9,7 +9,7 @@ client_scripts { 'locales/br.lua', 'locales/en.lua', 'locales/fi.lua', - 'locales/fr.lua', + 'locales/fr.lua', 'locales/pl.lua', 'locales/sv.lua', 'config.lua', diff --git a/client/main.lua b/client/main.lua index 9f03719d..7b461c26 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,15 +1,3 @@ -local Keys = { - ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, - ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, - ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, - ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, - ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, - ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, - ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, - ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, - ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 -} - local voice = {default = 5.0, shout = 12.0, whisper = 1.0, current = 0, level = nil} function drawLevel(r, g, b, a) @@ -20,7 +8,7 @@ function drawLevel(r, g, b, a) SetTextDropShadow() SetTextOutline() - BeginTextCommandDisplayText("STRING") + BeginTextCommandDisplayText('STRING') AddTextComponentSubstringPlayerName(_U('voice', voice.level)) EndTextCommandDisplayText(0.175, 0.92) end @@ -39,7 +27,7 @@ Citizen.CreateThread(function() while true do Citizen.Wait(1) - if IsControlJustPressed(1, Keys['H']) and IsControlPressed(1, Keys['LEFTSHIFT']) then + if IsControlJustPressed(1, 74) and IsControlPressed(1, 21) then voice.current = (voice.current + 1) % 3 if voice.current == 0 then NetworkSetTalkerProximity(voice.default) diff --git a/config.lua b/config.lua index ad83260a..1875b978 100644 --- a/config.lua +++ b/config.lua @@ -1,2 +1,3 @@ -Config = {} -Config.Locale = 'en' \ No newline at end of file +Config = {} + +Config.Locale = 'fr' From 39c7768f7aac5abfaf1727365c7c3781b556201d Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 16:57:45 +0100 Subject: [PATCH 23/26] Replace __resource.lua with fxmanifest.lua --- __resource.lua => fxmanifest.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename __resource.lua => fxmanifest.lua (80%) diff --git a/__resource.lua b/fxmanifest.lua similarity index 80% rename from __resource.lua rename to fxmanifest.lua index e41f5e03..621dabd1 100644 --- a/__resource.lua +++ b/fxmanifest.lua @@ -1,4 +1,6 @@ -resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' +fx_version 'adamant' + +game 'gta5' description 'ESX Voice Controller' From 74f546cf13f423b5287c0cdbff6df9674cd37435 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 14 Apr 2020 16:53:41 +0200 Subject: [PATCH 24/26] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 162d2aef..929a4a3c 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ start esx_voice ``` ## Credits + [aabbfive](https://github.com/aabbfive/voicecontroller) - Original author # Legal From 5fdcc34c523a7e7c1422013aa3fc1b9b08da030c Mon Sep 17 00:00:00 2001 From: ArkSeyonet <31637812+ArkSeyonet@users.noreply.github.com> Date: Fri, 15 May 2020 17:10:51 -0500 Subject: [PATCH 25/26] Update esx_voice Add feature for voice UI element to not show until loading screen is off --- client/main.lua | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/client/main.lua b/client/main.lua index 7b461c26..9c5a3b57 100644 --- a/client/main.lua +++ b/client/main.lua @@ -23,36 +23,38 @@ AddEventHandler('onClientMapStart', function() end end) -Citizen.CreateThread(function() - while true do - Citizen.Wait(1) +AddEventHandler('esx:loadingScreenOff', function() + Citizen.CreateThread(function() + while true do + Citizen.Wait(1) + + if IsControlJustPressed(1, 74) and IsControlPressed(1, 21) then + voice.current = (voice.current + 1) % 3 + if voice.current == 0 then + NetworkSetTalkerProximity(voice.default) + voice.level = _U('normal') + elseif voice.current == 1 then + NetworkSetTalkerProximity(voice.shout) + voice.level = _U('shout') + elseif voice.current == 2 then + NetworkSetTalkerProximity(voice.whisper) + voice.level = _U('whisper') + end + end - if IsControlJustPressed(1, 74) and IsControlPressed(1, 21) then - voice.current = (voice.current + 1) % 3 if voice.current == 0 then - NetworkSetTalkerProximity(voice.default) voice.level = _U('normal') elseif voice.current == 1 then - NetworkSetTalkerProximity(voice.shout) voice.level = _U('shout') elseif voice.current == 2 then - NetworkSetTalkerProximity(voice.whisper) voice.level = _U('whisper') end - end - if voice.current == 0 then - voice.level = _U('normal') - elseif voice.current == 1 then - voice.level = _U('shout') - elseif voice.current == 2 then - voice.level = _U('whisper') + if NetworkIsPlayerTalking(PlayerId()) then + drawLevel(41, 128, 185, 255) + else + drawLevel(185, 185, 185, 255) + end end - - if NetworkIsPlayerTalking(PlayerId()) then - drawLevel(41, 128, 185, 255) - else - drawLevel(185, 185, 185, 255) - end - end + end) end) From 87c48964f911e087fab4df842ae862951438ea79 Mon Sep 17 00:00:00 2001 From: HypeLevels <61633775+HypeLevels@users.noreply.github.com> Date: Tue, 1 Dec 2020 21:44:40 +0000 Subject: [PATCH 26/26] Update config.lua Changed default language to english as its the universal language --- config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.lua b/config.lua index 1875b978..a3d6aa84 100644 --- a/config.lua +++ b/config.lua @@ -1,3 +1,3 @@ Config = {} -Config.Locale = 'fr' +Config.Locale = 'en'