commit 734b859582b27a2867d67a83fc272eb64ee35993 parent 720cd45ac35ff733b2dec45045d97f49564d1e7e Author: Charles Baptista <charles@charlesbaptista.com> Date: Thu, 28 May 2020 00:01:47 -0400 Builds on Linux with GCC and make Diffstat:
402 files changed, 296 insertions(+), 4792 deletions(-)
diff --git a/Debug/TapestryEngine.exe b/Debug/TapestryEngine.exe Binary files differ. diff --git a/Debug/TapestryEngine.ilk b/Debug/TapestryEngine.ilk Binary files differ. diff --git a/Debug/TapestryEngine.pdb b/Debug/TapestryEngine.pdb Binary files differ. diff --git a/Release/LICENSE.FLAC.txt b/Release/LICENSE.FLAC.txt @@ -1,32 +0,0 @@ -The source code to this library used with SDL_mixer can be found here: -http://www.libsdl.org/projects/SDL_mixer/libs/ ---- - -Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -- Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - -- Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution. - -- Neither the name of the Xiph.org Foundation nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Release/LICENSE.freetype.txt b/Release/LICENSE.freetype.txt @@ -1,173 +0,0 @@ -The source code to this library used with SDL_ttf can be found here: -http://www.libsdl.org/projects/SDL_ttf/libs/ ---- - - The FreeType Project LICENSE - ---------------------------- - - 2006-Jan-27 - - Copyright 1996-2002, 2006 by - David Turner, Robert Wilhelm, and Werner Lemberg - - - -Introduction -============ - - The FreeType Project is distributed in several archive packages; - some of them may contain, in addition to the FreeType font engine, - various tools and contributions which rely on, or relate to, the - FreeType Project. - - This license applies to all files found in such packages, and - which do not fall under their own explicit license. The license - affects thus the FreeType font engine, the test programs, - documentation and makefiles, at the very least. - - This license was inspired by the BSD, Artistic, and IJG - (Independent JPEG Group) licenses, which all encourage inclusion - and use of free software in commercial and freeware products - alike. As a consequence, its main points are that: - - o We don't promise that this software works. However, we will be - interested in any kind of bug reports. (`as is' distribution) - - o You can use this software for whatever you want, in parts or - full form, without having to pay us. (`royalty-free' usage) - - o You may not pretend that you wrote this software. If you use - it, or only parts of it, in a program, you must acknowledge - somewhere in your documentation that you have used the - FreeType code. (`credits') - - We specifically permit and encourage the inclusion of this - software, with or without modifications, in commercial products. - We disclaim all warranties covering The FreeType Project and - assume no liability related to The FreeType Project. - - - Finally, many people asked us for a preferred form for a - credit/disclaimer to use in compliance with this license. We thus - encourage you to use the following text: - - """ - Portions of this software are copyright © <year> The FreeType - Project (www.freetype.org). All rights reserved. - """ - - Please replace <year> with the value from the FreeType version you - actually use. - - -Legal Terms -=========== - -0. Definitions --------------- - - Throughout this license, the terms `package', `FreeType Project', - and `FreeType archive' refer to the set of files originally - distributed by the authors (David Turner, Robert Wilhelm, and - Werner Lemberg) as the `FreeType Project', be they named as alpha, - beta or final release. - - `You' refers to the licensee, or person using the project, where - `using' is a generic term including compiling the project's source - code as well as linking it to form a `program' or `executable'. - This program is referred to as `a program using the FreeType - engine'. - - This license applies to all files distributed in the original - FreeType Project, including all source code, binaries and - documentation, unless otherwise stated in the file in its - original, unmodified form as distributed in the original archive. - If you are unsure whether or not a particular file is covered by - this license, you must contact us to verify this. - - The FreeType Project is copyright (C) 1996-2000 by David Turner, - Robert Wilhelm, and Werner Lemberg. All rights reserved except as - specified below. - -1. No Warranty --------------- - - THE FREETYPE PROJECT IS PROVIDED `AS IS' WITHOUT WARRANTY OF ANY - KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - PURPOSE. IN NO EVENT WILL ANY OF THE AUTHORS OR COPYRIGHT HOLDERS - BE LIABLE FOR ANY DAMAGES CAUSED BY THE USE OR THE INABILITY TO - USE, OF THE FREETYPE PROJECT. - -2. Redistribution ------------------ - - This license grants a worldwide, royalty-free, perpetual and - irrevocable right and license to use, execute, perform, compile, - display, copy, create derivative works of, distribute and - sublicense the FreeType Project (in both source and object code - forms) and derivative works thereof for any purpose; and to - authorize others to exercise some or all of the rights granted - herein, subject to the following conditions: - - o Redistribution of source code must retain this license file - (`FTL.TXT') unaltered; any additions, deletions or changes to - the original files must be clearly indicated in accompanying - documentation. The copyright notices of the unaltered, - original files must be preserved in all copies of source - files. - - o Redistribution in binary form must provide a disclaimer that - states that the software is based in part of the work of the - FreeType Team, in the distribution documentation. We also - encourage you to put an URL to the FreeType web page in your - documentation, though this isn't mandatory. - - These conditions apply to any software derived from or based on - the FreeType Project, not just the unmodified files. If you use - our work, you must acknowledge us. However, no fee need be paid - to us. - -3. Advertising --------------- - - Neither the FreeType authors and contributors nor you shall use - the name of the other for commercial, advertising, or promotional - purposes without specific prior written permission. - - We suggest, but do not require, that you use one or more of the - following phrases to refer to this software in your documentation - or advertising materials: `FreeType Project', `FreeType Engine', - `FreeType library', or `FreeType Distribution'. - - As you have not signed this license, you are not required to - accept it. However, as the FreeType Project is copyrighted - material, only this license, or another one contracted with the - authors, grants you the right to use, distribute, and modify it. - Therefore, by using, distributing, or modifying the FreeType - Project, you indicate that you understand and accept all the terms - of this license. - -4. Contacts ------------ - - There are two mailing lists related to FreeType: - - o freetype@nongnu.org - - Discusses general use and applications of FreeType, as well as - future and wanted additions to the library and distribution. - If you are looking for support, start in this list if you - haven't found anything to help you in the documentation. - - o freetype-devel@nongnu.org - - Discusses bugs, as well as engine internals, design issues, - specific licenses, porting, etc. - - Our home page can be found at - - http://www.freetype.org - - ---- end of FTL.TXT --- diff --git a/Release/LICENSE.modplug.txt b/Release/LICENSE.modplug.txt @@ -1 +0,0 @@ -ModPlug-XMMS and libmodplug are now in the public domain. diff --git a/Release/LICENSE.ogg-vorbis.txt b/Release/LICENSE.ogg-vorbis.txt @@ -1,32 +0,0 @@ -The source code to this library used with SDL_mixer can be found here: -http://www.libsdl.org/projects/SDL_mixer/libs/ ---- - -Copyright (c) 2002-2008 Xiph.org Foundation - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -- Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - -- Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution. - -- Neither the name of the Xiph.org Foundation nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION -OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Release/LICENSE.smpeg.txt b/Release/LICENSE.smpeg.txt @@ -1,485 +0,0 @@ -The source code to this library used with SDL_mixer can be found here: -http://www.libsdl.org/projects/SDL_mixer/libs/ ---- - - GNU LIBRARY GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the library GPL. It is - numbered 2 because it goes with version 2 of the ordinary GPL.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Library General Public License, applies to some -specially designated Free Software Foundation software, and to any -other libraries whose authors decide to use it. You can use it for -your libraries, 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 library, or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link a program with the library, you must provide -complete object files to the recipients so that they can relink them -with the library, after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - Our method of protecting your rights has two steps: (1) copyright -the library, and (2) offer you this license which gives you legal -permission to copy, distribute and/or modify the library. - - Also, for each distributor's protection, we want to make certain -that everyone understands that there is no warranty for this free -library. If the library is modified by someone else and passed on, we -want its recipients to know that what they have is not the original -version, 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 companies distributing free -software will individually obtain patent licenses, thus in effect -transforming the program into proprietary software. To prevent this, -we have made it clear that any patent must be licensed for everyone's -free use or not licensed at all. - - Most GNU software, including some libraries, is covered by the ordinary -GNU General Public License, which was designed for utility programs. This -license, the GNU Library General Public License, applies to certain -designated libraries. This license is quite different from the ordinary -one; be sure to read it in full, and don't assume that anything in it is -the same as in the ordinary license. - - The reason we have a separate public license for some libraries is that -they blur the distinction we usually make between modifying or adding to a -program and simply using it. Linking a program with a library, without -changing the library, is in some sense simply using the library, and is -analogous to running a utility program or application program. However, in -a textual and legal sense, the linked executable is a combined work, a -derivative of the original library, and the ordinary General Public License -treats it as such. - - Because of this blurred distinction, using the ordinary General -Public License for libraries did not effectively promote software -sharing, because most developers did not use the libraries. We -concluded that weaker conditions might promote sharing better. - - However, unrestricted linking of non-free programs would deprive the -users of those programs of all benefit from the free status of the -libraries themselves. This Library General Public License is intended to -permit developers of non-free programs to use free libraries, while -preserving your freedom as a user of such programs to change the free -libraries that are incorporated in them. (We have not seen how to achieve -this as regards changes in header files, but we have achieved it as regards -changes in the actual functions of the Library.) The hope is that this -will lead to faster development of free libraries. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, while the latter only -works together with the library. - - Note that it is possible for a library to be covered by the ordinary -General Public License rather than by this special one. - - GNU LIBRARY GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library which -contains a notice placed by the copyright holder or other authorized -party saying it may be distributed under the terms of this Library -General Public License (also called "this License"). Each licensee is -addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, 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 library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete 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 distribute a copy of this License along with the -Library. - - 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 Library or any portion -of it, thus forming a work based on the Library, 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) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -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 Library, 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 Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you 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. - - If distribution of 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 satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also compile or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - c) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - d) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. 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. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library 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. - - 9. 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 Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -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. - - 11. 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 Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library 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 Library. - -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. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library 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. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Library 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 Library -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 Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -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 - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "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 -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. 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 LIBRARY 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 -LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - Appendix: How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. 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. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/Release/LICENSE.zlib.txt b/Release/LICENSE.zlib.txt @@ -1,31 +0,0 @@ -The source code to this library used with SDL_ttf can be found here: -http://www.libsdl.org/projects/SDL_ttf/libs/ ---- - -Copyright notice: - - (C) 1995-2010 Jean-loup Gailly and Mark Adler - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - Jean-loup Gailly Mark Adler - jloup@gzip.org madler@alumni.caltech.edu - -If you use the zlib library in a product, we would appreciate *not* receiving -lengthy legal documents to sign. The sources are provided for free but without -warranty of any kind. The library has been entirely written by Jean-loup -Gailly and Mark Adler; it does not include third-party code. diff --git a/Release/README.txt b/Release/README.txt @@ -1,22 +0,0 @@ -This library is distributed under the terms of the zlib license: - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - -Portions of this software are copyright © 2013 The FreeType Project (www.freetype.org). All rights reserved. - -The source is available from the SDL website: -http://www.libsdl.org/projects/SDL_ttf diff --git a/Release/SDL2.dll b/Release/SDL2.dll Binary files differ. diff --git a/Release/SDL2.lib b/Release/SDL2.lib Binary files differ. diff --git a/Release/SDL2_mixer.dll b/Release/SDL2_mixer.dll Binary files differ. diff --git a/Release/SDL2_mixer.lib b/Release/SDL2_mixer.lib Binary files differ. diff --git a/Release/SDL2_ttf.dll b/Release/SDL2_ttf.dll Binary files differ. diff --git a/Release/SDL2_ttf.lib b/Release/SDL2_ttf.lib Binary files differ. diff --git a/Release/SDL2main.lib b/Release/SDL2main.lib Binary files differ. diff --git a/Release/SDL2test.lib b/Release/SDL2test.lib Binary files differ. diff --git a/Release/TapestryEngine.exe b/Release/TapestryEngine.exe Binary files differ. diff --git a/Release/TapestryEngine.iobj b/Release/TapestryEngine.iobj Binary files differ. diff --git a/Release/TapestryEngine.ipdb b/Release/TapestryEngine.ipdb Binary files differ. diff --git a/Release/TapestryEngine.pdb b/Release/TapestryEngine.pdb Binary files differ. diff --git a/Release/fonts/ARIAL.TTF b/Release/fonts/ARIAL.TTF Binary files differ. diff --git a/Release/fonts/Tapestry.ttf b/Release/fonts/Tapestry.ttf Binary files differ. diff --git a/Release/imgs/ARIAL.TTF b/Release/imgs/ARIAL.TTF Binary files differ. diff --git a/Release/imgs/Back.bmp b/Release/imgs/Back.bmp Binary files differ. diff --git a/Release/imgs/BlueBox.bmp b/Release/imgs/BlueBox.bmp Binary files differ. diff --git a/Release/imgs/BoundingBox - Copy - Copy.bmp b/Release/imgs/BoundingBox - Copy - Copy.bmp Binary files differ. diff --git a/Release/imgs/BoundingBox - Copy.bmp b/Release/imgs/BoundingBox - Copy.bmp Binary files differ. diff --git a/Release/imgs/BoundingBox.bmp b/Release/imgs/BoundingBox.bmp Binary files differ. diff --git a/Release/imgs/FloatingDirtLand.bmp b/Release/imgs/FloatingDirtLand.bmp Binary files differ. diff --git a/Release/imgs/Girl Sprite R new hair.png b/Release/imgs/Girl Sprite R new hair.png Binary files differ. diff --git a/Release/imgs/Line.bmp b/Release/imgs/Line.bmp Binary files differ. diff --git a/Release/imgs/Loading.bmp b/Release/imgs/Loading.bmp Binary files differ. diff --git a/Release/imgs/NPCs/gardenwoman_idle.bmp b/Release/imgs/NPCs/gardenwoman_idle.bmp Binary files differ. diff --git a/Release/imgs/NPCs/gateman/gateoperator_idle.bmp b/Release/imgs/NPCs/gateman/gateoperator_idle.bmp Binary files differ. diff --git a/Release/imgs/NPCs/gateman/gateoperator_lower.bmp b/Release/imgs/NPCs/gateman/gateoperator_lower.bmp Binary files differ. diff --git a/Release/imgs/NPCs/gateman/gateoperator_raise.bmp b/Release/imgs/NPCs/gateman/gateoperator_raise.bmp Binary files differ. diff --git a/Release/imgs/NPCs/sitting_man_idle.bmp b/Release/imgs/NPCs/sitting_man_idle.bmp Binary files differ. diff --git a/Release/imgs/NPCs/smokingman_idle.bmp b/Release/imgs/NPCs/smokingman_idle.bmp Binary files differ. diff --git a/Release/imgs/NPCs/storeowner_idle.bmp b/Release/imgs/NPCs/storeowner_idle.bmp Binary files differ. diff --git a/Release/imgs/RedBox - Copy (2).bmp b/Release/imgs/RedBox - Copy (2).bmp Binary files differ. diff --git a/Release/imgs/RedBox - Copy.bmp b/Release/imgs/RedBox - Copy.bmp Binary files differ. diff --git a/Release/imgs/RedBox.bmp b/Release/imgs/RedBox.bmp Binary files differ. diff --git a/Release/imgs/RedBoxWithTrans.bmp b/Release/imgs/RedBoxWithTrans.bmp Binary files differ. diff --git a/Release/imgs/Scene.bmp b/Release/imgs/Scene.bmp Binary files differ. diff --git a/Release/imgs/Scene2.bmp b/Release/imgs/Scene2.bmp Binary files differ. diff --git a/Release/imgs/SceneColMap - Copy.bmp b/Release/imgs/SceneColMap - Copy.bmp Binary files differ. diff --git a/Release/imgs/SceneColMap.bmp b/Release/imgs/SceneColMap.bmp Binary files differ. diff --git a/Release/imgs/Scene_1/scene_1_back_0.bmp b/Release/imgs/Scene_1/scene_1_back_0.bmp Binary files differ. diff --git a/Release/imgs/Scene_1/scene_1_back_1.bmp b/Release/imgs/Scene_1/scene_1_back_1.bmp Binary files differ. diff --git a/Release/imgs/Scene_1/scene_1_back_3.bmp b/Release/imgs/Scene_1/scene_1_back_3.bmp Binary files differ. diff --git a/Release/imgs/Scene_1/scene_1_back_4.bmp b/Release/imgs/Scene_1/scene_1_back_4.bmp Binary files differ. diff --git a/Release/imgs/Scene_1/scene_1_back_5.bmp b/Release/imgs/Scene_1/scene_1_back_5.bmp Binary files differ. diff --git a/Release/imgs/Scene_1/scene_1_back_transp_2.bmp b/Release/imgs/Scene_1/scene_1_back_transp_2.bmp Binary files differ. diff --git a/Release/imgs/Scene_1/scene_1_colmap.bmp b/Release/imgs/Scene_1/scene_1_colmap.bmp Binary files differ. diff --git a/Release/imgs/Scene_1/scene_1_fore_0.bmp b/Release/imgs/Scene_1/scene_1_fore_0.bmp Binary files differ. diff --git a/Release/imgs/Scene_1/scene_1_fore_2.bmp b/Release/imgs/Scene_1/scene_1_fore_2.bmp Binary files differ. diff --git a/Release/imgs/Scene_1/scene_1_fore_3.bmp b/Release/imgs/Scene_1/scene_1_fore_3.bmp Binary files differ. diff --git a/Release/imgs/Scene_1/scene_1_fore_4.bmp b/Release/imgs/Scene_1/scene_1_fore_4.bmp Binary files differ. diff --git a/Release/imgs/Scene_1/scene_1_fore_transp_1.bmp b/Release/imgs/Scene_1/scene_1_fore_transp_1.bmp Binary files differ. diff --git a/Release/imgs/Scene_2/scene_2_back_0.bmp b/Release/imgs/Scene_2/scene_2_back_0.bmp Binary files differ. diff --git a/Release/imgs/Scene_2/scene_2_back_1.bmp b/Release/imgs/Scene_2/scene_2_back_1.bmp Binary files differ. diff --git a/Release/imgs/Scene_2/scene_2_back_4.bmp b/Release/imgs/Scene_2/scene_2_back_4.bmp Binary files differ. diff --git a/Release/imgs/Scene_2/scene_2_back_transp_2.bmp b/Release/imgs/Scene_2/scene_2_back_transp_2.bmp Binary files differ. diff --git a/Release/imgs/Scene_2/scene_2_back_transp_3.bmp b/Release/imgs/Scene_2/scene_2_back_transp_3.bmp Binary files differ. diff --git a/Release/imgs/Scene_2/scene_2_colmap.bmp b/Release/imgs/Scene_2/scene_2_colmap.bmp Binary files differ. diff --git a/Release/imgs/Scene_2/scene_2_fore_0.bmp b/Release/imgs/Scene_2/scene_2_fore_0.bmp Binary files differ. diff --git a/Release/imgs/Scene_WaterOverlay.bmp b/Release/imgs/Scene_WaterOverlay.bmp Binary files differ. diff --git a/Release/imgs/Scene_fore.bmp b/Release/imgs/Scene_fore.bmp Binary files differ. diff --git a/Release/imgs/Tapestry.ttf b/Release/imgs/Tapestry.ttf Binary files differ. diff --git a/Release/imgs/TestLand_COL - Copy.bmp b/Release/imgs/TestLand_COL - Copy.bmp Binary files differ. diff --git a/Release/imgs/TestLand_COL.bmp b/Release/imgs/TestLand_COL.bmp Binary files differ. diff --git a/Release/imgs/TruckStop - Copy.bmp b/Release/imgs/TruckStop - Copy.bmp Binary files differ. diff --git a/Release/imgs/TruckStop.bmp b/Release/imgs/TruckStop.bmp Binary files differ. diff --git a/Release/imgs/TwoColorLand.bmp b/Release/imgs/TwoColorLand.bmp Binary files differ. diff --git a/Release/imgs/Wade.bmp b/Release/imgs/Wade.bmp Binary files differ. diff --git a/Release/imgs/WhiteSpace.bmp b/Release/imgs/WhiteSpace.bmp Binary files differ. diff --git a/Release/imgs/arid_land/arid land_back_0.bmp b/Release/imgs/arid_land/arid land_back_0.bmp Binary files differ. diff --git a/Release/imgs/arid_land/arid land_back_1.bmp b/Release/imgs/arid_land/arid land_back_1.bmp Binary files differ. diff --git a/Release/imgs/arid_land/arid land_back_2.bmp b/Release/imgs/arid_land/arid land_back_2.bmp Binary files differ. diff --git a/Release/imgs/arid_land/arid land_back_4.bmp b/Release/imgs/arid_land/arid land_back_4.bmp Binary files differ. diff --git a/Release/imgs/arid_land/arid land_back_transp_3.bmp b/Release/imgs/arid_land/arid land_back_transp_3.bmp Binary files differ. diff --git a/Release/imgs/arid_land/arid land_colmap.bmp b/Release/imgs/arid_land/arid land_colmap.bmp Binary files differ. diff --git a/Release/imgs/arid_land/arid land_fore_0.bmp b/Release/imgs/arid_land/arid land_fore_0.bmp Binary files differ. diff --git a/Release/imgs/arid_land/arid land_fore_1.bmp b/Release/imgs/arid_land/arid land_fore_1.bmp Binary files differ. diff --git a/Release/imgs/arid_land/arid land_fore_2.bmp b/Release/imgs/arid_land/arid land_fore_2.bmp Binary files differ. diff --git a/Release/imgs/arid_land/arid land_fore_3.bmp b/Release/imgs/arid_land/arid land_fore_3.bmp Binary files differ. diff --git a/Release/imgs/arid_land/arid land_over_transp_0.bmp b/Release/imgs/arid_land/arid land_over_transp_0.bmp Binary files differ. diff --git a/Release/imgs/arid_land/arid land_over_transp_1.bmp b/Release/imgs/arid_land/arid land_over_transp_1.bmp Binary files differ. diff --git a/Release/imgs/arid_land/arid land_over_transp_2.bmp b/Release/imgs/arid_land/arid land_over_transp_2.bmp Binary files differ. diff --git a/Release/imgs/arid_land/text.bmp b/Release/imgs/arid_land/text.bmp Binary files differ. diff --git a/Release/imgs/arid_land_original/arid land_back_0.bmp b/Release/imgs/arid_land_original/arid land_back_0.bmp Binary files differ. diff --git a/Release/imgs/arid_land_original/arid land_back_1.bmp b/Release/imgs/arid_land_original/arid land_back_1.bmp Binary files differ. diff --git a/Release/imgs/arid_land_original/arid land_back_2.bmp b/Release/imgs/arid_land_original/arid land_back_2.bmp Binary files differ. diff --git a/Release/imgs/arid_land_original/arid land_back_4.bmp b/Release/imgs/arid_land_original/arid land_back_4.bmp Binary files differ. diff --git a/Release/imgs/arid_land_original/arid land_back_transp_3.bmp b/Release/imgs/arid_land_original/arid land_back_transp_3.bmp Binary files differ. diff --git a/Release/imgs/arid_land_original/arid land_colmap.bmp b/Release/imgs/arid_land_original/arid land_colmap.bmp Binary files differ. diff --git a/Release/imgs/arid_land_original/arid land_fore_0.bmp b/Release/imgs/arid_land_original/arid land_fore_0.bmp Binary files differ. diff --git a/Release/imgs/arid_land_original/arid land_fore_1.bmp b/Release/imgs/arid_land_original/arid land_fore_1.bmp Binary files differ. diff --git a/Release/imgs/arid_land_original/arid land_fore_2.bmp b/Release/imgs/arid_land_original/arid land_fore_2.bmp Binary files differ. diff --git a/Release/imgs/arid_land_original/arid land_fore_3.bmp b/Release/imgs/arid_land_original/arid land_fore_3.bmp Binary files differ. diff --git a/Release/imgs/arid_land_original/arid land_over_transp_0.bmp b/Release/imgs/arid_land_original/arid land_over_transp_0.bmp Binary files differ. diff --git a/Release/imgs/arid_land_original/arid land_over_transp_1.bmp b/Release/imgs/arid_land_original/arid land_over_transp_1.bmp Binary files differ. diff --git a/Release/imgs/backups/BandanaManPlus - Copy.bmp b/Release/imgs/backups/BandanaManPlus - Copy.bmp Binary files differ. diff --git a/Release/imgs/backups/BandanaManPlus.bmp b/Release/imgs/backups/BandanaManPlus.bmp Binary files differ. diff --git a/Release/imgs/backups/BandanaManRun - Copy.bmp b/Release/imgs/backups/BandanaManRun - Copy.bmp Binary files differ. diff --git a/Release/imgs/backups/BandanaManRun.bmp b/Release/imgs/backups/BandanaManRun.bmp Binary files differ. diff --git a/Release/imgs/backups/BandanaWomanRun - Copy.bmp b/Release/imgs/backups/BandanaWomanRun - Copy.bmp Binary files differ. diff --git a/Release/imgs/backups/BandanaWomanRun.bmp b/Release/imgs/backups/BandanaWomanRun.bmp Binary files differ. diff --git a/Release/imgs/backups/Sprite_FX_Water_0024.png b/Release/imgs/backups/Sprite_FX_Water_0024.png Binary files differ. diff --git a/Release/imgs/backups/bigger scene colmap.png b/Release/imgs/backups/bigger scene colmap.png Binary files differ. diff --git a/Release/imgs/backups/bigger scene pic.png b/Release/imgs/backups/bigger scene pic.png Binary files differ. diff --git a/Release/imgs/backups/desert hills colmap.png b/Release/imgs/backups/desert hills colmap.png Binary files differ. diff --git a/Release/imgs/backups/desert hills pic.png b/Release/imgs/backups/desert hills pic.png Binary files differ. diff --git a/Release/imgs/backups/desert_hills/desert hills_back_layer1.png b/Release/imgs/backups/desert_hills/desert hills_back_layer1.png Binary files differ. diff --git a/Release/imgs/backups/desert_hills/desert hills_back_layer2.png b/Release/imgs/backups/desert_hills/desert hills_back_layer2.png Binary files differ. diff --git a/Release/imgs/backups/desert_hills/desert hills_back_layer3.png b/Release/imgs/backups/desert_hills/desert hills_back_layer3.png Binary files differ. diff --git a/Release/imgs/backups/desert_hills/desert hills_fore_layer1.png b/Release/imgs/backups/desert_hills/desert hills_fore_layer1.png Binary files differ. diff --git a/Release/imgs/backups/entry into idle.png b/Release/imgs/backups/entry into idle.png Binary files differ. diff --git a/Release/imgs/backups/idle.png b/Release/imgs/backups/idle.png Binary files differ. diff --git a/Release/imgs/backups/moritz-bach-water-splash-spread-sheet.bmp b/Release/imgs/backups/moritz-bach-water-splash-spread-sheet.bmp Binary files differ. diff --git a/Release/imgs/backups/moritz-bach-water-splash-spread-sheet.jpg b/Release/imgs/backups/moritz-bach-water-splash-spread-sheet.jpg Binary files differ. diff --git a/Release/imgs/backups/player_idle.bmp b/Release/imgs/backups/player_idle.bmp Binary files differ. diff --git a/Release/imgs/backups/player_idle_30.bmp b/Release/imgs/backups/player_idle_30.bmp Binary files differ. diff --git a/Release/imgs/backups/player_idle_begin.bmp b/Release/imgs/backups/player_idle_begin.bmp Binary files differ. diff --git a/Release/imgs/backups/player_idle_init_30.bmp b/Release/imgs/backups/player_idle_init_30.bmp Binary files differ. diff --git a/Release/imgs/backups/player_idle_standin.bmp b/Release/imgs/backups/player_idle_standin.bmp Binary files differ. diff --git a/Release/imgs/backups/player_run_30.bmp b/Release/imgs/backups/player_run_30.bmp Binary files differ. diff --git a/Release/imgs/backups/player_run_cropped.bmp b/Release/imgs/backups/player_run_cropped.bmp Binary files differ. diff --git a/Release/imgs/backups/player_run_cropping.bmp b/Release/imgs/backups/player_run_cropping.bmp Binary files differ. diff --git a/Release/imgs/backups/player_run_uncropped.bmp b/Release/imgs/backups/player_run_uncropped.bmp Binary files differ. diff --git a/Release/imgs/demo_intro.txt b/Release/imgs/demo_intro.txt Binary files differ. diff --git a/Release/imgs/desert hills_back_layer1.bmp b/Release/imgs/desert hills_back_layer1.bmp Binary files differ. diff --git a/Release/imgs/desert hills_back_layer2.bmp b/Release/imgs/desert hills_back_layer2.bmp Binary files differ. diff --git a/Release/imgs/desert hills_back_layer3.bmp b/Release/imgs/desert hills_back_layer3.bmp Binary files differ. diff --git a/Release/imgs/desert hills_fore_layer1.bmp b/Release/imgs/desert hills_fore_layer1.bmp Binary files differ. diff --git a/Release/imgs/desert_hills.bmp b/Release/imgs/desert_hills.bmp Binary files differ. diff --git a/Release/imgs/desert_hills_Expand.bmp b/Release/imgs/desert_hills_Expand.bmp Binary files differ. diff --git a/Release/imgs/desert_hills_colmap.bmp b/Release/imgs/desert_hills_colmap.bmp Binary files differ. diff --git a/Release/imgs/desert_hills_doub.bmp b/Release/imgs/desert_hills_doub.bmp Binary files differ. diff --git a/Release/imgs/desert_hills_double.bmp b/Release/imgs/desert_hills_double.bmp Binary files differ. diff --git a/Release/imgs/desert_hills_half.bmp b/Release/imgs/desert_hills_half.bmp Binary files differ. diff --git a/Release/imgs/dialogue_box.bmp b/Release/imgs/dialogue_box.bmp Binary files differ. diff --git a/Release/imgs/door.bmp b/Release/imgs/door.bmp Binary files differ. diff --git a/Release/imgs/fader.bmp b/Release/imgs/fader.bmp Binary files differ. diff --git a/Release/imgs/fader_black.bmp b/Release/imgs/fader_black.bmp Binary files differ. diff --git a/Release/imgs/fader_red.bmp b/Release/imgs/fader_red.bmp Binary files differ. diff --git a/Release/imgs/font.bmp b/Release/imgs/font.bmp Binary files differ. diff --git a/Release/imgs/gameover.bmp b/Release/imgs/gameover.bmp Binary files differ. diff --git a/Release/imgs/gate/gate_down.bmp b/Release/imgs/gate/gate_down.bmp Binary files differ. diff --git a/Release/imgs/gate/gate_lower.bmp b/Release/imgs/gate/gate_lower.bmp Binary files differ. diff --git a/Release/imgs/gate/gate_lower_begin.bmp b/Release/imgs/gate/gate_lower_begin.bmp Binary files differ. diff --git a/Release/imgs/gate/gate_raise.bmp b/Release/imgs/gate/gate_raise.bmp Binary files differ. diff --git a/Release/imgs/gate/gate_up.bmp b/Release/imgs/gate/gate_up.bmp Binary files differ. diff --git a/Release/imgs/groundland.bmp b/Release/imgs/groundland.bmp Binary files differ. diff --git a/Release/imgs/haze.bmp b/Release/imgs/haze.bmp Binary files differ. diff --git a/Release/imgs/hostile/bug_sick_walk.bmp b/Release/imgs/hostile/bug_sick_walk.bmp Binary files differ. diff --git a/Release/imgs/hostile/bug_walk.bmp b/Release/imgs/hostile/bug_walk.bmp Binary files differ. diff --git a/Release/imgs/life_bar.bmp b/Release/imgs/life_bar.bmp Binary files differ. diff --git a/Release/imgs/life_base.bmp b/Release/imgs/life_base.bmp Binary files differ. diff --git a/Release/imgs/lilred.bmp b/Release/imgs/lilred.bmp Binary files differ. diff --git a/Release/imgs/loyal_bug/loyalbug_idle.bmp b/Release/imgs/loyal_bug/loyalbug_idle.bmp Binary files differ. diff --git a/Release/imgs/loyal_bug/loyalbug_idle_begin.bmp b/Release/imgs/loyal_bug/loyalbug_idle_begin.bmp Binary files differ. diff --git a/Release/imgs/loyal_bug/loyalbug_walk.bmp b/Release/imgs/loyal_bug/loyalbug_walk.bmp Binary files differ. diff --git a/Release/imgs/non-engine/Man Run Cycle_14 frames_ Frame16by30 (1).bmp b/Release/imgs/non-engine/Man Run Cycle_14 frames_ Frame16by30 (1).bmp Binary files differ. diff --git a/Release/imgs/non-engine/WomanRun .bmp b/Release/imgs/non-engine/WomanRun .bmp Binary files differ. diff --git a/Release/imgs/non-engine/essoladan_1920.jpg b/Release/imgs/non-engine/essoladan_1920.jpg Binary files differ. diff --git a/Release/imgs/non-engine/passerines_1920_badge.jpg b/Release/imgs/non-engine/passerines_1920_badge.jpg Binary files differ. diff --git a/Release/imgs/non-engine/screencap5-20-16.png b/Release/imgs/non-engine/screencap5-20-16.png Binary files differ. diff --git a/Release/imgs/plat_test.bmp b/Release/imgs/plat_test.bmp Binary files differ. diff --git a/Release/imgs/player/myhatisat.bmp b/Release/imgs/player/myhatisat.bmp Binary files differ. diff --git a/Release/imgs/player/player_attack.bmp b/Release/imgs/player/player_attack.bmp Binary files differ. diff --git a/Release/imgs/player/player_fall.bmp b/Release/imgs/player/player_fall.bmp Binary files differ. diff --git a/Release/imgs/player/player_fall_drawn.bmp b/Release/imgs/player/player_fall_drawn.bmp Binary files differ. diff --git a/Release/imgs/player/player_idle.bmp b/Release/imgs/player/player_idle.bmp Binary files differ. diff --git a/Release/imgs/player/player_idle_begin.bmp b/Release/imgs/player/player_idle_begin.bmp Binary files differ. diff --git a/Release/imgs/player/player_idle_begin_drawn.bmp b/Release/imgs/player/player_idle_begin_drawn.bmp Binary files differ. diff --git a/Release/imgs/player/player_idle_drawn.bmp b/Release/imgs/player/player_idle_drawn.bmp Binary files differ. diff --git a/Release/imgs/player/player_jump.bmp b/Release/imgs/player/player_jump.bmp Binary files differ. diff --git a/Release/imgs/player/player_jump_drawn.bmp b/Release/imgs/player/player_jump_drawn.bmp Binary files differ. diff --git a/Release/imgs/player/player_jump_to_fall.bmp b/Release/imgs/player/player_jump_to_fall.bmp Binary files differ. diff --git a/Release/imgs/player/player_jump_to_fall_drawn.bmp b/Release/imgs/player/player_jump_to_fall_drawn.bmp Binary files differ. diff --git a/Release/imgs/player/player_run.bmp b/Release/imgs/player/player_run.bmp Binary files differ. diff --git a/Release/imgs/player/player_run_drawn.bmp b/Release/imgs/player/player_run_drawn.bmp Binary files differ. diff --git a/Release/imgs/player/player_swim.bmp b/Release/imgs/player/player_swim.bmp Binary files differ. diff --git a/Release/imgs/player/player_swim_tread.bmp b/Release/imgs/player/player_swim_tread.bmp Binary files differ. diff --git a/Release/imgs/player/sword/sword_attack.bmp b/Release/imgs/player/sword/sword_attack.bmp Binary files differ. diff --git a/Release/imgs/player/sword/sword_fall.bmp b/Release/imgs/player/sword/sword_fall.bmp Binary files differ. diff --git a/Release/imgs/player/sword/sword_fall_drawn.bmp b/Release/imgs/player/sword/sword_fall_drawn.bmp Binary files differ. diff --git a/Release/imgs/player/sword/sword_idle.bmp b/Release/imgs/player/sword/sword_idle.bmp Binary files differ. diff --git a/Release/imgs/player/sword/sword_idle_begin.bmp b/Release/imgs/player/sword/sword_idle_begin.bmp Binary files differ. diff --git a/Release/imgs/player/sword/sword_idle_begin_drawn.bmp b/Release/imgs/player/sword/sword_idle_begin_drawn.bmp Binary files differ. diff --git a/Release/imgs/player/sword/sword_idle_drawn.bmp b/Release/imgs/player/sword/sword_idle_drawn.bmp Binary files differ. diff --git a/Release/imgs/player/sword/sword_jump.bmp b/Release/imgs/player/sword/sword_jump.bmp Binary files differ. diff --git a/Release/imgs/player/sword/sword_jump_drawn.bmp b/Release/imgs/player/sword/sword_jump_drawn.bmp Binary files differ. diff --git a/Release/imgs/player/sword/sword_jump_to_fall.bmp b/Release/imgs/player/sword/sword_jump_to_fall.bmp Binary files differ. diff --git a/Release/imgs/player/sword/sword_jump_to_fall_drawn.bmp b/Release/imgs/player/sword/sword_jump_to_fall_drawn.bmp Binary files differ. diff --git a/Release/imgs/player/sword/sword_run.bmp b/Release/imgs/player/sword/sword_run.bmp Binary files differ. diff --git a/Release/imgs/player/sword/sword_run_drawn.bmp b/Release/imgs/player/sword/sword_run_drawn.bmp Binary files differ. diff --git a/Release/imgs/player/sword/sword_swim.bmp b/Release/imgs/player/sword/sword_swim.bmp Binary files differ. diff --git a/Release/imgs/player/sword/sword_swim_tread.bmp b/Release/imgs/player/sword/sword_swim_tread.bmp Binary files differ. diff --git a/Release/imgs/png/player_attack.png b/Release/imgs/png/player_attack.png Binary files differ. diff --git a/Release/imgs/png/sword_attack.png b/Release/imgs/png/sword_attack.png Binary files differ. diff --git a/Release/imgs/pool.bmp b/Release/imgs/pool.bmp Binary files differ. diff --git a/Release/imgs/rabbits/brabbit_hop.bmp b/Release/imgs/rabbits/brabbit_hop.bmp Binary files differ. diff --git a/Release/imgs/rabbits/brabbit_idle_eat.bmp b/Release/imgs/rabbits/brabbit_idle_eat.bmp Binary files differ. diff --git a/Release/imgs/rabbits/brabbit_idle_look.bmp b/Release/imgs/rabbits/brabbit_idle_look.bmp Binary files differ. diff --git a/Release/imgs/rabbits/brabbit_sleep.bmp b/Release/imgs/rabbits/brabbit_sleep.bmp Binary files differ. diff --git a/Release/imgs/rabbits/grabbit_hop.bmp b/Release/imgs/rabbits/grabbit_hop.bmp Binary files differ. diff --git a/Release/imgs/rabbits/grabbit_idle_eat.bmp b/Release/imgs/rabbits/grabbit_idle_eat.bmp Binary files differ. diff --git a/Release/imgs/rabbits/grabbit_idle_look.bmp b/Release/imgs/rabbits/grabbit_idle_look.bmp Binary files differ. diff --git a/Release/imgs/rabbits/grabbit_sleep.bmp b/Release/imgs/rabbits/grabbit_sleep.bmp Binary files differ. diff --git a/Release/imgs/rabbits/player_swim_tread.bmp b/Release/imgs/rabbits/player_swim_tread.bmp Binary files differ. diff --git a/Release/imgs/rabbits/trabbit_hop.bmp b/Release/imgs/rabbits/trabbit_hop.bmp Binary files differ. diff --git a/Release/imgs/rabbits/trabbit_idle_eat.bmp b/Release/imgs/rabbits/trabbit_idle_eat.bmp Binary files differ. diff --git a/Release/imgs/rabbits/trabbit_idle_look.bmp b/Release/imgs/rabbits/trabbit_idle_look.bmp Binary files differ. diff --git a/Release/imgs/rabbits/trabbit_sleep.bmp b/Release/imgs/rabbits/trabbit_sleep.bmp Binary files differ. diff --git a/Release/imgs/red_idle.bmp b/Release/imgs/red_idle.bmp Binary files differ. diff --git a/Release/imgs/red_idle_begin.bmp b/Release/imgs/red_idle_begin.bmp Binary files differ. diff --git a/Release/imgs/red_run.bmp b/Release/imgs/red_run.bmp Binary files differ. diff --git a/Release/imgs/scene3.bmp b/Release/imgs/scene3.bmp Binary files differ. diff --git a/Release/imgs/scene_3/scene_3_back_0.bmp b/Release/imgs/scene_3/scene_3_back_0.bmp Binary files differ. diff --git a/Release/imgs/scene_3/scene_3_back_1.bmp b/Release/imgs/scene_3/scene_3_back_1.bmp Binary files differ. diff --git a/Release/imgs/scene_3/scene_3_back_3.bmp b/Release/imgs/scene_3/scene_3_back_3.bmp Binary files differ. diff --git a/Release/imgs/scene_3/scene_3_back_4.bmp b/Release/imgs/scene_3/scene_3_back_4.bmp Binary files differ. diff --git a/Release/imgs/scene_3/scene_3_back_transp_2.bmp b/Release/imgs/scene_3/scene_3_back_transp_2.bmp Binary files differ. diff --git a/Release/imgs/scene_3/scene_3_back_transp_3.bmp b/Release/imgs/scene_3/scene_3_back_transp_3.bmp Binary files differ. diff --git a/Release/imgs/scene_3/scene_3_back_transp_4.bmp b/Release/imgs/scene_3/scene_3_back_transp_4.bmp Binary files differ. diff --git a/Release/imgs/scene_3/scene_3_back_transp_5.bmp b/Release/imgs/scene_3/scene_3_back_transp_5.bmp Binary files differ. diff --git a/Release/imgs/scene_3/scene_3_colmap.bmp b/Release/imgs/scene_3/scene_3_colmap.bmp Binary files differ. diff --git a/Release/imgs/scene_3/scene_3_fore_0.bmp b/Release/imgs/scene_3/scene_3_fore_0.bmp Binary files differ. diff --git a/Release/imgs/sludge_seal/sludgeseal_crawl.bmp b/Release/imgs/sludge_seal/sludgeseal_crawl.bmp Binary files differ. diff --git a/Release/imgs/sludge_seal/sludgeseal_dead.bmp b/Release/imgs/sludge_seal/sludgeseal_dead.bmp Binary files differ. diff --git a/Release/imgs/sludge_seal/sludgeseal_die.bmp b/Release/imgs/sludge_seal/sludgeseal_die.bmp Binary files differ. diff --git a/Release/imgs/sludge_seal/sludgeseal_land_idle.bmp b/Release/imgs/sludge_seal/sludgeseal_land_idle.bmp Binary files differ. diff --git a/Release/imgs/sludge_seal/sludgeseal_swim.bmp b/Release/imgs/sludge_seal/sludgeseal_swim.bmp Binary files differ. diff --git a/Release/imgs/sludge_seal/sludgeseal_swim_begin.bmp b/Release/imgs/sludge_seal/sludgeseal_swim_begin.bmp Binary files differ. diff --git a/Release/imgs/sludge_seal/sludgeseal_water_idle.bmp b/Release/imgs/sludge_seal/sludgeseal_water_idle.bmp Binary files differ. diff --git a/Release/imgs/splash.bmp b/Release/imgs/splash.bmp Binary files differ. diff --git a/Release/imgs/taco.bmp b/Release/imgs/taco.bmp Binary files differ. diff --git a/Release/imgs/text.bmp b/Release/imgs/text.bmp Binary files differ. diff --git a/Release/imgs/water_ripple.bmp b/Release/imgs/water_ripple.bmp Binary files differ. diff --git a/Release/imgs/winch/winch_down.bmp b/Release/imgs/winch/winch_down.bmp Binary files differ. diff --git a/Release/imgs/winch/winch_lower.bmp b/Release/imgs/winch/winch_lower.bmp Binary files differ. diff --git a/Release/imgs/winch/winch_lower_begin.bmp b/Release/imgs/winch/winch_lower_begin.bmp Binary files differ. diff --git a/Release/imgs/winch/winch_raise.bmp b/Release/imgs/winch/winch_raise.bmp Binary files differ. diff --git a/Release/imgs/winch/winch_up.bmp b/Release/imgs/winch/winch_up.bmp Binary files differ. diff --git a/Release/imgs/yella_idle.bmp b/Release/imgs/yella_idle.bmp Binary files differ. diff --git a/Release/imgs/yella_idle_begin.bmp b/Release/imgs/yella_idle_begin.bmp Binary files differ. diff --git a/Release/imgs/yella_run.bmp b/Release/imgs/yella_run.bmp Binary files differ. diff --git a/Release/json/GameData.json b/Release/json/GameData.json @@ -1,100 +0,0 @@ -{ - "loading": - { - "splash" : "Loading.bmp" - }, - - "level": - { - "world": - { - "world_h": 250, - "world_w": 1000, - "terrain" : "scenecolmap.bmp", - "backgrounds" : - [ - {"back" : "desert_hills_expand.bmp", "parallax_factor" : 2, "alpha" : 0} - ], - "foregrounds" : - [ - {"fore" : "scene_fore.bmp", "alpha" : 0} - ], - "overlays" : - [ - {"over" : "scene_waterOverlay.bmp", "parallax_factor" : 1, "alpha" : 175} - ] - }, - - "camera": - { - "h": 225, - "w": 450, - "x": 0, - "y": 0 - }, - - "sounds": - [ - {"filename" : "Dhaka.mp3" , "name" : "dhaka" }, - {"filename" : "splash_sound.wav", "name" : "splash_sound"}, - {"filename" : "footstep.wav" , "name" : "footstep" } - ], - - "animations" : - [ - { - "pack_name" : "splash", - "anim_set": - [ - {"filename" : "splash.bmp", "frame_count" : 5 , "frame_rate" : 25 , "h" : 26, "w" : 72, "id" : "SPLASH" } - ] - }, - { - "pack_name" : "player_pack", - "anim_set": - [ - {"filename" : "player_idle_begin.bmp", "frame_count" : 4 , "frame_rate" : 75 , "h" : 23, "w" : 14, "id" : "IDLE_BEGIN", "transition" : 1 }, - {"filename" : "player_idle.bmp" , "frame_count" : 3 , "frame_rate" : 100, "h" : 23, "w" : 14, "id" : "IDLE" , "transition" : 0 }, - {"filename" : "player_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "h" : 23, "w" : 14, "id" : "RUN" , "transition" : 0 } - ] - }, - { - "pack_name" : "red_pack", - "anim_set": - [ - {"filename" : "red_idle_begin.bmp", "frame_count" : 4 , "frame_rate" : 75 , "h" : 23, "w" : 14, "id" : "IDLE_BEGIN", "transition" : 1 }, - {"filename" : "red_idle.bmp" , "frame_count" : 3 , "frame_rate" : 100, "h" : 23, "w" : 14, "id" : "IDLE" , "transition" : 0 }, - {"filename" : "red_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "h" : 23, "w" : 14, "id" : "RUN" , "transition" : 0 } - ] - }, - { - "pack_name" : "yella_pack", - "anim_set": - [ - {"filename" : "yella_idle_begin.bmp", "frame_count" : 4 , "frame_rate" : 75 , "h" : 23, "w" : 14, "id" : "IDLE_BEGIN", "transition" : 1 }, - {"filename" : "yella_idle.bmp" , "frame_count" : 3 , "frame_rate" : 100, "h" : 23, "w" : 14, "id" : "IDLE" , "transition" : 0 }, - {"filename" : "yella_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "h" : 23, "w" : 14, "id" : "RUN" , "transition" : 0 } - ] - } - ], - - "actors" : - [ - {"type" : "pursuer" , "anim_pack" : "red_pack" , "x" : 180, "y" : 140, "h":23, "w":14}, - {"type" : "wanderer", "anim_pack" : "yella_pack" , "x" : 300, "y" : 140, "h":23, "w":14}, - {"type" : "player" , "anim_pack" : "player_pack", "x" : 0, "y" : 0, "h":23, "w":14} - ], - - "hud_textures" : - { - "life_base" : "life_base.bmp", - "life_bar" : "life_bar.bmp" - }, - - "Particles" : - [ - {"anim_pack" : "splash", "h":3, "w":9} - ] - - } -} diff --git a/Release/json/example.json b/Release/json/example.json @@ -1,5 +0,0 @@ -{"employees":[ - {"firstName":"John", "lastName":"Doe"}, - {"firstName":"Anna", "lastName":"Smith"}, - {"firstName":"Peter", "lastName":"Jones"} -]} diff --git a/Release/json/level.json b/Release/json/level.json @@ -1,660 +0,0 @@ -{ - "loading": - { - "splash" : "Loading.bmp" - }, - - "level": - { - "world": - { - "world_h": 500, - "world_w": 1800, - "terrain" : "scene_2\\scene_2_colmap.bmp", - "backgrounds" : - [ - {"back" : "scene_2\\scene_2_back_0.bmp" , "parallax_factor" : 1, "alpha" : 0 }, - {"back" : "scene_2\\scene_2_back_1.bmp" , "parallax_factor" : 1, "alpha" : 0 }, - {"back" : "scene_2\\scene_2_back_transp_2.bmp", "parallax_factor" : 1, "alpha" : 75}, - {"back" : "scene_2\\scene_2_back_transp_3.bmp" , "parallax_factor" : 1, "alpha" : 75 }, - {"back" : "scene_2\\scene_2_back_4.bmp" , "parallax_factor" : 1, "alpha" : 0 } - ], - "foregrounds" : - [ - {"fore" : "scene_2\\scene_2_fore_0.bmp", "alpha" : 0} - ], - "overlays" : - [ - ] - }, - - "camera": - { - "h": 252, - "w": 448, - "x": 0, - "y": 0, - "blockers" : - [ - ] - }, - - "sounds": - [ - {"filename" : "Dhaka.mp3" , "name" : "dhaka" , "vol" : 12 }, - {"filename" : "splash_sound.wav", "name" : "splash_sound", "vol" : 64}, - {"filename" : "footstep.wav" , "name" : "footstep" , "vol" : 128}, - {"filename" : "door.wav" , "name" : "door_open" , "vol" : 128}, - {"filename" : "draw.wav" , "name" : "draw_sword" , "vol" : 128} - ], - - "sound_regions": - [ - { - "x" : 0, "y" : 0, "h" : 500, "w" : 1800, - "tracks" : - [ - "dhaka" - ] - } - ], - - "animations" : - [ - { - "pack_name" : "splash", - "frame_size" : {"h" : 4, "w" : 20}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 4, "col_w" : 20}, - "anim_set": - [ - {"filename" : "water_ripple.bmp", "frame_count" : 6 , "frame_rate" : 25, "id" : "PARTICLE" } - ], - "loop_ids" : - [ - "PARTICLE" - ], - "transition_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "PARTICLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "haze", - "frame_size" : {"h" : 284, "w" : 4095}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 284, "col_w" : 4095}, - "anim_set": - [ - {"filename" : "haze.bmp", "frame_count" : 1 , "frame_rate" : 250, "id" : "PARTICLE" } - ], - "loop_ids" : - [ - "PARTICLE" - ], - "transition_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "PARTICLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "player_pack", - "frame_size" : {"h" : 23, "w" : 14}, - "col_data" : {"off_x" : -5, "off_y" : 0, "col_h" : 23, "col_w" : 6}, - "anim_set": - [ - {"filename" : "player\\player_idle_begin.bmp" , "frame_count" : 2 , "frame_rate" : 250, "id" : "IDLE_BEGIN" }, - {"filename" : "player\\player_idle.bmp" , "frame_count" : 6 , "frame_rate" : 275, "id" : "IDLE" }, - {"filename" : "player\\player_jump.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP" }, - {"filename" : "player\\player_jump_to_fall.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_TO_FALL"}, - {"filename" : "player\\player_fall.bmp" , "frame_count" : 5 , "frame_rate" : 75, "id" : "FALL" }, - {"filename" : "player\\player_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN" }, - {"filename" : "player\\player_run_drawn.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN_DRAWN" }, - {"filename" : "player\\player_swim.bmp" , "frame_count" : 6, "frame_rate" : 50 , "id" : "SWIM" }, - {"filename" : "player\\player_swim_tread.bmp" , "frame_count" : 6, "frame_rate" : 80 , "id" : "TREAD" } - ], - "loop_ids" : - [ - "IDLE", - "JUMP", - "FALL", - "RUN", - "RUN_DRAWN", - "SWIM", - "TREAD" - ], - "transition_ids" : - [ - "IDLE_BEGIN", - "JUMP_TO_FALL" - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE" , "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "JUMP", - "transitions": ["NONE" , "NONE", "JUMP_TO_FALL", "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "FALL", - "transitions": ["NONE" , "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "RUN", - "transitions": ["IDLE_BEGIN", "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "RUN_DRAWN", - "transitions": ["IDLE_BEGIN", "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "SWIM", - "transitions": ["NONE" , "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "TREAD", - "transitions": ["NONE" , "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - } - ] - }, - { - "pack_name" : "sword", - "frame_size" : {"h" : 23, "w" : 14}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 23, "col_w" : 14}, - "anim_set": - [ - {"filename" : "player\\sword\\sword_idle_begin.bmp" , "frame_count" : 2 , "frame_rate" : 250 , "id" : "IDLE_BEGIN" }, - {"filename" : "player\\sword\\sword_idle.bmp" , "frame_count" : 6 , "frame_rate" : 275, "id" : "IDLE" }, - {"filename" : "player\\sword\\sword_jump.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP" }, - {"filename" : "player\\sword\\sword_jump_to_fall.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_TO_FALL"}, - {"filename" : "player\\sword\\sword_fall.bmp" , "frame_count" : 5 , "frame_rate" : 75, "id" : "FALL" }, - {"filename" : "player\\sword\\sword_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN" }, - {"filename" : "player\\sword\\sword_run_drawn.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN_DRAWN" }, - {"filename" : "player\\sword\\sword_swim.bmp" , "frame_count" : 6, "frame_rate" : 50 , "id" : "SWIM" }, - {"filename" : "player\\sword\\sword_swim_tread.bmp" , "frame_count" : 6, "frame_rate" : 80 , "id" : "TREAD" } - ], - "loop_ids" : - [ - "IDLE", - "JUMP", - "FALL", - "RUN", - "RUN_DRAWN", - "SWIM", - "TREAD" - ], - "transition_ids" : - [ - "IDLE_BEGIN", - "JUMP_TO_FALL" - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE" , "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "JUMP", - "transitions": ["NONE" , "NONE", "JUMP_TO_FALL", "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "FALL", - "transitions": ["NONE" , "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "RUN", - "transitions": ["IDLE_BEGIN", "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "RUN_DRAWN", - "transitions": ["IDLE_BEGIN", "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "SWIM", - "transitions": ["NONE" , "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "TREAD", - "transitions": ["NONE" , "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - } - ] - }, - { - "pack_name" : "gate", - "frame_size" : {"h" : 66, "w" : 8}, - "col_data" : {"off_x" : 0, "off_y" : -29, "col_h" : 37, "col_w" : 8}, - "anim_set": - [ - {"filename" : "gate\\gate_down.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_DOWN" }, - {"filename" : "gate\\gate_up.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_UP" }, - {"filename" : "gate\\gate_lower.bmp" , "frame_count" : 6 , "frame_rate" : 40 , "id" : "GATE_LOWER" }, - {"filename" : "gate\\gate_lower_begin.bmp" , "frame_count" : 3 , "frame_rate" : 40 , "id" : "GATE_LOWER_BEGIN" }, - {"filename" : "gate\\gate_raise.bmp" , "frame_count" : 38, "frame_rate" : 120 , "id" : "GATE_RAISE" } - ], - "loop_ids" : - [ - "GATE_DOWN", - "GATE_UP" - ], - "transition_ids" : - [ - "GATE_LOWER", - "GATE_LOWER_BEGIN", - "GATE_RAISE" - ], - "anim_graph": - [ - { - "loop_name": "GATE_DOWN", - "transitions": ["NONE", "GATE_RAISE"] - }, - { - "loop_name": "GATE_UP", - "transitions": ["GATE_LOWER", "NONE"] - } - ] - }, - { - "pack_name" : "winch", - "frame_size" : {"h" : 31, "w" : 22}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 17, "col_w" : 22}, - "anim_set": - [ - {"filename" : "winch\\winch_down.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_DOWN" }, - {"filename" : "winch\\winch_up.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_UP" }, - {"filename" : "winch\\winch_lower.bmp" , "frame_count" : 6 , "frame_rate" : 40 , "id" : "GATE_LOWER" }, - {"filename" : "winch\\winch_lower_begin.bmp" , "frame_count" : 4 , "frame_rate" : 120 , "id" : "GATE_LOWER_BEGIN" }, - {"filename" : "winch\\winch_raise.bmp" , "frame_count" : 40, "frame_rate" : 120 , "id" : "GATE_RAISE" } - ], - "loop_ids" : - [ - "GATE_DOWN", - "GATE_UP" - ], - "transition_ids" : - [ - "GATE_LOWER", - "GATE_LOWER_BEGIN", - "GATE_RAISE" - ], - "anim_graph": - [ - { - "loop_name": "GATE_DOWN", - "transitions": ["NONE", "GATE_RAISE"] - }, - { - "loop_name": "GATE_UP", - "transitions": ["GATE_LOWER", "NONE"] - } - ] - }, - { - "pack_name" : "gateman_npc", - "frame_size" : {"h" : 26, "w" : 14}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 26, "col_w" : 14}, - "anim_set": - [ - {"filename" : "NPCs\\gateman\\gateoperator_idle.bmp" , "frame_count" : 6 , "frame_rate" : 250 , "id" : "GATE_DOWN" }, - {"filename" : "NPCs\\gateman\\gateoperator_idle.bmp" , "frame_count" : 6 , "frame_rate" : 250 , "id" : "GATE_UP" }, - {"filename" : "NPCs\\gateman\\gateoperator_lower.bmp" , "frame_count" : 7 , "frame_rate" : 120 , "id" : "GATE_LOWER" }, - {"filename" : "NPCs\\gateman\\gateoperator_raise.bmp" , "frame_count" : 43, "frame_rate" : 120 , "id" : "GATE_RAISE" } - ], - "loop_ids" : - [ - "GATE_DOWN", - "GATE_UP" - ], - "transition_ids" : - [ - "GATE_LOWER", - "GATE_RAISE" - ], - "anim_graph": - [ - { - "loop_name": "GATE_DOWN", - "transitions": ["NONE", "GATE_RAISE"] - }, - { - "loop_name": "GATE_UP", - "transitions": ["GATE_LOWER", "NONE"] - } - ] - }, - { - "pack_name" : "red_pack", - "frame_size" : {"h" : 23, "w" : 14}, - "col_data" : {"off_x" : -5, "off_y" : 0, "col_h" : 23, "col_w" : 6}, - "anim_set": - [ - {"filename" : "red_idle_begin.bmp", "frame_count" : 4 , "frame_rate" : 75 , "off_x" : 0, "off_y" : 0, "col_h" : 0, "col_w" : 0, "id" : "IDLE_BEGIN"}, - {"filename" : "red_idle.bmp" , "frame_count" : 3 , "frame_rate" : 100, "off_x" : 0, "off_y" : 0, "col_h" : 0, "col_w" : 0, "id" : "IDLE" }, - {"filename" : "red_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "off_x" : 0, "off_y" : 0, "col_h" : 0, "col_w" : 0, "id" : "RUN" } - ], - "loop_ids" : - [ - "IDLE", - "RUN" - ], - "transition_ids" : - [ - "IDLE_BEGIN" - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE", "NONE"] - }, - { - "loop_name": "RUN", - "transitions": ["IDLE_BEGIN", "NONE"] - } - ] - }, - { - "pack_name" : "yella_pack", - "frame_size" : {"h" : 23, "w" : 14}, - "col_data" : {"off_x" : -5, "off_y" : 0, "col_h" : 23, "col_w" : 6}, - "anim_set": - [ - {"filename" : "yella_idle_begin.bmp", "frame_count" : 4 , "frame_rate" : 75 , "id" : "IDLE_BEGIN"}, - {"filename" : "yella_idle.bmp" , "frame_count" : 3 , "frame_rate" : 100, "id" : "IDLE" }, - {"filename" : "yella_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN" } - ], - "loop_ids" : - [ - "IDLE", - "RUN" - ], - "transition_ids" : - [ - "IDLE_BEGIN" - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE", "NONE"] - }, - { - "loop_name": "RUN", - "transitions": ["IDLE_BEGIN", "NONE"] - } - ] - }, - { - "pack_name" : "b_rabbit_pack", - "frame_size" : {"h" : 5, "w" : 6}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 5, "col_w" : 6}, - "anim_set": - [ - {"filename" : "rabbits\\brabbit_hop.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "RUN" }, - {"filename" : "rabbits\\brabbit_idle_eat.bmp" , "frame_count" : 13, "frame_rate" : 100, "id" : "EAT" }, - {"filename" : "rabbits\\brabbit_idle_look.bmp" , "frame_count" : 8 , "frame_rate" : 100, "id" : "LOOK" }, - {"filename" : "rabbits\\brabbit_sleep.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "SLEEP" } - ], - "loop_ids" : - [ - "RUN", - "EAT", - "LOOK", - "SLEEP" - ], - "transition_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "RUN", - "transitions": ["NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "EAT", - "transitions": ["NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "LOOK", - "transitions": ["NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "SLEEP", - "transitions": ["NONE", "NONE", "NONE", "NONE"] - } - ] - }, - { - "pack_name" : "loyal_bug_pack", - "frame_size" : {"h" : 26, "w" : 64}, - "col_data" : {"off_x" : -32, "off_y" : 0, "col_h" : 26, "col_w" : 32}, - "anim_set": - [ - {"filename" : "loyal_bug\\loyalbug_idle_begin.bmp" , "frame_count" : 5 , "frame_rate" : 75 , "id" : "IDLE_BEGIN"}, - {"filename" : "loyal_bug\\loyalbug_idle.bmp" , "frame_count" : 11 , "frame_rate" : 120, "id" : "IDLE" }, - {"filename" : "loyal_bug\\loyalbug_walk.bmp" , "frame_count" : 23, "frame_rate" : 20 , "id" : "RUN" } - ], - "loop_ids" : - [ - "IDLE", - "RUN" - ], - "transition_ids" : - [ - "IDLE_BEGIN" - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE", "NONE"] - }, - { - "loop_name": "RUN", - "transitions": ["IDLE_BEGIN", "NONE"] - } - ] - }, - { - "pack_name" : "hostile_bug", - "frame_size" : {"h" : 7, "w" : 13}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 7, "col_w" : 13}, - "anim_set": - [ - {"filename" : "hostile\\bug_walk.bmp" , "frame_count" : 8 , "frame_rate" : 75 , "id" : "RUN"} - ], - "loop_ids" : - [ - "RUN" - ], - "transition_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "RUN", - "transitions": [] - } - ] - }, - { - "pack_name" : "door", - "frame_size" : {"h" : 22, "w" : 15}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 22, "col_w" : 15}, - "anim_set": - [ - {"filename" : "door.bmp" , "frame_count" : 1, "frame_rate" : 100 , "id" : "IDLE"} - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "garden_npc", - "frame_size" : {"h" : 22, "w" : 11}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 22, "col_w" : 11}, - "anim_set": - [ - {"filename" : "NPCs\\gardenwoman_idle.bmp" , "frame_count" : 5, "frame_rate" : 300 , "id" : "IDLE"} - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "smoke_npc", - "frame_size" : {"h" : 22, "w" : 13}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 22, "col_w" : 13}, - "anim_set": - [ - {"filename" : "NPCs\\smokingman_idle.bmp" , "frame_count" : 21, "frame_rate" : 260 , "id" : "IDLE"} - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "sit_man_npc", - "frame_size" : {"h" : 22, "w" : 8}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 22, "col_w" : 8}, - "anim_set": - [ - {"filename" : "NPCs\\sitting_man_idle.bmp" , "frame_count" : 11, "frame_rate" : 260 , "id" : "IDLE"} - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "storeowner_npc", - "frame_size" : {"h" : 25, "w" : 8}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 25, "col_w" : 8}, - "anim_set": - [ - {"filename" : "NPCs\\storeowner_idle.bmp" , "frame_count" : 8, "frame_rate" : 415 , "id" : "IDLE"} - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "bad_hat", - "frame_size" : {"h" : 23, "w" : 14}, - "col_data" : {"off_x" : -5, "off_y" : 0, "col_h" : 23, "col_w" : 6}, - "anim_set": - [ - {"filename" : "player\\myhatisat.bmp" , "frame_count" : 1, "frame_rate" : 100 , "id" : "IDLE"} - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - } - ], - - "actors" : - [ - {"name":"storeowner0", "type" : "talker" , "anim_pack" : "storeowner_npc" , "x" : 1339 , "y" : 411, "lines" : "I gotta say something."}, - {"name":"garden0", "type" : "talker" , "anim_pack" : "garden_npc" , "x" : 297 , "y" : 387, "lines" : "Heres the garden woman, this is the stuff she will say. To demonstrate scrolling heres some more text."}, - {"name":"sit0", "type" : "talker" , "anim_pack" : "sit_man_npc" , "x" : 1637 , "y" : 351, "lines" : "Nice try bro"}, - {"name":"smoke0", "type" : "talker" , "anim_pack" : "smoke_npc" , "x" : 184 , "y" : 395, "lines" : "This is the smoking man, talkers can be spoken to from some distance away horizontally, but you need to be closer vertically. text"}, - {"name":"bug0", "type" : "talker" , "anim_pack" : "loyal_bug_pack" , "x" : 1500 , "y" : 410, "lines" : "This is the smoking man, talkers can be spoken to from some distance away horizontally, but you need to be closer vertically. text"}, - {"name":"player0", "type" : "player" , "anim_pack" : "player_pack" , "x" : 1500, "y" : 50} - ], - - "hud_textures" : - { - "life_base" : "life_base.bmp", - "life_bar" : "life_bar.bmp", - "text_box" : "dialogue_box.bmp", - "fader" : "fader.bmp" - }, - - "Particles" : - [ - {"anim_pack" : "splash"} - ] - - } -} diff --git a/Release/json/level_arid_land.json b/Release/json/level_arid_land.json @@ -1,934 +0,0 @@ -{ - "loading": - { - "splash" : "Loading.bmp" - }, - "GameOver": - { - "splash" : "gameover.bmp" - }, - "level": - { - "world": - { - "world_h": 900, - "world_w": 4095, - "terrain" : "arid_land\\arid land_colmap.bmp", - "backgrounds" : - [ - {"back" : "arid_land\\arid land_back_0.bmp" , "parallax_factor" : 5, "alpha" : 0 }, - {"back" : "arid_land\\arid land_back_1.bmp" , "parallax_factor" : 4, "alpha" : 0 }, - {"back" : "arid_land\\arid land_back_2.bmp" , "parallax_factor" : 3, "alpha" : 0 }, - {"back" : "arid_land\\arid land_back_transp_3.bmp", "parallax_factor" : 2, "alpha" : 75}, - {"back" : "arid_land\\arid land_back_4.bmp" , "parallax_factor" : 2, "alpha" : 0 } - ], - "foregrounds" : - [ - {"fore" : "arid_land\\arid land_fore_0.bmp", "alpha" : 0}, - {"fore" : "arid_land\\arid land_fore_1.bmp", "alpha" : 0}, - {"fore" : "arid_land\\arid land_fore_2.bmp", "alpha" : 0}, - {"fore" : "arid_land\\arid land_fore_3.bmp", "alpha" : 0}, - {"fore" : "arid_land\\text.bmp", "alpha" : 0} - ], - "overlays" : - [ - {"over" : "arid_land\\arid land_over_transp_0.bmp", "parallax_factor" : 1, "alpha" : 125}, - {"over" : "arid_land\\arid land_over_transp_1.bmp", "parallax_factor" : 1, "alpha" : 10}, - {"over" : "arid_land\\arid land_over_transp_2.bmp", "parallax_factor" : 1, "alpha" : 245} - ] - }, - - "camera": - { - "h": 252, - "w": 448, - "x": 0, - "y": 0, - "blockers" : - [ - {"h" : 1, "w" : 4095, "x" : 0, "y" : 780} - ] - }, - - "sounds": - [ - {"filename" : "Dhaka.mp3" , "name" : "dhaka" , "vol" : 12 }, - {"filename" : "splash_sound.wav" , "name" : "splash_sound" , "vol" : 64 }, - {"filename" : "footstep.wav" , "name" : "footstep" , "vol" : 255}, - {"filename" : "door.wav" , "name" : "door_open" , "vol" : 128}, - {"filename" : "draw.wav" , "name" : "draw_sword" , "vol" : 128}, - {"filename" : "ouch.wav" , "name" : "ouch" , "vol" : 64}, - {"filename" : "swing.wav" , "name" : "player_attack", "vol" : 255}, - {"filename" : "sludge_hit.wav" , "name" : "sludge_hit" , "vol" : 64} - ], - - "sound_regions": - [ - { - "x" : 0, "y" : 0, "h" : 900, "w" : 2000, - "tracks" : - [ - "dhaka" - ] - } - ], - - "animations" : - [ - { - "pack_name" : "splash", - "frame_size" : {"h" : 4, "w" : 20}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 4, "col_w" : 20}, - "anim_set": - [ - {"filename" : "water_ripple.bmp", "frame_count" : 6 , "frame_rate" : 25, "id" : "PARTICLE" } - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "PARTICLE" - ], - "transition_ids" : - [ - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "PARTICLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "haze", - "frame_size" : {"h" : 284, "w" : 4095}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 284, "col_w" : 4095}, - "anim_set": - [ - {"filename" : "haze.bmp", "frame_count" : 1 , "frame_rate" : 250, "id" : "PARTICLE" } - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "PARTICLE" - ], - "transition_ids" : - [ - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "PARTICLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "player_pack", - "frame_size" : {"h" : 23, "w" : 14}, - "col_data" : {"off_x" : -5, "off_y" : 0, "col_h" : 23, "col_w" : 6}, - "anim_set": - [ - {"filename" : "player\\player_idle_begin.bmp" , "frame_count" : 2 , "frame_rate" : 250, "id" : "IDLE_BEGIN" }, - {"filename" : "player\\player_idle_begin_drawn.bmp" , "frame_count" : 2 , "frame_rate" : 250, "id" : "IDLE_BEGIN_DRAWN" }, - {"filename" : "player\\player_idle.bmp" , "frame_count" : 6 , "frame_rate" : 275, "id" : "IDLE" }, - {"filename" : "player\\player_idle_drawn.bmp" , "frame_count" : 6 , "frame_rate" : 275, "id" : "IDLE_DRAWN" }, - {"filename" : "player\\player_jump.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP" }, - {"filename" : "player\\player_jump_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_DRAWN" }, - {"filename" : "player\\player_jump_to_fall.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_TO_FALL" }, - {"filename" : "player\\player_jump_to_fall_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_TO_FALL_DRAWN"}, - {"filename" : "player\\player_fall.bmp" , "frame_count" : 5 , "frame_rate" : 75, "id" : "FALL" }, - {"filename" : "player\\player_fall_drawn.bmp" , "frame_count" : 5 , "frame_rate" : 75, "id" : "FALL_DRAWN" }, - {"filename" : "player\\player_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN" }, - {"filename" : "player\\player_run_drawn.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN_DRAWN" }, - {"filename" : "player\\player_swim.bmp" , "frame_count" : 6, "frame_rate" : 50 , "id" : "SWIM" }, - {"filename" : "player\\player_swim_tread.bmp" , "frame_count" : 6, "frame_rate" : 80 , "id" : "TREAD" } - ], - "special_anims" : - [ - {"filename" : "player\\player_attack.bmp" , "frame_count" : 12, "frame_rate" : 40 , "id" : "ATTACK" , "custom_h": 23, "custom_w": 28} - ], - "loop_ids" : - [ - "IDLE", - "IDLE_DRAWN", - "JUMP", - "JUMP_DRAWN", - "FALL", - "FALL_DRAWN", - "RUN", - "RUN_DRAWN", - "SWIM", - "TREAD", - "ATTACK" - ], - "transition_ids" : - [ - "IDLE_BEGIN", - "IDLE_BEGIN_DRAWN", - "JUMP_TO_FALL", - "JUMP_TO_FALL_DRAWN" - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": [ "NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "IDLE_DRAWN", - "transitions": [ "NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "JUMP", - "transitions": ["NONE" , "NONE" , "NONE", "NONE", "JUMP_TO_FALL", "JUMP_TO_FALL_DRAWN", "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "JUMP_DRAWN", - "transitions": [ "NONE" , "NONE" , "NONE", "NONE", "JUMP_TO_FALL", "JUMP_TO_FALL_DRAWN", "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "FALL", - "transitions": [ "NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "FALL_DRAWN", - "transitions": ["NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "RUN", - "transitions": ["IDLE_BEGIN" , "IDLE_BEGIN_DRAWN", "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "RUN_DRAWN", - "transitions": ["IDLE_BEGIN" , "IDLE_BEGIN_DRAWN", "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "SWIM", - "transitions": ["NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "TREAD", - "transitions": ["NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "ATTACK", - "transitions": ["NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - } - ] - }, - { - "pack_name" : "sword", - "frame_size" : {"h" : 23, "w" : 14}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 23, "col_w" : 14}, - "anim_set": - [ - {"filename" : "player\\sword\\sword_idle_begin.bmp" , "frame_count" : 2 , "frame_rate" : 250 ,"id" : "IDLE_BEGIN" }, - {"filename" : "player\\sword\\sword_idle_begin_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 250 ,"id" : "IDLE_BEGIN_DRAWN" }, - {"filename" : "player\\sword\\sword_idle.bmp" , "frame_count" : 6 , "frame_rate" : 275, "id" : "IDLE" }, - {"filename" : "player\\sword\\sword_idle_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 275, "id" : "IDLE_DRAWN" }, - {"filename" : "player\\sword\\sword_jump.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP" }, - {"filename" : "player\\sword\\sword_jump_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_DRAWN" }, - {"filename" : "player\\sword\\sword_jump_to_fall.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_TO_FALL" }, - {"filename" : "player\\sword\\sword_jump_to_fall_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_TO_FALL_DRAWN" }, - {"filename" : "player\\sword\\sword_fall.bmp" , "frame_count" : 5 , "frame_rate" : 75, "id" : "FALL" }, - {"filename" : "player\\sword\\sword_fall_drawn.bmp" , "frame_count" : 5 , "frame_rate" : 75, "id" : "FALL_DRAWN" }, - {"filename" : "player\\sword\\sword_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN" }, - {"filename" : "player\\sword\\sword_run_drawn.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN_DRAWN" }, - {"filename" : "player\\sword\\sword_swim.bmp" , "frame_count" : 6, "frame_rate" : 50 , "id" : "SWIM" }, - {"filename" : "player\\sword\\sword_swim_tread.bmp" , "frame_count" : 6, "frame_rate" : 80 , "id" : "TREAD" } - ], - "special_anims" : - [ - {"filename" : "player\\sword\\sword_attack.bmp" , "frame_count" : 12, "frame_rate" : 40 , "id" : "ATTACK" , "custom_h": 23, "custom_w": 28} - ], - "loop_ids" : - [ - "IDLE", - "IDLE_DRAWN", - "JUMP", - "JUMP_DRAWN", - "FALL", - "FALL_DRAWN", - "RUN", - "RUN_DRAWN", - "SWIM", - "TREAD", - "ATTACK" - ], - "transition_ids" : - [ - "IDLE_BEGIN", - "IDLE_BEGIN_DRAWN", - "JUMP_TO_FALL", - "JUMP_TO_FALL_DRAWN" - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": [ "NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "IDLE_DRAWN", - "transitions": [ "NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "JUMP", - "transitions": ["NONE" , "NONE" , "NONE", "NONE", "JUMP_TO_FALL", "JUMP_TO_FALL_DRAWN", "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "JUMP_DRAWN", - "transitions": [ "NONE" , "NONE" , "NONE", "NONE", "JUMP_TO_FALL", "JUMP_TO_FALL_DRAWN", "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "FALL", - "transitions": [ "NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "FALL_DRAWN", - "transitions": ["NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "RUN", - "transitions": ["IDLE_BEGIN" , "IDLE_BEGIN_DRAWN", "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "RUN_DRAWN", - "transitions": ["IDLE_BEGIN" , "IDLE_BEGIN_DRAWN", "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "SWIM", - "transitions": ["NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "TREAD", - "transitions": ["NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "ATTACK", - "transitions": ["NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - } - ] - }, - { - "pack_name" : "gate", - "frame_size" : {"h" : 66, "w" : 8}, - "col_data" : {"off_x" : 0, "off_y" : -29, "col_h" : 37, "col_w" : 8}, - "anim_set": - [ - {"filename" : "gate\\gate_down.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_DOWN" }, - {"filename" : "gate\\gate_up.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_UP" }, - {"filename" : "gate\\gate_lower.bmp" , "frame_count" : 6 , "frame_rate" : 40 , "id" : "GATE_LOWER" }, - {"filename" : "gate\\gate_lower_begin.bmp" , "frame_count" : 3 , "frame_rate" : 40 , "id" : "GATE_LOWER_BEGIN" }, - {"filename" : "gate\\gate_raise.bmp" , "frame_count" : 38, "frame_rate" : 120 , "id" : "GATE_RAISE" } - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "GATE_DOWN", - "GATE_UP" - ], - "transition_ids": - [ - "GATE_LOWER", - "GATE_LOWER_BEGIN", - "GATE_RAISE" - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "GATE_DOWN", - "transitions": ["NONE", "GATE_RAISE"] - }, - { - "loop_name": "GATE_UP", - "transitions": ["GATE_LOWER", "NONE"] - } - ] - }, - { - "pack_name" : "winch", - "frame_size" : {"h" : 31, "w" : 22}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 17, "col_w" : 22}, - "anim_set": - [ - {"filename" : "winch\\winch_down.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_DOWN" }, - {"filename" : "winch\\winch_up.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_UP" }, - {"filename" : "winch\\winch_lower.bmp" , "frame_count" : 6 , "frame_rate" : 40 , "id" : "GATE_LOWER" }, - {"filename" : "winch\\winch_lower_begin.bmp" , "frame_count" : 4 , "frame_rate" : 120 , "id" : "GATE_LOWER_BEGIN" }, - {"filename" : "winch\\winch_raise.bmp" , "frame_count" : 40, "frame_rate" : 120 , "id" : "GATE_RAISE" } - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "GATE_DOWN", - "GATE_UP" - ], - "transition_ids" : - [ - "GATE_LOWER", - "GATE_LOWER_BEGIN", - "GATE_RAISE" - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "GATE_DOWN", - "transitions": ["NONE", "GATE_RAISE"] - }, - { - "loop_name": "GATE_UP", - "transitions": ["GATE_LOWER", "NONE"] - } - ] - }, - { - "pack_name" : "gateman_npc", - "frame_size" : {"h" : 26, "w" : 14}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 26, "col_w" : 14}, - "anim_set": - [ - {"filename" : "NPCs\\gateman\\gateoperator_idle.bmp" , "frame_count" : 6 , "frame_rate" : 250 , "id" : "GATE_DOWN" }, - {"filename" : "NPCs\\gateman\\gateoperator_idle.bmp" , "frame_count" : 6 , "frame_rate" : 250 , "id" : "GATE_UP" }, - {"filename" : "NPCs\\gateman\\gateoperator_lower.bmp" , "frame_count" : 7 , "frame_rate" : 120 , "id" : "GATE_LOWER" }, - {"filename" : "NPCs\\gateman\\gateoperator_raise.bmp" , "frame_count" : 43, "frame_rate" : 120 , "id" : "GATE_RAISE" } - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "GATE_DOWN", - "GATE_UP" - ], - "transition_ids" : - [ - "GATE_LOWER", - "GATE_RAISE" - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "GATE_DOWN", - "transitions": ["NONE", "GATE_RAISE"] - }, - { - "loop_name": "GATE_UP", - "transitions": ["GATE_LOWER", "NONE"] - } - ] - }, - { - "pack_name" : "red_pack", - "frame_size" : {"h" : 23, "w" : 14}, - "col_data" : {"off_x" : -5, "off_y" : 0, "col_h" : 23, "col_w" : 6}, - "anim_set": - [ - {"filename" : "red_idle_begin.bmp", "frame_count" : 4 , "frame_rate" : 75 , "off_x" : 0, "off_y" : 0, "col_h" : 0, "col_w" : 0, "id" : "IDLE_BEGIN"}, - {"filename" : "red_idle.bmp" , "frame_count" : 3 , "frame_rate" : 100, "off_x" : 0, "off_y" : 0, "col_h" : 0, "col_w" : 0, "id" : "IDLE" }, - {"filename" : "red_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "off_x" : 0, "off_y" : 0, "col_h" : 0, "col_w" : 0, "id" : "RUN" } - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "IDLE", - "RUN" - ], - "transition_ids" : - [ - "IDLE_BEGIN" - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE", "NONE"] - }, - { - "loop_name": "RUN", - "transitions": ["IDLE_BEGIN", "NONE"] - } - ] - }, - { - "pack_name" : "yella_pack", - "frame_size" : {"h" : 23, "w" : 14}, - "col_data" : {"off_x" : -5, "off_y" : 0, "col_h" : 23, "col_w" : 6}, - "anim_set": - [ - {"filename" : "yella_idle_begin.bmp", "frame_count" : 4 , "frame_rate" : 75 , "id" : "IDLE_BEGIN"}, - {"filename" : "yella_idle.bmp" , "frame_count" : 3 , "frame_rate" : 100, "id" : "IDLE" }, - {"filename" : "yella_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN" } - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "IDLE", - "RUN" - ], - "transition_ids" : - [ - "IDLE_BEGIN" - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE", "NONE"] - }, - { - "loop_name": "RUN", - "transitions": ["IDLE_BEGIN", "NONE"] - } - ] - }, - { - "pack_name": "b_rabbit_pack", - "frame_size": { - "h": 5, - "w": 6 - }, - "col_data": { - "off_x": 0, - "off_y": 0, - "col_h": 5, - "col_w": 6 - }, - "anim_set": [ - { - "filename": "rabbits\\brabbit_hop.bmp", - "frame_count": 1, - "frame_rate": 100, - "id": "RUN" - }, - { - "filename": "rabbits\\brabbit_idle_eat.bmp", - "frame_count": 13, - "frame_rate": 100, - "id": "EAT" - }, - { - "filename": "rabbits\\brabbit_idle_look.bmp", - "frame_count": 8, - "frame_rate": 100, - "id": "LOOK" - }, - { - "filename": "rabbits\\brabbit_sleep.bmp", - "frame_count": 1, - "frame_rate": 100, - "id": "SLEEP" - } - ], - "special_anims" : - [ - ], - "loop_ids": - [ - "RUN", - "EAT", - "LOOK", - "SLEEP" - ], - "transition_ids": - [ - ], - "fireables_ids" : - [ - ], - "anim_graph": [ - { - "loop_name": "RUN", - "transitions": [ "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "EAT", - "transitions": [ "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "LOOK", - "transitions": [ "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "SLEEP", - "transitions": [ "NONE", "NONE", "NONE", "NONE" ] - } - ] - }, - { - "pack_name" : "sludge_seal_pack", - "frame_size" : {"h" : 16, "w" : 23}, - "col_data" : {"off_x" : -4, "off_y" : 0, "col_h" : 16, "col_w" : 15}, - "anim_set": - [ - {"filename" : "sludge_seal\\sludgeseal_land_idle.bmp" , "frame_count" : 6 , "frame_rate" : 250 , "id" : "IDLE" }, - {"filename" : "sludge_seal\\sludgeseal_crawl.bmp" , "frame_count" : 8 , "frame_rate" : 30 , "id" : "RUN" }, - {"filename" : "sludge_seal\\sludgeseal_swim.bmp" , "frame_count" : 8 , "frame_rate" : 125 , "id" : "SWIM" }, - {"filename" : "sludge_seal\\sludgeseal_swim_begin.bmp" , "frame_count" : 7 , "frame_rate" : 10 , "id" : "SWIM_BEGIN" }, - {"filename" : "sludge_seal\\sludgeseal_water_idle.bmp" , "frame_count" : 16 , "frame_rate" : 350 , "id" : "TREAD" }, - {"filename" : "sludge_seal\\sludgeseal_die.bmp" , "frame_count" : 6 , "frame_rate" : 350 , "id" : "DIE" }, - {"filename" : "sludge_seal\\sludgeseal_dead.bmp" , "frame_count" : 1 , "frame_rate" : 10 , "id" : "DEAD" } - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "IDLE", - "RUN", - "SWIM", - "TREAD", - "DEAD" - ], - "transition_ids" : - [ - "SWIM_BEGIN", - "DIE" - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE", "NONE", "NONE" , "NONE", "DIE"] - }, - { - "loop_name": "RUN", - "transitions": ["NONE", "NONE", "NONE" , "NONE", "DIE"] - }, - { - "loop_name": "SWIM", - "transitions": [ "NONE", "NONE", "NONE" , "NONE" , "DIE"] - }, - { - "loop_name": "TREAD", - "transitions": [ "NONE", "NONE", "SWIM_BEGIN", "NONE", "DIE"] - }, - { - "loop_name": "DEAD", - "transitions": ["NONE", "NONE", "NONE" , "NONE", "NONE"] - } - ] - }, - { - "pack_name" : "loyal_bug_pack", - "frame_size" : {"h" : 26, "w" : 64}, - "col_data" : {"off_x" : -32, "off_y" : 0, "col_h" : 26, "col_w" : 32}, - "anim_set": - [ - {"filename" : "loyal_bug\\loyalbug_idle_begin.bmp" , "frame_count" : 5 , "frame_rate" : 75 , "id" : "IDLE_BEGIN"}, - {"filename" : "loyal_bug\\loyalbug_idle.bmp" , "frame_count" : 11 , "frame_rate" : 120, "id" : "IDLE" }, - {"filename" : "loyal_bug\\loyalbug_walk.bmp" , "frame_count" : 23, "frame_rate" : 20 , "id" : "RUN" } - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "IDLE", - "RUN" - ], - "transition_ids" : - [ - "IDLE_BEGIN" - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE", "NONE"] - }, - { - "loop_name": "RUN", - "transitions": ["IDLE_BEGIN", "NONE"] - } - ] - }, - { - "pack_name" : "hostile_bug", - "frame_size" : {"h" : 7, "w" : 13}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 7, "col_w" : 13}, - "anim_set": - [ - {"filename" : "hostile\\bug_walk.bmp" , "frame_count" : 8 , "frame_rate" : 75 , "id" : "RUN"} - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "RUN" - ], - "transition_ids" : - [ - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "RUN", - "transitions": [] - } - ] - }, - { - "pack_name" : "door", - "frame_size" : {"h" : 22, "w" : 15}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 22, "col_w" : 15}, - "anim_set": - [ - {"filename" : "door.bmp" , "frame_count" : 1, "frame_rate" : 100 , "id" : "IDLE"} - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "garden_npc", - "frame_size" : {"h" : 22, "w" : 11}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 22, "col_w" : 11}, - "anim_set": - [ - {"filename" : "NPCs\\gardenwoman_idle.bmp" , "frame_count" : 5, "frame_rate" : 300 , "id" : "IDLE"} - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "smoke_npc", - "frame_size" : {"h" : 22, "w" : 13}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 22, "col_w" : 13}, - "anim_set": - [ - {"filename" : "NPCs\\smokingman_idle.bmp" , "frame_count" : 21, "frame_rate" : 260 , "id" : "IDLE"} - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "sit_man_npc", - "frame_size" : {"h" : 22, "w" : 8}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 22, "col_w" : 8}, - "anim_set": - [ - {"filename" : "NPCs\\sitting_man_idle.bmp" , "frame_count" : 11, "frame_rate" : 260 , "id" : "IDLE"} - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "storeowner_npc", - "frame_size" : {"h" : 25, "w" : 8}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 25, "col_w" : 8}, - "anim_set": - [ - {"filename" : "NPCs\\storeowner_idle.bmp" , "frame_count" : 8, "frame_rate" : 415 , "id" : "IDLE"} - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "bad_hat", - "frame_size" : {"h" : 23, "w" : 14}, - "col_data" : {"off_x" : -5, "off_y" : 0, "col_h" : 23, "col_w" : 6}, - "anim_set": - [ - {"filename" : "player\\myhatisat.bmp" , "frame_count" : 1, "frame_rate" : 100 , "id" : "IDLE"} - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - } - ], - - "actors" : - [ - {"name":"garden0", "type" : "talker" , "anim_pack" : "garden_npc" , "x" : 1500 , "y" : 714, "lines" : "These teleporting doors could be used to move to and from hidden interior areas in the future. There's some monsters to fight up ahead. Make sure to equip your weapon with Q, then you can attack with W." }, - {"name":"smoke0", "type" : "talker" , "anim_pack" : "smoke_npc" , "x" : 958 , "y" : 642, "lines" : "Tapestry engine terrain isn't tile based and you can move on inclines pixel for pixel. It also features simple water physics. Try jumping into the lake and wading in and out."}, - {"name":"sit0", "type" : "talker" , "anim_pack" : "sit_man_npc" , "x" : 905 , "y" : 695, "lines" : "Try jumping up on the roof. You can walk on it and drop down by pushing the down arrow key."}, - {"name":"storeowner0", "type" : "talker" , "anim_pack" : "storeowner_npc" , "x" : 1030 , "y" : 711, "lines" : "You can push E to interact with more than just people, try using the winch by the gate or the ugly teleporting doors across the lake."}, - {"name":"bug0", "type" : "talker" , "anim_pack" : "loyal_bug_pack" , "x" : 2490 , "y" : 711, "lines" : "I'm a bug"}, - {"name":"gate0", "type" : "gate" , "anim_pack" : "gate" , "x" : 700 , "y" : 700, "dir": "LEFT"}, - {"name":"gateman0", "type" : "gateman" , "anim_pack" : "gateman_npc" , "x" : 722 , "y" : 665, "lines" : "Hi! I'm the gate operator, push E to cycle through my dialogue. Try talking to the NPCs in town by pushing E next to them. Push E again to finish talking and I'll open the gate for you."}, - {"name":"door0", "type" : "door" , "anim_pack" : "door" , "x" : 1400 , "y" : 712, "x_off" : 0 , "y_off" : -3, "x2" : 1600 , "y2" : 712}, - {"name":"sludgeseal0", "type" : "sludge_seal" , "anim_pack" : "sludge_seal_pack" , "x" : 1850 , "y" : 710}, - {"name":"sludgeseal1", "type" : "sludge_seal" , "anim_pack" : "sludge_seal_pack" , "x" : 2000 , "y" : 713}, - {"name":"sludgeseal2", "type" : "sludge_seal" , "anim_pack" : "sludge_seal_pack" , "x" : 2010 , "y" : 712}, - {"name":"sludgeseal3", "type" : "sludge_seal" , "anim_pack" : "sludge_seal_pack" , "x" : 1995 , "y" : 716}, - {"name":"sludgeseal4", "type" : "sludge_seal" , "anim_pack" : "sludge_seal_pack" , "x" : 2017 , "y" : 710}, - {"name":"sludgeseal5", "type" : "sludge_seal" , "anim_pack" : "sludge_seal_pack" , "x" : 2300 , "y" : 710}, - {"name":"sludgeseal6", "type" : "sludge_seal" , "anim_pack" : "sludge_seal_pack" , "x" : 2350 , "y" : 710}, - {"name":"sludgeseal7", "type" : "sludge_seal" , "anim_pack" : "sludge_seal_pack" , "x" : 2325 , "y" : 710}, - {"name":"sludgeseal8", "type" : "sludge_seal" , "anim_pack" : "sludge_seal_pack" , "x" : 1700 , "y" : 710}, - {"name":"player0", "type" : "player" , "anim_pack" : "player_pack" , "x" : 50 , "y" : 710} - ], - - "hud_textures" : - { - "life_base" : "life_base.bmp", - "life_bar" : "life_bar.bmp", - "text_box" : "dialogue_box.bmp", - "fader_black" : "fader_black.bmp", - "fader_red" : "fader_red.bmp" - }, - - "Particles" : - [ - {"anim_pack" : "splash"} - ] - - } -} diff --git a/Release/json/level_arid_land_old.json b/Release/json/level_arid_land_old.json @@ -1,926 +0,0 @@ -{ - "loading": - { - "splash" : "Loading.bmp" - }, - - "level": - { - "world": - { - "world_h": 900, - "world_w": 4095, - "terrain" : "arid_land\\arid land_colmap.bmp", - "backgrounds" : - [ - {"back" : "arid_land\\arid land_back_0.bmp" , "parallax_factor" : 1, "alpha" : 0 }, - {"back" : "arid_land\\arid land_back_1.bmp" , "parallax_factor" : 1, "alpha" : 0 }, - {"back" : "arid_land\\arid land_back_2.bmp" , "parallax_factor" : 1, "alpha" : 0 }, - {"back" : "arid_land\\arid land_back_transp_3.bmp", "parallax_factor" : 1, "alpha" : 75}, - {"back" : "arid_land\\arid land_back_4.bmp" , "parallax_factor" : 1, "alpha" : 0 } - ], - "foregrounds" : - [ - {"fore" : "arid_land\\arid land_fore_0.bmp", "alpha" : 0}, - {"fore" : "arid_land\\arid land_fore_1.bmp", "alpha" : 0}, - {"fore" : "arid_land\\arid land_fore_2.bmp", "alpha" : 0}, - {"fore" : "arid_land\\arid land_fore_3.bmp", "alpha" : 0} - ], - "overlays" : - [ - {"over" : "arid_land\\arid land_over_transp_0.bmp", "parallax_factor" : 1, "alpha" : 125}, - {"over" : "arid_land\\arid land_over_transp_1.bmp", "parallax_factor" : 1, "alpha" : 10} - ] - }, - - "camera": - { - "h": 252, - "w": 448, - "x": 0, - "y": 0, - "blockers" : - [ - {"h" : 1, "w" : 4095, "x" : 0, "y" : 780} - ] - }, - - "sounds": - [ - {"filename" : "Dhaka.mp3" , "name" : "dhaka" , "vol" : 12 }, - {"filename" : "splash_sound.wav" , "name" : "splash_sound" , "vol" : 64 }, - {"filename" : "footstep.wav" , "name" : "footstep" , "vol" : 128}, - {"filename" : "door.wav" , "name" : "door_open" , "vol" : 128}, - {"filename" : "draw.wav" , "name" : "draw_sword" , "vol" : 128}, - {"filename" : "ouch.wav" , "name" : "ouch" , "vol" : 128}, - {"filename" : "swing.wav" , "name" : "player_attack", "vol" : 255}, - {"filename" : "sludge_hit.wav" , "name" : "sludge_hit" , "vol" : 128} - ], - - "sound_regions": - [ - { - "x" : 0, "y" : 0, "h" : 900, "w" : 2000, - "tracks" : - [ - "dhaka" - ] - } - ], - - "animations" : - [ - { - "pack_name" : "splash", - "frame_size" : {"h" : 4, "w" : 20}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 4, "col_w" : 20}, - "anim_set": - [ - {"filename" : "water_ripple.bmp", "frame_count" : 6 , "frame_rate" : 25, "id" : "PARTICLE" } - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "PARTICLE" - ], - "transition_ids" : - [ - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "PARTICLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "haze", - "frame_size" : {"h" : 284, "w" : 4095}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 284, "col_w" : 4095}, - "anim_set": - [ - {"filename" : "haze.bmp", "frame_count" : 1 , "frame_rate" : 250, "id" : "PARTICLE" } - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "PARTICLE" - ], - "transition_ids" : - [ - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "PARTICLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "player_pack", - "frame_size" : {"h" : 23, "w" : 14}, - "col_data" : {"off_x" : -5, "off_y" : 0, "col_h" : 23, "col_w" : 6}, - "anim_set": - [ - {"filename" : "player\\player_idle_begin.bmp" , "frame_count" : 2 , "frame_rate" : 250, "id" : "IDLE_BEGIN" }, - {"filename" : "player\\player_idle_begin_drawn.bmp" , "frame_count" : 2 , "frame_rate" : 250, "id" : "IDLE_BEGIN_DRAWN" }, - {"filename" : "player\\player_idle.bmp" , "frame_count" : 6 , "frame_rate" : 275, "id" : "IDLE" }, - {"filename" : "player\\player_idle_drawn.bmp" , "frame_count" : 6 , "frame_rate" : 275, "id" : "IDLE_DRAWN" }, - {"filename" : "player\\player_jump.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP" }, - {"filename" : "player\\player_jump_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_DRAWN" }, - {"filename" : "player\\player_jump_to_fall.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_TO_FALL" }, - {"filename" : "player\\player_jump_to_fall_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_TO_FALL_DRAWN"}, - {"filename" : "player\\player_fall.bmp" , "frame_count" : 5 , "frame_rate" : 75, "id" : "FALL" }, - {"filename" : "player\\player_fall_drawn.bmp" , "frame_count" : 5 , "frame_rate" : 75, "id" : "FALL_DRAWN" }, - {"filename" : "player\\player_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN" }, - {"filename" : "player\\player_run_drawn.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN_DRAWN" }, - {"filename" : "player\\player_swim.bmp" , "frame_count" : 6, "frame_rate" : 50 , "id" : "SWIM" }, - {"filename" : "player\\player_swim_tread.bmp" , "frame_count" : 6, "frame_rate" : 80 , "id" : "TREAD" } - ], - "special_anims" : - [ - {"filename" : "player\\player_attack.bmp" , "frame_count" : 12, "frame_rate" : 40 , "id" : "ATTACK" , "custom_h": 23, "custom_w": 28} - ], - "loop_ids" : - [ - "IDLE", - "IDLE_DRAWN", - "JUMP", - "JUMP_DRAWN", - "FALL", - "FALL_DRAWN", - "RUN", - "RUN_DRAWN", - "SWIM", - "TREAD", - "ATTACK" - ], - "transition_ids" : - [ - "IDLE_BEGIN", - "IDLE_BEGIN_DRAWN", - "JUMP_TO_FALL", - "JUMP_TO_FALL_DRAWN" - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": [ "NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "IDLE_DRAWN", - "transitions": [ "NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "JUMP", - "transitions": ["NONE" , "NONE" , "NONE", "NONE", "JUMP_TO_FALL", "JUMP_TO_FALL_DRAWN", "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "JUMP_DRAWN", - "transitions": [ "NONE" , "NONE" , "NONE", "NONE", "JUMP_TO_FALL", "JUMP_TO_FALL_DRAWN", "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "FALL", - "transitions": [ "NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "FALL_DRAWN", - "transitions": ["NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "RUN", - "transitions": ["IDLE_BEGIN" , "IDLE_BEGIN_DRAWN", "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "RUN_DRAWN", - "transitions": ["IDLE_BEGIN" , "IDLE_BEGIN_DRAWN", "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "SWIM", - "transitions": ["NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "TREAD", - "transitions": ["NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "ATTACK", - "transitions": ["NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - } - ] - }, - { - "pack_name" : "sword", - "frame_size" : {"h" : 23, "w" : 14}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 23, "col_w" : 14}, - "anim_set": - [ - {"filename" : "player\\sword\\sword_idle_begin.bmp" , "frame_count" : 2 , "frame_rate" : 250 ,"id" : "IDLE_BEGIN" }, - {"filename" : "player\\sword\\sword_idle_begin_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 250 ,"id" : "IDLE_BEGIN_DRAWN" }, - {"filename" : "player\\sword\\sword_idle.bmp" , "frame_count" : 6 , "frame_rate" : 275, "id" : "IDLE" }, - {"filename" : "player\\sword\\sword_idle_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 275, "id" : "IDLE_DRAWN" }, - {"filename" : "player\\sword\\sword_jump.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP" }, - {"filename" : "player\\sword\\sword_jump_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_DRAWN" }, - {"filename" : "player\\sword\\sword_jump_to_fall.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_TO_FALL" }, - {"filename" : "player\\sword\\sword_jump_to_fall_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_TO_FALL_DRAWN" }, - {"filename" : "player\\sword\\sword_fall.bmp" , "frame_count" : 5 , "frame_rate" : 75, "id" : "FALL" }, - {"filename" : "player\\sword\\sword_fall_drawn.bmp" , "frame_count" : 5 , "frame_rate" : 75, "id" : "FALL_DRAWN" }, - {"filename" : "player\\sword\\sword_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN" }, - {"filename" : "player\\sword\\sword_run_drawn.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN_DRAWN" }, - {"filename" : "player\\sword\\sword_swim.bmp" , "frame_count" : 6, "frame_rate" : 50 , "id" : "SWIM" }, - {"filename" : "player\\sword\\sword_swim_tread.bmp" , "frame_count" : 6, "frame_rate" : 80 , "id" : "TREAD" } - ], - "special_anims" : - [ - {"filename" : "player\\sword\\sword_attack.bmp" , "frame_count" : 12, "frame_rate" : 40 , "id" : "ATTACK" , "custom_h": 23, "custom_w": 28} - ], - "loop_ids" : - [ - "IDLE", - "IDLE_DRAWN", - "JUMP", - "JUMP_DRAWN", - "FALL", - "FALL_DRAWN", - "RUN", - "RUN_DRAWN", - "SWIM", - "TREAD", - "ATTACK" - ], - "transition_ids" : - [ - "IDLE_BEGIN", - "IDLE_BEGIN_DRAWN", - "JUMP_TO_FALL", - "JUMP_TO_FALL_DRAWN" - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": [ "NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "IDLE_DRAWN", - "transitions": [ "NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "JUMP", - "transitions": ["NONE" , "NONE" , "NONE", "NONE", "JUMP_TO_FALL", "JUMP_TO_FALL_DRAWN", "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "JUMP_DRAWN", - "transitions": [ "NONE" , "NONE" , "NONE", "NONE", "JUMP_TO_FALL", "JUMP_TO_FALL_DRAWN", "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "FALL", - "transitions": [ "NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "FALL_DRAWN", - "transitions": ["NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "RUN", - "transitions": ["IDLE_BEGIN" , "IDLE_BEGIN_DRAWN", "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "RUN_DRAWN", - "transitions": ["IDLE_BEGIN" , "IDLE_BEGIN_DRAWN", "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "SWIM", - "transitions": ["NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "TREAD", - "transitions": ["NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "ATTACK", - "transitions": ["NONE" , "NONE" , "NONE", "NONE", "NONE" , "NONE" , "NONE", "NONE", "NONE", "NONE", "NONE" ] - } - ] - }, - { - "pack_name" : "gate", - "frame_size" : {"h" : 66, "w" : 8}, - "col_data" : {"off_x" : 0, "off_y" : -29, "col_h" : 37, "col_w" : 8}, - "anim_set": - [ - {"filename" : "gate\\gate_down.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_DOWN" }, - {"filename" : "gate\\gate_up.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_UP" }, - {"filename" : "gate\\gate_lower.bmp" , "frame_count" : 6 , "frame_rate" : 40 , "id" : "GATE_LOWER" }, - {"filename" : "gate\\gate_lower_begin.bmp" , "frame_count" : 3 , "frame_rate" : 40 , "id" : "GATE_LOWER_BEGIN" }, - {"filename" : "gate\\gate_raise.bmp" , "frame_count" : 38, "frame_rate" : 120 , "id" : "GATE_RAISE" } - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "GATE_DOWN", - "GATE_UP" - ], - "transition_ids": - [ - "GATE_LOWER", - "GATE_LOWER_BEGIN", - "GATE_RAISE" - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "GATE_DOWN", - "transitions": ["NONE", "GATE_RAISE"] - }, - { - "loop_name": "GATE_UP", - "transitions": ["GATE_LOWER", "NONE"] - } - ] - }, - { - "pack_name" : "winch", - "frame_size" : {"h" : 31, "w" : 22}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 17, "col_w" : 22}, - "anim_set": - [ - {"filename" : "winch\\winch_down.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_DOWN" }, - {"filename" : "winch\\winch_up.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_UP" }, - {"filename" : "winch\\winch_lower.bmp" , "frame_count" : 6 , "frame_rate" : 40 , "id" : "GATE_LOWER" }, - {"filename" : "winch\\winch_lower_begin.bmp" , "frame_count" : 4 , "frame_rate" : 120 , "id" : "GATE_LOWER_BEGIN" }, - {"filename" : "winch\\winch_raise.bmp" , "frame_count" : 40, "frame_rate" : 120 , "id" : "GATE_RAISE" } - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "GATE_DOWN", - "GATE_UP" - ], - "transition_ids" : - [ - "GATE_LOWER", - "GATE_LOWER_BEGIN", - "GATE_RAISE" - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "GATE_DOWN", - "transitions": ["NONE", "GATE_RAISE"] - }, - { - "loop_name": "GATE_UP", - "transitions": ["GATE_LOWER", "NONE"] - } - ] - }, - { - "pack_name" : "gateman_npc", - "frame_size" : {"h" : 26, "w" : 14}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 26, "col_w" : 14}, - "anim_set": - [ - {"filename" : "NPCs\\gateman\\gateoperator_idle.bmp" , "frame_count" : 6 , "frame_rate" : 250 , "id" : "GATE_DOWN" }, - {"filename" : "NPCs\\gateman\\gateoperator_idle.bmp" , "frame_count" : 6 , "frame_rate" : 250 , "id" : "GATE_UP" }, - {"filename" : "NPCs\\gateman\\gateoperator_lower.bmp" , "frame_count" : 7 , "frame_rate" : 120 , "id" : "GATE_LOWER" }, - {"filename" : "NPCs\\gateman\\gateoperator_raise.bmp" , "frame_count" : 43, "frame_rate" : 120 , "id" : "GATE_RAISE" } - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "GATE_DOWN", - "GATE_UP" - ], - "transition_ids" : - [ - "GATE_LOWER", - "GATE_RAISE" - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "GATE_DOWN", - "transitions": ["NONE", "GATE_RAISE"] - }, - { - "loop_name": "GATE_UP", - "transitions": ["GATE_LOWER", "NONE"] - } - ] - }, - { - "pack_name" : "red_pack", - "frame_size" : {"h" : 23, "w" : 14}, - "col_data" : {"off_x" : -5, "off_y" : 0, "col_h" : 23, "col_w" : 6}, - "anim_set": - [ - {"filename" : "red_idle_begin.bmp", "frame_count" : 4 , "frame_rate" : 75 , "off_x" : 0, "off_y" : 0, "col_h" : 0, "col_w" : 0, "id" : "IDLE_BEGIN"}, - {"filename" : "red_idle.bmp" , "frame_count" : 3 , "frame_rate" : 100, "off_x" : 0, "off_y" : 0, "col_h" : 0, "col_w" : 0, "id" : "IDLE" }, - {"filename" : "red_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "off_x" : 0, "off_y" : 0, "col_h" : 0, "col_w" : 0, "id" : "RUN" } - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "IDLE", - "RUN" - ], - "transition_ids" : - [ - "IDLE_BEGIN" - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE", "NONE"] - }, - { - "loop_name": "RUN", - "transitions": ["IDLE_BEGIN", "NONE"] - } - ] - }, - { - "pack_name" : "yella_pack", - "frame_size" : {"h" : 23, "w" : 14}, - "col_data" : {"off_x" : -5, "off_y" : 0, "col_h" : 23, "col_w" : 6}, - "anim_set": - [ - {"filename" : "yella_idle_begin.bmp", "frame_count" : 4 , "frame_rate" : 75 , "id" : "IDLE_BEGIN"}, - {"filename" : "yella_idle.bmp" , "frame_count" : 3 , "frame_rate" : 100, "id" : "IDLE" }, - {"filename" : "yella_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN" } - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "IDLE", - "RUN" - ], - "transition_ids" : - [ - "IDLE_BEGIN" - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE", "NONE"] - }, - { - "loop_name": "RUN", - "transitions": ["IDLE_BEGIN", "NONE"] - } - ] - }, - { - "pack_name": "b_rabbit_pack", - "frame_size": { - "h": 5, - "w": 6 - }, - "col_data": { - "off_x": 0, - "off_y": 0, - "col_h": 5, - "col_w": 6 - }, - "anim_set": [ - { - "filename": "rabbits\\brabbit_hop.bmp", - "frame_count": 1, - "frame_rate": 100, - "id": "RUN" - }, - { - "filename": "rabbits\\brabbit_idle_eat.bmp", - "frame_count": 13, - "frame_rate": 100, - "id": "EAT" - }, - { - "filename": "rabbits\\brabbit_idle_look.bmp", - "frame_count": 8, - "frame_rate": 100, - "id": "LOOK" - }, - { - "filename": "rabbits\\brabbit_sleep.bmp", - "frame_count": 1, - "frame_rate": 100, - "id": "SLEEP" - } - ], - "special_anims" : - [ - ], - "loop_ids": - [ - "RUN", - "EAT", - "LOOK", - "SLEEP" - ], - "transition_ids": - [ - ], - "fireables_ids" : - [ - ], - "anim_graph": [ - { - "loop_name": "RUN", - "transitions": [ "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "EAT", - "transitions": [ "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "LOOK", - "transitions": [ "NONE", "NONE", "NONE", "NONE" ] - }, - { - "loop_name": "SLEEP", - "transitions": [ "NONE", "NONE", "NONE", "NONE" ] - } - ] - }, - { - "pack_name" : "sludge_seal_pack", - "frame_size" : {"h" : 16, "w" : 23}, - "col_data" : {"off_x" : -4, "off_y" : 0, "col_h" : 16, "col_w" : 15}, - "anim_set": - [ - {"filename" : "sludge_seal\\sludgeseal_land_idle.bmp" , "frame_count" : 6 , "frame_rate" : 250 , "id" : "IDLE" }, - {"filename" : "sludge_seal\\sludgeseal_crawl.bmp" , "frame_count" : 8 , "frame_rate" : 30 , "id" : "RUN" }, - {"filename" : "sludge_seal\\sludgeseal_swim.bmp" , "frame_count" : 8 , "frame_rate" : 125 , "id" : "SWIM" }, - {"filename" : "sludge_seal\\sludgeseal_swim_begin.bmp" , "frame_count" : 7 , "frame_rate" : 10 , "id" : "SWIM_BEGIN" }, - {"filename" : "sludge_seal\\sludgeseal_water_idle.bmp" , "frame_count" : 16 , "frame_rate" : 350 , "id" : "TREAD" }, - {"filename" : "sludge_seal\\sludgeseal_die.bmp" , "frame_count" : 6 , "frame_rate" : 350 , "id" : "DIE" }, - {"filename" : "sludge_seal\\sludgeseal_dead.bmp" , "frame_count" : 1 , "frame_rate" : 10 , "id" : "DEAD" } - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "IDLE", - "RUN", - "SWIM", - "TREAD", - "DEAD" - ], - "transition_ids" : - [ - "SWIM_BEGIN", - "DIE" - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE", "NONE", "NONE" , "NONE", "DIE"] - }, - { - "loop_name": "RUN", - "transitions": ["NONE", "NONE", "NONE" , "NONE", "DIE"] - }, - { - "loop_name": "SWIM", - "transitions": [ "NONE", "NONE", "NONE" , "NONE" , "DIE"] - }, - { - "loop_name": "TREAD", - "transitions": [ "NONE", "NONE", "SWIM_BEGIN", "NONE", "DIE"] - }, - { - "loop_name": "DEAD", - "transitions": ["NONE", "NONE", "NONE" , "NONE", "NONE"] - } - ] - }, - { - "pack_name" : "loyal_bug_pack", - "frame_size" : {"h" : 26, "w" : 64}, - "col_data" : {"off_x" : -32, "off_y" : 0, "col_h" : 26, "col_w" : 32}, - "anim_set": - [ - {"filename" : "loyal_bug\\loyalbug_idle_begin.bmp" , "frame_count" : 5 , "frame_rate" : 75 , "id" : "IDLE_BEGIN"}, - {"filename" : "loyal_bug\\loyalbug_idle.bmp" , "frame_count" : 11 , "frame_rate" : 120, "id" : "IDLE" }, - {"filename" : "loyal_bug\\loyalbug_walk.bmp" , "frame_count" : 23, "frame_rate" : 20 , "id" : "RUN" } - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "IDLE", - "RUN" - ], - "transition_ids" : - [ - "IDLE_BEGIN" - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE", "NONE"] - }, - { - "loop_name": "RUN", - "transitions": ["IDLE_BEGIN", "NONE"] - } - ] - }, - { - "pack_name" : "hostile_bug", - "frame_size" : {"h" : 7, "w" : 13}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 7, "col_w" : 13}, - "anim_set": - [ - {"filename" : "hostile\\bug_walk.bmp" , "frame_count" : 8 , "frame_rate" : 75 , "id" : "RUN"} - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "RUN" - ], - "transition_ids" : - [ - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "RUN", - "transitions": [] - } - ] - }, - { - "pack_name" : "door", - "frame_size" : {"h" : 22, "w" : 15}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 22, "col_w" : 15}, - "anim_set": - [ - {"filename" : "door.bmp" , "frame_count" : 1, "frame_rate" : 100 , "id" : "IDLE"} - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "garden_npc", - "frame_size" : {"h" : 22, "w" : 11}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 22, "col_w" : 11}, - "anim_set": - [ - {"filename" : "NPCs\\gardenwoman_idle.bmp" , "frame_count" : 5, "frame_rate" : 300 , "id" : "IDLE"} - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "smoke_npc", - "frame_size" : {"h" : 22, "w" : 13}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 22, "col_w" : 13}, - "anim_set": - [ - {"filename" : "NPCs\\smokingman_idle.bmp" , "frame_count" : 21, "frame_rate" : 260 , "id" : "IDLE"} - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "sit_man_npc", - "frame_size" : {"h" : 22, "w" : 8}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 22, "col_w" : 8}, - "anim_set": - [ - {"filename" : "NPCs\\sitting_man_idle.bmp" , "frame_count" : 11, "frame_rate" : 260 , "id" : "IDLE"} - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "storeowner_npc", - "frame_size" : {"h" : 25, "w" : 8}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 25, "col_w" : 8}, - "anim_set": - [ - {"filename" : "NPCs\\storeowner_idle.bmp" , "frame_count" : 8, "frame_rate" : 415 , "id" : "IDLE"} - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "bad_hat", - "frame_size" : {"h" : 23, "w" : 14}, - "col_data" : {"off_x" : -5, "off_y" : 0, "col_h" : 23, "col_w" : 6}, - "anim_set": - [ - {"filename" : "player\\myhatisat.bmp" , "frame_count" : 1, "frame_rate" : 100 , "id" : "IDLE"} - ], - "special_anims" : - [ - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "fireables_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - } - ], - - "actors" : - [ - {"name":"garden0", "type" : "talker" , "anim_pack" : "garden_npc" , "x" : 1740 , "y" : 714, "lines" : "Heres the garden woman, this is the stuff she will say. To demonstrate scrolling heres some more text."}, - {"name":"smoke0", "type" : "talker" , "anim_pack" : "smoke_npc" , "x" : 928 , "y" : 672, "lines" : "This is the smoking man, talkers can be spoken to from some distance away horizontally, but you need to be closer vertically. text"}, - {"name":"sit0", "type" : "talker" , "anim_pack" : "sit_man_npc" , "x" : 905 , "y" : 695, "lines" : "Nice try bro"}, - {"name":"storeowner0", "type" : "talker" , "anim_pack" : "storeowner_npc" , "x" : 930 , "y" : 711, "lines" : "I gotta say something."}, - {"name":"gate0", "type" : "gate" , "anim_pack" : "gate" , "x" : 1550 , "y" : 700, "dir": "RIGHT"}, - {"name":"gateman0", "type" : "gateman" , "anim_pack" : "gateman_npc" , "x" : 1500 , "y" : 611, "lines" : "Gate opens when this dialogue closes"}, - {"name":"sludgeseal0", "type" : "sludge_seal" , "anim_pack" : "sludge_seal_pack" , "x" : 1950 , "y" : 670}, - {"name":"sludgeseal1", "type" : "sludge_seal" , "anim_pack" : "sludge_seal_pack" , "x" : 2000 , "y" : 670}, - {"name":"sludgeseal2", "type" : "sludge_seal" , "anim_pack" : "sludge_seal_pack" , "x" : 2050 , "y" : 670}, - {"name":"sludgeseal3", "type" : "sludge_seal" , "anim_pack" : "sludge_seal_pack" , "x" : 2100 , "y" : 670}, - {"name":"sludgeseal4", "type" : "sludge_seal" , "anim_pack" : "sludge_seal_pack" , "x" : 2150 , "y" : 670}, - {"name":"sludgeseal5", "type" : "sludge_seal" , "anim_pack" : "sludge_seal_pack" , "x" : 2200 , "y" : 670}, - {"name":"sludgeseal6", "type" : "sludge_seal" , "anim_pack" : "sludge_seal_pack" , "x" : 2250 , "y" : 670}, - {"name":"sludgeseal7", "type" : "sludge_seal" , "anim_pack" : "sludge_seal_pack" , "x" : 2300 , "y" : 670}, - {"name":"player0", "type" : "player" , "anim_pack" : "player_pack" , "x" : 1700 , "y" : 670} - ], - - "hud_textures" : - { - "life_base" : "life_base.bmp", - "life_bar" : "life_bar.bmp", - "text_box" : "dialogue_box.bmp", - "fader_black" : "fader_black.bmp", - "fader_red" : "fader_red.bmp" - }, - - "Particles" : - [ - {"anim_pack" : "splash"} - ] - - } -} diff --git a/Release/json/level_scene_1.json b/Release/json/level_scene_1.json @@ -1,661 +0,0 @@ -{ - "loading": - { - "splash" : "Loading.bmp" - }, - - "level": - { - "world": - { - "world_h": 500, - "world_w": 1800, - "terrain" : "scene_1\\scene_1_colmap.bmp", - "backgrounds" : - [ - {"back" : "scene_1\\scene_1_back_0.bmp" , "parallax_factor" : 1, "alpha" : 0 }, - {"back" : "scene_1\\scene_1_back_1.bmp" , "parallax_factor" : 1, "alpha" : 0 }, - {"back" : "scene_1\\scene_1_back_transp_2.bmp", "parallax_factor" : 1, "alpha" : 75}, - {"back" : "scene_1\\scene_1_back_3.bmp" , "parallax_factor" : 1, "alpha" : 0 }, - {"back" : "scene_1\\scene_1_back_4.bmp" , "parallax_factor" : 1, "alpha" : 0 }, - {"back" : "scene_1\\scene_1_back_5.bmp" , "parallax_factor" : 1, "alpha" : 0 } - ], - "foregrounds" : - [ - {"fore" : "scene_1\\scene_1_fore_0.bmp", "alpha" : 0}, - {"fore" : "scene_1\\scene_1_fore_transp_1.bmp", "alpha" : 0}, - {"fore" : "scene_1\\scene_1_fore_2.bmp", "alpha" : 0}, - {"fore" : "scene_1\\scene_1_fore_3.bmp", "alpha" : 0}, - {"fore" : "scene_1\\scene_1_fore_4.bmp", "alpha" : 0} - ], - "overlays" : - [ - ] - }, - - "camera": - { - "h": 252, - "w": 448, - "x": 0, - "y": 0, - "blockers" : - [ - ] - }, - - "sounds": - [ - {"filename" : "Dhaka.mp3" , "name" : "dhaka" , "vol" : 12 }, - {"filename" : "splash_sound.wav", "name" : "splash_sound", "vol" : 64}, - {"filename" : "footstep.wav" , "name" : "footstep" , "vol" : 128}, - {"filename" : "door.wav" , "name" : "door_open" , "vol" : 128}, - {"filename" : "draw.wav" , "name" : "draw_sword" , "vol" : 128} - ], - - "sound_regions": - [ - { - "x" : 0, "y" : 0, "h" : 500, "w" : 1800, - "tracks" : - [ - "dhaka" - ] - } - ], - - "animations" : - [ - { - "pack_name" : "splash", - "frame_size" : {"h" : 4, "w" : 20}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 4, "col_w" : 20}, - "anim_set": - [ - {"filename" : "water_ripple.bmp", "frame_count" : 6 , "frame_rate" : 25, "id" : "PARTICLE" } - ], - "loop_ids" : - [ - "PARTICLE" - ], - "transition_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "PARTICLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "haze", - "frame_size" : {"h" : 284, "w" : 4095}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 284, "col_w" : 4095}, - "anim_set": - [ - {"filename" : "haze.bmp", "frame_count" : 1 , "frame_rate" : 250, "id" : "PARTICLE" } - ], - "loop_ids" : - [ - "PARTICLE" - ], - "transition_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "PARTICLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "player_pack", - "frame_size" : {"h" : 23, "w" : 14}, - "col_data" : {"off_x" : -5, "off_y" : 0, "col_h" : 23, "col_w" : 6}, - "anim_set": - [ - {"filename" : "player\\player_idle_begin.bmp" , "frame_count" : 2 , "frame_rate" : 250, "id" : "IDLE_BEGIN" }, - {"filename" : "player\\player_idle.bmp" , "frame_count" : 6 , "frame_rate" : 275, "id" : "IDLE" }, - {"filename" : "player\\player_jump.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP" }, - {"filename" : "player\\player_jump_to_fall.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_TO_FALL"}, - {"filename" : "player\\player_fall.bmp" , "frame_count" : 5 , "frame_rate" : 75, "id" : "FALL" }, - {"filename" : "player\\player_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN" }, - {"filename" : "player\\player_run_drawn.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN_DRAWN" }, - {"filename" : "player\\player_swim.bmp" , "frame_count" : 6, "frame_rate" : 50 , "id" : "SWIM" }, - {"filename" : "player\\player_swim_tread.bmp" , "frame_count" : 6, "frame_rate" : 80 , "id" : "TREAD" } - ], - "loop_ids" : - [ - "IDLE", - "JUMP", - "FALL", - "RUN", - "RUN_DRAWN", - "SWIM", - "TREAD" - ], - "transition_ids" : - [ - "IDLE_BEGIN", - "JUMP_TO_FALL" - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE" , "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "JUMP", - "transitions": ["NONE" , "NONE", "JUMP_TO_FALL", "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "FALL", - "transitions": ["NONE" , "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "RUN", - "transitions": ["IDLE_BEGIN", "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "RUN_DRAWN", - "transitions": ["IDLE_BEGIN", "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "SWIM", - "transitions": ["NONE" , "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "TREAD", - "transitions": ["NONE" , "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - } - ] - }, - { - "pack_name" : "sword", - "frame_size" : {"h" : 23, "w" : 14}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 23, "col_w" : 14}, - "anim_set": - [ - {"filename" : "player\\sword\\sword_idle_begin.bmp" , "frame_count" : 2 , "frame_rate" : 250 , "id" : "IDLE_BEGIN" }, - {"filename" : "player\\sword\\sword_idle.bmp" , "frame_count" : 6 , "frame_rate" : 275, "id" : "IDLE" }, - {"filename" : "player\\sword\\sword_jump.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP" }, - {"filename" : "player\\sword\\sword_jump_to_fall.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_TO_FALL"}, - {"filename" : "player\\sword\\sword_fall.bmp" , "frame_count" : 5 , "frame_rate" : 75, "id" : "FALL" }, - {"filename" : "player\\sword\\sword_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN" }, - {"filename" : "player\\sword\\sword_run_drawn.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN_DRAWN" }, - {"filename" : "player\\sword\\sword_swim.bmp" , "frame_count" : 6, "frame_rate" : 50 , "id" : "SWIM" }, - {"filename" : "player\\sword\\sword_swim_tread.bmp" , "frame_count" : 6, "frame_rate" : 80 , "id" : "TREAD" } - ], - "loop_ids" : - [ - "IDLE", - "JUMP", - "FALL", - "RUN", - "RUN_DRAWN", - "SWIM", - "TREAD" - ], - "transition_ids" : - [ - "IDLE_BEGIN", - "JUMP_TO_FALL" - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE" , "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "JUMP", - "transitions": ["NONE" , "NONE", "JUMP_TO_FALL", "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "FALL", - "transitions": ["NONE" , "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "RUN", - "transitions": ["IDLE_BEGIN", "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "RUN_DRAWN", - "transitions": ["IDLE_BEGIN", "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "SWIM", - "transitions": ["NONE" , "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "TREAD", - "transitions": ["NONE" , "NONE", "NONE" , "NONE", "NONE", "NONE", "NONE"] - } - ] - }, - { - "pack_name" : "gate", - "frame_size" : {"h" : 66, "w" : 8}, - "col_data" : {"off_x" : 0, "off_y" : -29, "col_h" : 37, "col_w" : 8}, - "anim_set": - [ - {"filename" : "gate\\gate_down.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_DOWN" }, - {"filename" : "gate\\gate_up.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_UP" }, - {"filename" : "gate\\gate_lower.bmp" , "frame_count" : 6 , "frame_rate" : 40 , "id" : "GATE_LOWER" }, - {"filename" : "gate\\gate_lower_begin.bmp" , "frame_count" : 3 , "frame_rate" : 40 , "id" : "GATE_LOWER_BEGIN" }, - {"filename" : "gate\\gate_raise.bmp" , "frame_count" : 38, "frame_rate" : 120 , "id" : "GATE_RAISE" } - ], - "loop_ids" : - [ - "GATE_DOWN", - "GATE_UP" - ], - "transition_ids" : - [ - "GATE_LOWER", - "GATE_LOWER_BEGIN", - "GATE_RAISE" - ], - "anim_graph": - [ - { - "loop_name": "GATE_DOWN", - "transitions": ["NONE", "GATE_RAISE"] - }, - { - "loop_name": "GATE_UP", - "transitions": ["GATE_LOWER", "NONE"] - } - ] - }, - { - "pack_name" : "winch", - "frame_size" : {"h" : 31, "w" : 22}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 17, "col_w" : 22}, - "anim_set": - [ - {"filename" : "winch\\winch_down.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_DOWN" }, - {"filename" : "winch\\winch_up.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_UP" }, - {"filename" : "winch\\winch_lower.bmp" , "frame_count" : 6 , "frame_rate" : 40 , "id" : "GATE_LOWER" }, - {"filename" : "winch\\winch_lower_begin.bmp" , "frame_count" : 4 , "frame_rate" : 120 , "id" : "GATE_LOWER_BEGIN" }, - {"filename" : "winch\\winch_raise.bmp" , "frame_count" : 40, "frame_rate" : 120 , "id" : "GATE_RAISE" } - ], - "loop_ids" : - [ - "GATE_DOWN", - "GATE_UP" - ], - "transition_ids" : - [ - "GATE_LOWER", - "GATE_LOWER_BEGIN", - "GATE_RAISE" - ], - "anim_graph": - [ - { - "loop_name": "GATE_DOWN", - "transitions": ["NONE", "GATE_RAISE"] - }, - { - "loop_name": "GATE_UP", - "transitions": ["GATE_LOWER", "NONE"] - } - ] - }, - { - "pack_name" : "gateman_npc", - "frame_size" : {"h" : 26, "w" : 14}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 26, "col_w" : 14}, - "anim_set": - [ - {"filename" : "NPCs\\gateman\\gateoperator_idle.bmp" , "frame_count" : 6 , "frame_rate" : 250 , "id" : "GATE_DOWN" }, - {"filename" : "NPCs\\gateman\\gateoperator_idle.bmp" , "frame_count" : 6 , "frame_rate" : 250 , "id" : "GATE_UP" }, - {"filename" : "NPCs\\gateman\\gateoperator_lower.bmp" , "frame_count" : 7 , "frame_rate" : 120 , "id" : "GATE_LOWER" }, - {"filename" : "NPCs\\gateman\\gateoperator_raise.bmp" , "frame_count" : 43, "frame_rate" : 120 , "id" : "GATE_RAISE" } - ], - "loop_ids" : - [ - "GATE_DOWN", - "GATE_UP" - ], - "transition_ids" : - [ - "GATE_LOWER", - "GATE_RAISE" - ], - "anim_graph": - [ - { - "loop_name": "GATE_DOWN", - "transitions": ["NONE", "GATE_RAISE"] - }, - { - "loop_name": "GATE_UP", - "transitions": ["GATE_LOWER", "NONE"] - } - ] - }, - { - "pack_name" : "red_pack", - "frame_size" : {"h" : 23, "w" : 14}, - "col_data" : {"off_x" : -5, "off_y" : 0, "col_h" : 23, "col_w" : 6}, - "anim_set": - [ - {"filename" : "red_idle_begin.bmp", "frame_count" : 4 , "frame_rate" : 75 , "off_x" : 0, "off_y" : 0, "col_h" : 0, "col_w" : 0, "id" : "IDLE_BEGIN"}, - {"filename" : "red_idle.bmp" , "frame_count" : 3 , "frame_rate" : 100, "off_x" : 0, "off_y" : 0, "col_h" : 0, "col_w" : 0, "id" : "IDLE" }, - {"filename" : "red_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "off_x" : 0, "off_y" : 0, "col_h" : 0, "col_w" : 0, "id" : "RUN" } - ], - "loop_ids" : - [ - "IDLE", - "RUN" - ], - "transition_ids" : - [ - "IDLE_BEGIN" - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE", "NONE"] - }, - { - "loop_name": "RUN", - "transitions": ["IDLE_BEGIN", "NONE"] - } - ] - }, - { - "pack_name" : "yella_pack", - "frame_size" : {"h" : 23, "w" : 14}, - "col_data" : {"off_x" : -5, "off_y" : 0, "col_h" : 23, "col_w" : 6}, - "anim_set": - [ - {"filename" : "yella_idle_begin.bmp", "frame_count" : 4 , "frame_rate" : 75 , "id" : "IDLE_BEGIN"}, - {"filename" : "yella_idle.bmp" , "frame_count" : 3 , "frame_rate" : 100, "id" : "IDLE" }, - {"filename" : "yella_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN" } - ], - "loop_ids" : - [ - "IDLE", - "RUN" - ], - "transition_ids" : - [ - "IDLE_BEGIN" - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE", "NONE"] - }, - { - "loop_name": "RUN", - "transitions": ["IDLE_BEGIN", "NONE"] - } - ] - }, - { - "pack_name" : "b_rabbit_pack", - "frame_size" : {"h" : 5, "w" : 6}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 5, "col_w" : 6}, - "anim_set": - [ - {"filename" : "rabbits\\brabbit_hop.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "RUN" }, - {"filename" : "rabbits\\brabbit_idle_eat.bmp" , "frame_count" : 13, "frame_rate" : 100, "id" : "EAT" }, - {"filename" : "rabbits\\brabbit_idle_look.bmp" , "frame_count" : 8 , "frame_rate" : 100, "id" : "LOOK" }, - {"filename" : "rabbits\\brabbit_sleep.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "SLEEP" } - ], - "loop_ids" : - [ - "RUN", - "EAT", - "LOOK", - "SLEEP" - ], - "transition_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "RUN", - "transitions": ["NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "EAT", - "transitions": ["NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "LOOK", - "transitions": ["NONE", "NONE", "NONE", "NONE"] - }, - { - "loop_name": "SLEEP", - "transitions": ["NONE", "NONE", "NONE", "NONE"] - } - ] - }, - { - "pack_name" : "loyal_bug_pack", - "frame_size" : {"h" : 26, "w" : 64}, - "col_data" : {"off_x" : -32, "off_y" : 0, "col_h" : 26, "col_w" : 32}, - "anim_set": - [ - {"filename" : "loyal_bug\\loyalbug_idle_begin.bmp" , "frame_count" : 5 , "frame_rate" : 75 , "id" : "IDLE_BEGIN"}, - {"filename" : "loyal_bug\\loyalbug_idle.bmp" , "frame_count" : 11 , "frame_rate" : 120, "id" : "IDLE" }, - {"filename" : "loyal_bug\\loyalbug_walk.bmp" , "frame_count" : 23, "frame_rate" : 20 , "id" : "RUN" } - ], - "loop_ids" : - [ - "IDLE", - "RUN" - ], - "transition_ids" : - [ - "IDLE_BEGIN" - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE", "NONE"] - }, - { - "loop_name": "RUN", - "transitions": ["IDLE_BEGIN", "NONE"] - } - ] - }, - { - "pack_name" : "hostile_bug", - "frame_size" : {"h" : 7, "w" : 13}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 7, "col_w" : 13}, - "anim_set": - [ - {"filename" : "hostile\\bug_walk.bmp" , "frame_count" : 8 , "frame_rate" : 75 , "id" : "RUN"} - ], - "loop_ids" : - [ - "RUN" - ], - "transition_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "RUN", - "transitions": [] - } - ] - }, - { - "pack_name" : "door", - "frame_size" : {"h" : 22, "w" : 15}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 22, "col_w" : 15}, - "anim_set": - [ - {"filename" : "door.bmp" , "frame_count" : 1, "frame_rate" : 100 , "id" : "IDLE"} - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "garden_npc", - "frame_size" : {"h" : 22, "w" : 11}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 22, "col_w" : 11}, - "anim_set": - [ - {"filename" : "NPCs\\gardenwoman_idle.bmp" , "frame_count" : 5, "frame_rate" : 300 , "id" : "IDLE"} - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "smoke_npc", - "frame_size" : {"h" : 22, "w" : 13}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 22, "col_w" : 13}, - "anim_set": - [ - {"filename" : "NPCs\\smokingman_idle.bmp" , "frame_count" : 21, "frame_rate" : 260 , "id" : "IDLE"} - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "sit_man_npc", - "frame_size" : {"h" : 22, "w" : 8}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 22, "col_w" : 8}, - "anim_set": - [ - {"filename" : "NPCs\\sitting_man_idle.bmp" , "frame_count" : 11, "frame_rate" : 260 , "id" : "IDLE"} - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "storeowner_npc", - "frame_size" : {"h" : 25, "w" : 8}, - "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 25, "col_w" : 8}, - "anim_set": - [ - {"filename" : "NPCs\\storeowner_idle.bmp" , "frame_count" : 8, "frame_rate" : 415 , "id" : "IDLE"} - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - }, - { - "pack_name" : "bad_hat", - "frame_size" : {"h" : 23, "w" : 14}, - "col_data" : {"off_x" : -5, "off_y" : 0, "col_h" : 23, "col_w" : 6}, - "anim_set": - [ - {"filename" : "player\\myhatisat.bmp" , "frame_count" : 1, "frame_rate" : 100 , "id" : "IDLE"} - ], - "loop_ids" : - [ - "IDLE" - ], - "transition_ids" : - [ - ], - "anim_graph": - [ - { - "loop_name": "IDLE", - "transitions": ["NONE"] - } - ] - } - ], - - "actors" : - [ - {"name":"smoke0", "type" : "talker" , "anim_pack" : "smoke_npc" , "x" : 300 , "y" : 400, "lines" : "This is the smoking man, talkers can be spoken to from some distance away horizontally, but you need to be closer vertically. text"}, - {"name":"player0", "type" : "player" , "anim_pack" : "player_pack" , "x" : 50, "y" : 50} - ], - - "hud_textures" : - { - "life_base" : "life_base.bmp", - "life_bar" : "life_bar.bmp", - "text_box" : "dialogue_box.bmp", - "fader" : "fader.bmp" - }, - - "Particles" : - [ - {"anim_pack" : "splash"} - ] - - } -} diff --git a/Release/libFLAC-8.dll b/Release/libFLAC-8.dll Binary files differ. diff --git a/Release/libfreetype-6.dll b/Release/libfreetype-6.dll Binary files differ. diff --git a/Release/libmodplug-1.dll b/Release/libmodplug-1.dll Binary files differ. diff --git a/Release/libogg-0.dll b/Release/libogg-0.dll Binary files differ. diff --git a/Release/libvorbis-0.dll b/Release/libvorbis-0.dll Binary files differ. diff --git a/Release/libvorbisfile-3.dll b/Release/libvorbisfile-3.dll Binary files differ. diff --git a/Release/smpeg2.dll b/Release/smpeg2.dll Binary files differ. diff --git a/Release/sounds/Dhaka.mp3 b/Release/sounds/Dhaka.mp3 Binary files differ. diff --git a/Release/sounds/door.wav b/Release/sounds/door.wav Binary files differ. diff --git a/Release/sounds/draw.wav b/Release/sounds/draw.wav Binary files differ. diff --git a/Release/sounds/footstep.wav b/Release/sounds/footstep.wav Binary files differ. diff --git a/Release/sounds/ouch.wav b/Release/sounds/ouch.wav Binary files differ. diff --git a/Release/sounds/sludge_hit.wav b/Release/sounds/sludge_hit.wav Binary files differ. diff --git a/Release/sounds/splash_sound.wav b/Release/sounds/splash_sound.wav Binary files differ. diff --git a/Release/sounds/swing.wav b/Release/sounds/swing.wav Binary files differ. diff --git a/Release/zlib1.dll b/Release/zlib1.dll Binary files differ. diff --git a/TapestryEngine.VC.db b/TapestryEngine.VC.db Binary files differ. diff --git a/TapestryEngine.opensdf b/TapestryEngine.opensdf Binary files differ. diff --git a/TapestryEngine.sdf b/TapestryEngine.sdf Binary files differ. diff --git a/TapestryEngine.sln b/TapestryEngine.sln @@ -1,22 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TapestryEngine", "TapestryEngine\TapestryEngine.vcxproj", "{7BB3F3F9-5600-4309-A1DA-D14BA7B40E91}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7BB3F3F9-5600-4309-A1DA-D14BA7B40E91}.Debug|Win32.ActiveCfg = Debug|Win32 - {7BB3F3F9-5600-4309-A1DA-D14BA7B40E91}.Debug|Win32.Build.0 = Debug|Win32 - {7BB3F3F9-5600-4309-A1DA-D14BA7B40E91}.Release|Win32.ActiveCfg = Release|Win32 - {7BB3F3F9-5600-4309-A1DA-D14BA7B40E91}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/TapestryEngine.v12.suo b/TapestryEngine.v12.suo Binary files differ. diff --git a/TapestryEngine/Actor.cpp b/TapestryEngine/Actor.cpp @@ -14,6 +14,8 @@ Actor::Actor(AnimGraph* AnimData, SDL_Rect Pos, SDL_Rect DrawPos, ActorHandleMan mState = IDLE; + mDir = RIGHT; + mAHM = AHM; //if (AHM != NULL) { mHandle = AHM->EventProcess(Event(ASSIGN_HANDLE, (EventReceiver*)this)); } if (mAHM != NULL) { mHandle = mAHM->AssignHandle(this); } //Get a unique handle from the AHM and register it with a pointer to yourself @@ -692,7 +694,7 @@ Player::Player(SDL_Surface* ter, AnimGraph* AnimData, SDL_Rect Pos, SDL_Rect Dra mTouch.w = 18; mAttackZone.w = 16; - ((sword*)(mAHM->GetActorAddress(mHatIndex_Sword)))->ToggleHat(true); +// ((sword*)(mAHM->GetActorAddress(mHatIndex_Sword)))->ToggleHat(true); } bool Player::EventProcess(Event eve) @@ -1732,4 +1734,4 @@ bool Rabbit::ActorUpdate() //gDiagDraw->LogDiagRect(mPosData); return true; } -//- \ No newline at end of file +// diff --git a/TapestryEngine/Actor.h b/TapestryEngine/Actor.h @@ -104,7 +104,7 @@ public: } return mDrawPos; } - + int GetOpacity() { return mOpacity; @@ -711,4 +711,4 @@ protected: int mWaitTimer; }; -#endif- \ No newline at end of file +#endif diff --git a/TapestryEngine/ActorHandle.h b/TapestryEngine/ActorHandle.h @@ -40,6 +40,7 @@ public: int ReclaimHandle(int id) //I'm not sure if recycling ID's makes sense or how to do it { //mHandleTree.Search(id)->Delete() + return 0; } Actor* GetActorAddress(int id) @@ -79,7 +80,7 @@ protected: int UpdateNextHandle() // see reclaim handle { - + return 0; } int mNextNewID; @@ -87,4 +88,4 @@ protected: }; -#endif - \ No newline at end of file +#endif diff --git a/TapestryEngine/Animation.cpp b/TapestryEngine/Animation.cpp @@ -119,7 +119,8 @@ animation* AnimPack::ActivateAnimation(int AnimationID, int flags) return &mAnims[i]; } } - gCons->ConsPrintf("Invalid Animation ID; Could not find Animation\n"); +// gCons->ConsPrintf("Invalid Animation ID; Could not find Animation\n"); + printf("Invalid Animation ID; Could not find Animation\n"); return NULL; } @@ -134,4 +135,4 @@ bool FrameCompare(Frame f1, Frame f2) } } return false; -}- \ No newline at end of file +} diff --git a/TapestryEngine/Animation.h b/TapestryEngine/Animation.h @@ -76,7 +76,7 @@ public: return mCurrentFrameNumber; } - bool SetPlaySpeed(int speed) + void SetPlaySpeed(int speed) { mFrameRate = speed; } @@ -225,4 +225,4 @@ protected: bool FrameCompare(Frame f1, Frame f2); -#endif- \ No newline at end of file +#endif diff --git a/TapestryEngine/AnimationGraph.cpp b/TapestryEngine/AnimationGraph.cpp @@ -119,18 +119,14 @@ Frame* AnimGraph::UpdateAnimation() else { mState = *mActorState; - return &mCurrentFrame; } } - else + for (int i = 0; i < (int)mAGD->mLoopsAnimIDs.size(); i++) { - for (int i = 0; i < (int)mAGD->mLoopsAnimIDs.size(); i++) + if (mAGD->mLoopsAnimIDs.at(i) == mState) { - if (mAGD->mLoopsAnimIDs.at(i) == mState) - { - mCurrentFrame = mAnimPack.ActivateAnimation(mAGD->mLoopsAnimIDs.at(i))->GetCurrentFrame(); - return &mCurrentFrame; - } + mCurrentFrame = mAnimPack.ActivateAnimation(mAGD->mLoopsAnimIDs.at(i))->GetCurrentFrame(); + return &mCurrentFrame; } } return NULL; @@ -154,4 +150,4 @@ bool AnimGraph::EventProcess(Event eve) gCons->ConsPrintf("Animation Graph asked to process unrecgonized event\n"); return false; } -}- \ No newline at end of file +} diff --git a/TapestryEngine/BinaryTree.h b/TapestryEngine/BinaryTree.h @@ -1,8 +1,8 @@ #ifndef BINARY_TREE_H #define BINARY_TREE_H -#define NULL 0 - +//#define NULL 0 +#include <cstddef> class Node { @@ -193,4 +193,4 @@ protected: Node* mRoot; }; -#endif- \ No newline at end of file +#endif diff --git a/TapestryEngine/Console.cpp b/TapestryEngine/Console.cpp @@ -54,7 +54,7 @@ void ConsoleStringManager::ConsolePrintf(char* fmt, ...) ConsoleLog(msgf); } -Console::Console(char* filename, int ptsize, SDL_Color Text, SDL_Color BG) +Console::Console(const char* filename, int ptsize, SDL_Color Text, SDL_Color BG) { mTextRect.w = 0; mTextRect.h = 0; @@ -72,7 +72,7 @@ Console::Console(char* filename, int ptsize, SDL_Color Text, SDL_Color BG) mBG = BG; } -void Console::ConsPrintf(char* fmt, ...) +void Console::ConsPrintf(const char* fmt, ...) { char msgf[256]; @@ -180,4 +180,4 @@ void Console::DrawConsoleReadout(SDL_Renderer* ren, int x, int y) SDL_DestroyTexture(LineTex); } } -}- \ No newline at end of file +} diff --git a/TapestryEngine/Console.h b/TapestryEngine/Console.h @@ -45,9 +45,9 @@ class Console public: Console() {} - Console(char* filename, int ptsize, SDL_Color Text, SDL_Color BG); + Console(const char* filename, int ptsize, SDL_Color Text, SDL_Color BG); - void ConsPrintf(char* fmt, ...); + void ConsPrintf(const char* fmt, ...); void DrawConsole(SDL_Renderer* ren); @@ -65,4 +65,4 @@ protected: extern Console* gCons; -#endif- \ No newline at end of file +#endif diff --git a/TapestryEngine/Context.cpp b/TapestryEngine/Context.cpp @@ -1,13 +1,13 @@ #include "Context.h" -bool ContextManager::LogContext(Context* con, char* name) +bool ContextManager::LogContext(Context* con, const char* name) { mContexts.push_back(con); mNames.push_back(name); return false; } -bool ContextManager::LoadContext(char* ContextName) +bool ContextManager::LoadContext(const char* ContextName) { for (int i = 0; i < (int)mNames.size(); i++) { diff --git a/TapestryEngine/Context.h b/TapestryEngine/Context.h @@ -29,11 +29,11 @@ public: ContextManager() {} - ContextManager(char* GameDataPath) : mGameDataPath(GameDataPath) {} + ContextManager(const char* GameDataPath) : mGameDataPath(GameDataPath) {} - bool LogContext(Context* con, char* name); + bool LogContext(Context* con, const char* name); - bool LoadContext(char* ContextName); + bool LoadContext(const char* ContextName); bool ContextUpdate(); @@ -41,10 +41,10 @@ public: protected: - char* mGameDataPath; + const char* mGameDataPath; Context* mActiveContext; std::vector<Context*> mContexts; - std::vector<char*> mNames; + std::vector<const char*> mNames; }; diff --git a/TapestryEngine/Debug/Actor.obj b/TapestryEngine/Debug/Actor.obj Binary files differ. diff --git a/TapestryEngine/Debug/ActorCollision.obj b/TapestryEngine/Debug/ActorCollision.obj Binary files differ. diff --git a/TapestryEngine/Debug/ActorHandle.obj b/TapestryEngine/Debug/ActorHandle.obj Binary files differ. diff --git a/TapestryEngine/Debug/Animation.obj b/TapestryEngine/Debug/Animation.obj Binary files differ. diff --git a/TapestryEngine/Debug/AnimationGraph.obj b/TapestryEngine/Debug/AnimationGraph.obj Binary files differ. diff --git a/TapestryEngine/Debug/BinaryTree.obj b/TapestryEngine/Debug/BinaryTree.obj Binary files differ. diff --git a/TapestryEngine/Debug/Camera.obj b/TapestryEngine/Debug/Camera.obj Binary files differ. diff --git a/TapestryEngine/Debug/Console.obj b/TapestryEngine/Debug/Console.obj Binary files differ. diff --git a/TapestryEngine/Debug/Context.obj b/TapestryEngine/Debug/Context.obj Binary files differ. diff --git a/TapestryEngine/Debug/DiagnosticDraw.obj b/TapestryEngine/Debug/DiagnosticDraw.obj Binary files differ. diff --git a/TapestryEngine/Debug/Dialogue.obj b/TapestryEngine/Debug/Dialogue.obj Binary files differ. diff --git a/TapestryEngine/Debug/Emitter.obj b/TapestryEngine/Debug/Emitter.obj Binary files differ. diff --git a/TapestryEngine/Debug/Event.obj b/TapestryEngine/Debug/Event.obj Binary files differ. diff --git a/TapestryEngine/Debug/HUD.obj b/TapestryEngine/Debug/HUD.obj Binary files differ. diff --git a/TapestryEngine/Debug/Input.obj b/TapestryEngine/Debug/Input.obj Binary files differ. diff --git a/TapestryEngine/Debug/Layer.obj b/TapestryEngine/Debug/Layer.obj Binary files differ. diff --git a/TapestryEngine/Debug/Level.obj b/TapestryEngine/Debug/Level.obj Binary files differ. diff --git a/TapestryEngine/Debug/Loading.obj b/TapestryEngine/Debug/Loading.obj Binary files differ. diff --git a/TapestryEngine/Debug/Main.obj b/TapestryEngine/Debug/Main.obj Binary files differ. diff --git a/TapestryEngine/Debug/Mapper.obj b/TapestryEngine/Debug/Mapper.obj Binary files differ. diff --git a/TapestryEngine/Debug/MiscDraw.obj b/TapestryEngine/Debug/MiscDraw.obj Binary files differ. diff --git a/TapestryEngine/Debug/Particle.obj b/TapestryEngine/Debug/Particle.obj Binary files differ. diff --git a/TapestryEngine/Debug/Physics.obj b/TapestryEngine/Debug/Physics.obj Binary files differ. diff --git a/TapestryEngine/Debug/Sequence.obj b/TapestryEngine/Debug/Sequence.obj Binary files differ. diff --git a/TapestryEngine/Debug/TapestryEngine.Build.CppClean.log b/TapestryEngine/Debug/TapestryEngine.Build.CppClean.log @@ -1,41 +0,0 @@ -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\vc140.pdb -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\vc140.idb -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\context.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\diagnosticdraw.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\dialogue.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\emitter.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\event.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\hud.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\input.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\layer.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\level.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\loading.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\main.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\mapper.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\miscdraw.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\particle.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\physics.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\sequence.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\sound.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\symbol.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\terrain.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\utils.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\actor.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\actorcollision.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\actorhandle.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\animation.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\animationgraph.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\binarytree.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\bones.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\camera.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\cjson.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\console.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\debug\tapestryengine.ilk -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\debug\tapestryengine.exe -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\debug\tapestryengine.pdb -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\tapestryengine.tlog\cl.command.1.tlog -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\tapestryengine.tlog\cl.read.1.tlog -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\tapestryengine.tlog\cl.write.1.tlog -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\tapestryengine.tlog\link.command.1.tlog -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\tapestryengine.tlog\link.read.1.tlog -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\debug\tapestryengine.tlog\link.write.1.tlog diff --git a/TapestryEngine/Debug/TapestryEngine.log b/TapestryEngine/Debug/TapestryEngine.log @@ -1,3 +0,0 @@ - Main.cpp - TapestryEngine.vcxproj -> C:\Users\baptistac1\Documents\Visual Studio 2015\Projects\TapestryEngineDev\Debug\TapestryEngine.exe - TapestryEngine.vcxproj -> C:\Users\baptistac1\Documents\Visual Studio 2015\Projects\TapestryEngineDev\Debug\TapestryEngine.pdb (Full PDB) diff --git a/TapestryEngine/Debug/TapestryEngine.tlog/CL.command.1.tlog b/TapestryEngine/Debug/TapestryEngine.tlog/CL.command.1.tlog Binary files differ. diff --git a/TapestryEngine/Debug/TapestryEngine.tlog/CL.read.1.tlog b/TapestryEngine/Debug/TapestryEngine.tlog/CL.read.1.tlog Binary files differ. diff --git a/TapestryEngine/Debug/TapestryEngine.tlog/CL.write.1.tlog b/TapestryEngine/Debug/TapestryEngine.tlog/CL.write.1.tlog Binary files differ. diff --git a/TapestryEngine/Debug/TapestryEngine.tlog/TapestryEngine.lastbuildstate b/TapestryEngine/Debug/TapestryEngine.tlog/TapestryEngine.lastbuildstate @@ -1,2 +0,0 @@ -#TargetFrameworkVersion=v4.0:PlatformToolSet=v140:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=8.1 -Debug|Win32|C:\Users\baptistac1\Documents\Visual Studio 2015\Projects\TapestryEngineDev\| diff --git a/TapestryEngine/Debug/TapestryEngine.tlog/link.command.1.tlog b/TapestryEngine/Debug/TapestryEngine.tlog/link.command.1.tlog Binary files differ. diff --git a/TapestryEngine/Debug/TapestryEngine.tlog/link.read.1.tlog b/TapestryEngine/Debug/TapestryEngine.tlog/link.read.1.tlog Binary files differ. diff --git a/TapestryEngine/Debug/TapestryEngine.tlog/link.write.1.tlog b/TapestryEngine/Debug/TapestryEngine.tlog/link.write.1.tlog Binary files differ. diff --git a/TapestryEngine/Debug/Terrain.obj b/TapestryEngine/Debug/Terrain.obj Binary files differ. diff --git a/TapestryEngine/Debug/Utils.obj b/TapestryEngine/Debug/Utils.obj Binary files differ. diff --git a/TapestryEngine/Debug/bones.obj b/TapestryEngine/Debug/bones.obj Binary files differ. diff --git a/TapestryEngine/Debug/cJSON.obj b/TapestryEngine/Debug/cJSON.obj Binary files differ. diff --git a/TapestryEngine/Debug/sound.obj b/TapestryEngine/Debug/sound.obj Binary files differ. diff --git a/TapestryEngine/Debug/symbol.obj b/TapestryEngine/Debug/symbol.obj Binary files differ. diff --git a/TapestryEngine/Debug/vc140.idb b/TapestryEngine/Debug/vc140.idb Binary files differ. diff --git a/TapestryEngine/Debug/vc140.pdb b/TapestryEngine/Debug/vc140.pdb Binary files differ. diff --git a/TapestryEngine/DiagnosticDraw.h b/TapestryEngine/DiagnosticDraw.h @@ -50,4 +50,4 @@ protected: extern DiagnosticDraw* gDiagDraw; -#endif- \ No newline at end of file +#endif diff --git a/TapestryEngine/Dialogue.cpp b/TapestryEngine/Dialogue.cpp @@ -1,6 +1,6 @@ #include "Dialogue.h" -Dialogue::Dialogue(SDL_Rect pos, SDL_Renderer* ren, char* font, char* text_box, SDL_Color fore, EventReceiver* player) : Widget(ren, pos), mText_Color(fore) +Dialogue::Dialogue(SDL_Rect pos, SDL_Renderer* ren, const char* font, char* text_box, SDL_Color fore, EventReceiver* player) : Widget(ren, pos), mText_Color(fore) { mPlayer = player; @@ -19,7 +19,7 @@ Dialogue::Dialogue(SDL_Rect pos, SDL_Renderer* ren, char* font, char* text_box, mline2 = 1; } -bool Dialogue::TextWrap(int text_pix_max, char* str) +bool Dialogue::TextWrap(int text_pix_max, const char* str) { int text_pix = -1; diff --git a/TapestryEngine/Dialogue.h b/TapestryEngine/Dialogue.h @@ -21,9 +21,9 @@ public: Dialogue() {} - Dialogue(SDL_Rect pos, SDL_Renderer* ren, char* font, char* text_box, SDL_Color fore, EventReceiver* player); + Dialogue(SDL_Rect pos, SDL_Renderer* ren, const char* font, char* text_box, SDL_Color fore, EventReceiver* player); - bool TextWrap(int text_pix_max, char* str); + bool TextWrap(int text_pix_max, const char* str); bool DialoguePrint(); @@ -50,4 +50,4 @@ protected: WidgetElement mText_box; }; -#endif- \ No newline at end of file +#endif diff --git a/TapestryEngine/Event.h b/TapestryEngine/Event.h @@ -78,13 +78,13 @@ struct PointSpawnData { int x; int y; - char* name; - char* type; + const char* name; + const char* type; }; struct DialogueData { - char* str; + const char* str; int talkerID; }; @@ -106,7 +106,7 @@ union EventData int i; void* p; bool b; - char* str; + const char* str; SDL_Rect* rect; SensorData sd; SensorResponse sr; @@ -139,7 +139,7 @@ public: mEvData.p = P; } - Event(EventType EvType, char* str) : mType(EvType), mReturnAddress(NULL) + Event(EventType EvType, const char* str) : mType(EvType), mReturnAddress(NULL) { mEvData.str = str; } @@ -157,7 +157,7 @@ public: mEvData.sr.id = ID; } - Event(EventType EvType, char* type, char* name, int x, int y) : mType(EvType), mReturnAddress(NULL) + Event(EventType EvType, const char* type, const char* name, int x, int y) : mType(EvType), mReturnAddress(NULL) { mEvData.psd.x = x; mEvData.psd.y = y; @@ -165,7 +165,7 @@ public: mEvData.psd.type = type; } - Event(EventType EvType, char* str, int talkID) : mType(EvType), mReturnAddress(NULL) + Event(EventType EvType, const char* str, int talkID) : mType(EvType), mReturnAddress(NULL) { mEvData.dd.str = str; mEvData.dd.talkerID = talkID; @@ -242,4 +242,4 @@ public: protected: }; -#endif- \ No newline at end of file +#endif diff --git a/TapestryEngine/HUD.cpp b/TapestryEngine/HUD.cpp @@ -1,11 +1,9 @@ #include "HUD.h" -SDL_Rect CalcElementScreenPosition(Widget* wid, SDL_Rect elementRect) +void CalcElementScreenPosition(Widget* wid, SDL_Rect elementRect) { elementRect.x += wid->GetPos()->x; elementRect.y += wid->GetPos()->y; - - return elementRect; }; bool HUD::LogWidget(Widget* wid) @@ -58,7 +56,8 @@ bool LifeMeter::WidgetUpdate() bool LifeMeter::WidgetDraw() { SDL_RenderCopy(mren, mBase.img, NULL, &mBase.pos); - SDL_RenderCopy(mren, mLifebar.img, NULL, &CalcElementScreenPosition(this, mLifebar.pos) ); + CalcElementScreenPosition(this, mLifebar.pos); + SDL_RenderCopy(mren, mLifebar.img, NULL, &mLifebar.pos); return true; } // @@ -145,4 +144,4 @@ bool Fader::EventProcess(Event eve) } return true; } -//- \ No newline at end of file +// diff --git a/TapestryEngine/HUD.h b/TapestryEngine/HUD.h @@ -41,7 +41,7 @@ protected: }; -SDL_Rect CalcElementScreenPosition(Widget* wid, SDL_Rect elementRect); +void CalcElementScreenPosition(Widget* wid, SDL_Rect elementRect); class LifeMeter : public Widget { @@ -112,4 +112,4 @@ protected: -#endif- \ No newline at end of file +#endif diff --git a/TapestryEngine/Level.cpp b/TapestryEngine/Level.cpp @@ -1,6 +1,6 @@ #include "Level.h" -Actor* FindRef(std::vector<ActorName*> refs, char* name) +Actor* FindRef(std::vector<ActorName*> refs, const char* name) { for (int i = 0; i < (int)refs.size(); i++) { @@ -247,6 +247,9 @@ bool Level::LoadActors(cJSON* level) for (int i = 0; i < cJSON_GetArraySize(actors); i++) { + for (int z = 0; z < mCast.size(); z++) { + *mCast.at(z); + } cJSON* act = cJSON_GetArrayItem(actors, i); char* anim_pack = cJSON_GetObjectItem(act, "anim_pack")->valuestring; @@ -260,11 +263,9 @@ bool Level::LoadActors(cJSON* level) actor_pack = new AnimGraph(mAnimGraphs.at(j)); } } -#ifdef DEBUG + assert(actor_pack != NULL); -#endif - SDL_Rect PosRect; PosRect.x = cJSON_GetObjectItem(act, "x")->valueint; PosRect.y = cJSON_GetObjectItem(act, "y")->valueint; @@ -416,7 +417,7 @@ bool Level::LoadActors(cJSON* level) } ActorRefs.push_back(ref); } - + return true; } @@ -575,6 +576,9 @@ bool Level::Load(const char* filename) bool Level::Update() { + int f = 0; + f++; + ///Update Actors for (int i = 0; i < (int)(mCast.size()); i++) { @@ -640,4 +644,4 @@ bool Level::Update() bool Level::EventProcess(Event eve) { return true; -}- \ No newline at end of file +} diff --git a/TapestryEngine/Level.h b/TapestryEngine/Level.h @@ -23,7 +23,7 @@ struct ActorName Actor* act; }; -Actor* FindRef(std::vector<ActorName*> refs, char* name); +Actor* FindRef(std::vector<ActorName*> refs, const char* name); class Level : public Context, public EventReceiver { diff --git a/TapestryEngine/Main.cpp b/TapestryEngine/Main.cpp @@ -14,12 +14,15 @@ #include "BinaryTree.h" //remove later -FILE _iob[] = { *stdin, *stdout, *stderr }; -extern "C" FILE * __cdecl __iob_func(void) -{ - return _iob; -} +//Some hack I needed for visual studio, I don't understand it +// +//FILE _iob[] = { *stdin, *stdout, *stderr }; +// +//extern "C" FILE * __cdecl __iob_func(void) +//{ +// return _iob; +//} int main(int argc, char *argv[]) { @@ -184,4 +187,4 @@ int main(int argc, char *argv[]) SDL_DestroyWindow(window); SDL_Quit(); return 0; -}- \ No newline at end of file +} diff --git a/TapestryEngine/Mapper.cpp b/TapestryEngine/Mapper.cpp @@ -221,7 +221,7 @@ SDL_Surface* Mapper::NewMap(int h, int w) if (mMap->format->format != SDL_PIXELFORMAT_INDEX8) { gCons->ConsPrintf("Non-INDEX8 Collision Map Detected\n"); - return false; + return NULL; } Uint8* PixMap = (Uint8*)mMap->pixels; @@ -246,4 +246,4 @@ SDL_Surface* Mapper::NewMap(int h, int w) SDL_Surface* Mapper::GenerateMap(int h, int w) { return NewMap(h, w); -}- \ No newline at end of file +} diff --git a/TapestryEngine/Mapper.h b/TapestryEngine/Mapper.h @@ -135,4 +135,4 @@ protected: int mFeatureIndex; }; -#endif- \ No newline at end of file +#endif diff --git a/TapestryEngine/MiscDraw.cpp b/TapestryEngine/MiscDraw.cpp @@ -40,7 +40,7 @@ SDL_Rect DrawActor(SDL_Renderer* ren, Actor& act, Camera cam) Frame* RenderFrame = act.GetFrame(); - if (RenderFrame != NULL) + if (RenderFrame != NULL) //TODO:This doesn't actually gaurd the way it should { SDL_RendererFlip flip; flip = (SDL_RendererFlip)act.GetDir(); diff --git a/TapestryEngine/Particle.cpp b/TapestryEngine/Particle.cpp @@ -2,7 +2,7 @@ #include "Emitter.h" //Manager Functions -bool ParticleManager::SpawnParticle(char* type, char* name, int x, int y, ParticleTypeData ptdata) +bool ParticleManager::SpawnParticle(const char* type, const char* name, int x, int y, ParticleTypeData ptdata) { ParticleData* pd = GetParticleData(name); diff --git a/TapestryEngine/Particle.h b/TapestryEngine/Particle.h @@ -107,7 +107,7 @@ public: return true; } - ParticleData* GetParticleData(char* name) + ParticleData* GetParticleData(const char* name) { for (int i = 0; i < (int)mParticleData.size(); i++) { @@ -119,7 +119,7 @@ public: return NULL; } - bool SpawnParticle(char* type, char* name, int x, int y, ParticleTypeData ptdata = NullPTdata() ); + bool SpawnParticle(const char* type, const char* name, int x, int y, ParticleTypeData ptdata = NullPTdata() ); bool ClearParticle(Particle* prt); @@ -140,4 +140,4 @@ protected: int particlesKilled; }; -#endif- \ No newline at end of file +#endif diff --git a/TapestryEngine/Release/Actor.obj b/TapestryEngine/Release/Actor.obj Binary files differ. diff --git a/TapestryEngine/Release/ActorCollision.obj b/TapestryEngine/Release/ActorCollision.obj Binary files differ. diff --git a/TapestryEngine/Release/ActorHandle.obj b/TapestryEngine/Release/ActorHandle.obj Binary files differ. diff --git a/TapestryEngine/Release/Animation.obj b/TapestryEngine/Release/Animation.obj Binary files differ. diff --git a/TapestryEngine/Release/AnimationGraph.obj b/TapestryEngine/Release/AnimationGraph.obj Binary files differ. diff --git a/TapestryEngine/Release/BinaryTree.obj b/TapestryEngine/Release/BinaryTree.obj Binary files differ. diff --git a/TapestryEngine/Release/Camera.obj b/TapestryEngine/Release/Camera.obj Binary files differ. diff --git a/TapestryEngine/Release/Console.obj b/TapestryEngine/Release/Console.obj Binary files differ. diff --git a/TapestryEngine/Release/Context.obj b/TapestryEngine/Release/Context.obj Binary files differ. diff --git a/TapestryEngine/Release/DiagnosticDraw.obj b/TapestryEngine/Release/DiagnosticDraw.obj Binary files differ. diff --git a/TapestryEngine/Release/Dialogue.obj b/TapestryEngine/Release/Dialogue.obj Binary files differ. diff --git a/TapestryEngine/Release/Emitter.obj b/TapestryEngine/Release/Emitter.obj Binary files differ. diff --git a/TapestryEngine/Release/Event.obj b/TapestryEngine/Release/Event.obj Binary files differ. diff --git a/TapestryEngine/Release/HUD.obj b/TapestryEngine/Release/HUD.obj Binary files differ. diff --git a/TapestryEngine/Release/Input.obj b/TapestryEngine/Release/Input.obj Binary files differ. diff --git a/TapestryEngine/Release/Layer.obj b/TapestryEngine/Release/Layer.obj Binary files differ. diff --git a/TapestryEngine/Release/Level.obj b/TapestryEngine/Release/Level.obj Binary files differ. diff --git a/TapestryEngine/Release/Loading.obj b/TapestryEngine/Release/Loading.obj Binary files differ. diff --git a/TapestryEngine/Release/Main.obj b/TapestryEngine/Release/Main.obj Binary files differ. diff --git a/TapestryEngine/Release/MiscDraw.obj b/TapestryEngine/Release/MiscDraw.obj Binary files differ. diff --git a/TapestryEngine/Release/Particle.obj b/TapestryEngine/Release/Particle.obj Binary files differ. diff --git a/TapestryEngine/Release/Physics.obj b/TapestryEngine/Release/Physics.obj Binary files differ. diff --git a/TapestryEngine/Release/Sequence.obj b/TapestryEngine/Release/Sequence.obj Binary files differ. diff --git a/TapestryEngine/Release/TapestryEngine.Build.CppClean.log b/TapestryEngine/Release/TapestryEngine.Build.CppClean.log @@ -1,39 +0,0 @@ -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\vc140.pdb -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\main.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\loading.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\level.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\layer.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\input.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\hud.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\event.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\emitter.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\dialogue.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\diagnosticdraw.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\context.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\console.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\cjson.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\camera.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\binarytree.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\animationgraph.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\animation.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\actorhandle.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\actorcollision.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\actor.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\utils.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\terrain.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\symbol.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\sound.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\sequence.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\physics.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\particle.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\miscdraw.obj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\release\tapestryengine.exe -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\release\tapestryengine.ipdb -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\release\tapestryengine.iobj -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\release\tapestryengine.pdb -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\tapestryengine.tlog\cl.command.1.tlog -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\tapestryengine.tlog\cl.read.1.tlog -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\tapestryengine.tlog\cl.write.1.tlog -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\tapestryengine.tlog\link.command.1.tlog -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\tapestryengine.tlog\link.read.1.tlog -c:\users\baptistac1\documents\visual studio 2015\projects\tapestryenginedev\tapestryengine\release\tapestryengine.tlog\link.write.1.tlog diff --git a/TapestryEngine/Release/TapestryEngine.log b/TapestryEngine/Release/TapestryEngine.log @@ -1,35 +0,0 @@ - Actor.cpp - ActorCollision.cpp - ActorHandle.cpp - Animation.cpp - AnimationGraph.cpp - BinaryTree.cpp - Camera.cpp - cJSON.cpp - Console.cpp - Context.cpp - DiagnosticDraw.cpp - Dialogue.cpp - Emitter.cpp - Event.cpp - HUD.cpp - Input.cpp - Layer.cpp - Level.cpp - Loading.cpp - Main.cpp - Compiling... - MiscDraw.cpp - Particle.cpp - Physics.cpp - Sequence.cpp - sound.cpp - symbol.cpp - Terrain.cpp - Utils.cpp - Generating code - All 1910 functions were compiled because no usable IPDB/IOBJ from previous compilation was found. - Finished generating code -SDL2main.lib(SDL_windows_main.obj) : warning LNK4049: locally defined symbol ___iob_func imported - TapestryEngine.vcxproj -> C:\Users\baptistac1\Documents\Visual Studio 2015\Projects\TapestryEngineDev\Release\TapestryEngine.exe - TapestryEngine.vcxproj -> C:\Users\baptistac1\Documents\Visual Studio 2015\Projects\TapestryEngineDev\Release\TapestryEngine.pdb (Full PDB) diff --git a/TapestryEngine/Release/TapestryEngine.tlog/CL.command.1.tlog b/TapestryEngine/Release/TapestryEngine.tlog/CL.command.1.tlog Binary files differ. diff --git a/TapestryEngine/Release/TapestryEngine.tlog/CL.read.1.tlog b/TapestryEngine/Release/TapestryEngine.tlog/CL.read.1.tlog Binary files differ. diff --git a/TapestryEngine/Release/TapestryEngine.tlog/CL.write.1.tlog b/TapestryEngine/Release/TapestryEngine.tlog/CL.write.1.tlog Binary files differ. diff --git a/TapestryEngine/Release/TapestryEngine.tlog/TapestryEngine.lastbuildstate b/TapestryEngine/Release/TapestryEngine.tlog/TapestryEngine.lastbuildstate @@ -1,2 +0,0 @@ -#TargetFrameworkVersion=v4.0:PlatformToolSet=v140:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=8.1 -Release|Win32|C:\Users\baptistac1\Documents\Visual Studio 2015\Projects\TapestryEngineDev\| diff --git a/TapestryEngine/Release/TapestryEngine.tlog/link.command.1.tlog b/TapestryEngine/Release/TapestryEngine.tlog/link.command.1.tlog Binary files differ. diff --git a/TapestryEngine/Release/TapestryEngine.tlog/link.read.1.tlog b/TapestryEngine/Release/TapestryEngine.tlog/link.read.1.tlog Binary files differ. diff --git a/TapestryEngine/Release/TapestryEngine.tlog/link.write.1.tlog b/TapestryEngine/Release/TapestryEngine.tlog/link.write.1.tlog Binary files differ. diff --git a/TapestryEngine/Release/Terrain.obj b/TapestryEngine/Release/Terrain.obj Binary files differ. diff --git a/TapestryEngine/Release/Utils.obj b/TapestryEngine/Release/Utils.obj Binary files differ. diff --git a/TapestryEngine/Release/cJSON.obj b/TapestryEngine/Release/cJSON.obj Binary files differ. diff --git a/TapestryEngine/Release/sound.obj b/TapestryEngine/Release/sound.obj Binary files differ. diff --git a/TapestryEngine/Release/symbol.obj b/TapestryEngine/Release/symbol.obj Binary files differ. diff --git a/TapestryEngine/Release/vc140.pdb b/TapestryEngine/Release/vc140.pdb Binary files differ. diff --git a/TapestryEngine/SDL2.dll b/TapestryEngine/SDL2.dll Binary files differ. diff --git a/TapestryEngine/SDL2_mixer.dll b/TapestryEngine/SDL2_mixer.dll Binary files differ. diff --git a/TapestryEngine/SDL2_ttf.dll b/TapestryEngine/SDL2_ttf.dll Binary files differ. diff --git a/TapestryEngine/TapestryEngine.vcxproj b/TapestryEngine/TapestryEngine.vcxproj @@ -1,152 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{7BB3F3F9-5600-4309-A1DA-D14BA7B40E91}</ProjectGuid> - <RootNamespace>TapestryEngine</RootNamespace> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v140</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>MultiByte</CharacterSet> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <IncludePath>C:\SDL2_ttf-2.0.12\include;C:\Users\baptistac1\Documents\Visual Studio 2015\Projects\SDL2-2.0.4\include;C:\SDL2_mixer-devel-2.0.1-VC\SDL2_mixer-2.0.1\include;$(IncludePath)</IncludePath> - <LibraryPath>C:\SDL2_mixer-devel-2.0.1-VC\SDL2_mixer-2.0.1\lib\x86;C:\SDL2_ttf-2.0.12\lib\x64;C:\Users\baptistac1\Documents\Visual Studio 2015\Projects\SDL2-2.0.4\VisualC\Win32\Release;$(LibraryPath)</LibraryPath> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <IncludePath>C:\SDL2_ttf-2.0.12\include;C:\SDL2-2.0.3\include;$(IncludePath)</IncludePath> - <LibraryPath>C:\SDL2_ttf-2.0.12\lib\x64;C:\SDL2-2.0.3\lib\x64;$(LibraryPath)</LibraryPath> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <SDLCheck>true</SDLCheck> - <AdditionalIncludeDirectories>C:\Users\baptistac1\Documents\Visual Studio 2015\Projects\SDL2-2.0.4\include;C:\SDL2_ttf-2.0.12\include;C:\SDL2_mixer-devel-2.0.1-VC\SDL2_mixer-2.0.1\include;C:\glm;C:\VulkanSDK\1.1.73.0\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <AdditionalLibraryDirectories>C:\VulkanSDK\1.1.73.0\Lib32;C:\SDL2_mixer-devel-2.0.1-VC\SDL2_mixer-2.0.1\lib\x86;C:\SDL2_ttf-2.0.12\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <AdditionalDependencies>SDL2main.lib;SDL2.lib;SDL2_mixer.lib;SDL2test.lib;SDL2_ttf.lib;vulkan-1.lib;%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <SDLCheck>true</SDLCheck> - <AdditionalIncludeDirectories>C:\SDL2-2.0.3\include;C:\SDL2_mixer-devel-2.0.1-VC\SDL2_mixer-2.0.1\include;C:\SDL2_ttf-2.0.12\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <AdditionalLibraryDirectories>C:\SDL2-2.0.3\lib\x86;C:\SDL2_mixer-devel-2.0.1-VC\SDL2_mixer-2.0.1\lib\x86;C:\SDL2_ttf-2.0.12\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <AdditionalDependencies>SDL2main.lib;SDL2.lib;SDL2test.lib;SDL2_ttf.lib;SDL2_mixer.lib;legacy_stdio_definitions.lib;%(AdditionalDependencies)</AdditionalDependencies> - <SubSystem>Windows</SubSystem> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="Actor.cpp" /> - <ClCompile Include="ActorCollision.cpp" /> - <ClCompile Include="ActorHandle.cpp" /> - <ClCompile Include="Animation.cpp" /> - <ClCompile Include="AnimationGraph.cpp" /> - <ClCompile Include="BinaryTree.cpp" /> - <ClCompile Include="bones.cpp" /> - <ClCompile Include="Camera.cpp" /> - <ClCompile Include="cJSON.cpp" /> - <ClCompile Include="Console.cpp" /> - <ClCompile Include="Context.cpp" /> - <ClCompile Include="DiagnosticDraw.cpp" /> - <ClCompile Include="Dialogue.cpp" /> - <ClCompile Include="Emitter.cpp" /> - <ClCompile Include="Event.cpp" /> - <ClCompile Include="HUD.cpp" /> - <ClCompile Include="Input.cpp" /> - <ClCompile Include="Layer.cpp" /> - <ClCompile Include="Level.cpp" /> - <ClCompile Include="Loading.cpp" /> - <ClCompile Include="Main.cpp" /> - <ClCompile Include="Mapper.cpp" /> - <ClCompile Include="MiscDraw.cpp" /> - <ClCompile Include="Particle.cpp" /> - <ClCompile Include="Physics.cpp" /> - <ClCompile Include="Sequence.cpp" /> - <ClCompile Include="sound.cpp" /> - <ClCompile Include="symbol.cpp" /> - <ClCompile Include="Terrain.cpp" /> - <ClCompile Include="Utils.cpp"> - <RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MultiThreadedDebugDLL</RuntimeLibrary> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="Actor.h" /> - <ClInclude Include="ActorCollision.h" /> - <ClInclude Include="ActorHandle.h" /> - <ClInclude Include="Animation.h" /> - <ClInclude Include="AnimationGraph.h" /> - <ClInclude Include="BinaryTree.h" /> - <ClInclude Include="bones.h" /> - <ClInclude Include="Camera.h" /> - <ClInclude Include="cJSON.h" /> - <ClInclude Include="Console.h" /> - <ClInclude Include="Context.h" /> - <ClInclude Include="DiagnosticDraw.h" /> - <ClInclude Include="Dialogue.h" /> - <ClInclude Include="Emitter.h" /> - <ClInclude Include="Event.h" /> - <ClInclude Include="HUD.h" /> - <ClInclude Include="Input.h" /> - <ClInclude Include="Layer.h" /> - <ClInclude Include="Level.h" /> - <ClInclude Include="Loading.h" /> - <ClInclude Include="Mapper.h" /> - <ClInclude Include="MiscDraw.h" /> - <ClInclude Include="Particle.h" /> - <ClInclude Include="Physics.h" /> - <ClInclude Include="Sequence.h" /> - <ClInclude Include="sound.h" /> - <ClInclude Include="symbol.h" /> - <ClInclude Include="Terrain.h" /> - <ClInclude Include="Utils.h" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>- \ No newline at end of file diff --git a/TapestryEngine/TapestryEngine.vcxproj.filters b/TapestryEngine/TapestryEngine.vcxproj.filters @@ -1,198 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="Source Files"> - <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> - <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> - </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions> - </Filter> - <Filter Include="Resource Files"> - <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> - <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="Animation.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="Camera.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="Console.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="MiscDraw.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="Terrain.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="Utils.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="Actor.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="Event.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="Physics.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="Input.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="DiagnosticDraw.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="ActorCollision.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="Main.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="Level.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="cJSON.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="symbol.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="Particle.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="sound.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="HUD.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="Sequence.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="Context.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="Loading.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="AnimationGraph.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="Layer.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="Emitter.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="Dialogue.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="ActorHandle.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="BinaryTree.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="bones.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="Mapper.cpp"> - <Filter>Source Files</Filter> - </ClCompile> - </ItemGroup> - <ItemGroup> - <ClInclude Include="Actor.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Animation.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Camera.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Console.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="MiscDraw.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Terrain.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Utils.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Event.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Physics.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Input.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="ActorCollision.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="DiagnosticDraw.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Level.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="cJSON.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="symbol.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Particle.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="sound.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="HUD.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Sequence.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Context.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Loading.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="AnimationGraph.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Layer.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Emitter.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Dialogue.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="ActorHandle.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="BinaryTree.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="bones.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="Mapper.h"> - <Filter>Header Files</Filter> - </ClInclude> - </ItemGroup> -</Project>- \ No newline at end of file diff --git a/TapestryEngine/TapestryEngine.vcxproj.user b/TapestryEngine/TapestryEngine.vcxproj.user @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <PropertyGroup /> -</Project>- \ No newline at end of file diff --git a/TapestryEngine/Utils.cpp b/TapestryEngine/Utils.cpp @@ -26,13 +26,14 @@ int GetRealTimeMS() //measures in milliseconds SDL_Surface* LoadSurfaceBMP(const char* filename) { -#ifdef DEBUG - char* basepath = "C:\\Users\\baptistac1\\Documents\\Visual Studio 2015\\Projects\\TapestryEngineDev\\TapestryEngine\\imgs\\"; -#endif +//#ifdef DEBUG +// char* basepath = "C:\\Users\\baptistac1\\Documents\\Visual Studio 2015\\Projects\\TapestryEngineDev\\TapestryEngine\\imgs\\"; +// const char* basepath = "/home/sebastian/projects/TapestryEngine/TapestryEngine/imgs/"; +//#endif -#ifdef RELEASE - char* basepath = ".\\imgs\\"; -#endif +//#ifdef RELEASE + const char* basepath = "./TapestryEngine/imgs/"; +//#endif char pathbuffer[1024]; strcpy(pathbuffer, basepath); @@ -48,15 +49,16 @@ SDL_Surface* LoadSurfaceBMP(const char* filename) return surface; } -TTF_Font* LoadFont(char* filename, int ptsize) +TTF_Font* LoadFont(const char* filename, int ptsize) { -#ifdef DEBUG - char* basepath = "C:\\Users\\baptistac1\\Documents\\Visual Studio 2015\\Projects\\TapestryEngineDev\\TapestryEngine\\fonts\\"; -#endif +//#ifdef DEBUG +// char* basepath = "C:\\Users\\baptistac1\\Documents\\Visual Studio 2015\\Projects\\TapestryEngineDev\\TapestryEngine\\fonts\\"; +// const char* basepath = "/home/sebastian/projects/TapestryEngine/TapestryEngine/fonts/"; +//#endif -#ifdef RELEASE - char* basepath = ".\\fonts\\"; -#endif +//#ifdef RELEASE + const char* basepath = "./TapestryEngine/fonts/"; +//#endif char pathbuffer[1024]; strcpy(pathbuffer, basepath); @@ -66,13 +68,6 @@ TTF_Font* LoadFont(char* filename, int ptsize) const char* error = TTF_GetError(); -// int msgboxID = MessageBox( -// NULL, -// (LPCSTR)error, -// (LPCSTR)L"Account Details", -// MB_ICONWARNING | MB_CANCELTRYCONTINUE | MB_DEFBUTTON2 -// ); - assert(font != NULL); //gCons->ConsPrintf(fullpath); @@ -81,13 +76,7 @@ TTF_Font* LoadFont(char* filename, int ptsize) } cJSON * LoadJSON(const char* filename) { -#ifdef DEBUG - char* basepath = "C:\\Users\\baptistac1\\Documents\\Visual Studio 2015\\Projects\\TapestryEngineDev\\TapestryEngine\\json\\"; -#endif - -#ifdef RELEASE - char* basepath = ".\\json\\"; -#endif + const char* basepath = "./TapestryEngine/json/"; char pathbuffer[1024]; strcpy(pathbuffer, basepath); @@ -232,4 +221,4 @@ bool IsEven(int i) //Not working alawys return true { return false; } -}- \ No newline at end of file +} diff --git a/TapestryEngine/Utils.h b/TapestryEngine/Utils.h @@ -13,13 +13,15 @@ #include <stdarg.h> #include <stdlib.h> #include <math.h> -#include <glm/vec4.hpp> -#include <glm/mat4x4.hpp> - -#include "cJSON.h" -#include "SDL.h" -#include "SDL_ttf.h" -#include "SDL_Mixer.h" +#include <sys/types.h> +#include<sys/stat.h> +//#include <glm/vec4.hpp> +//#include <glm/mat4x4.hpp> + +#include "cjson/cJSON.h" +#include "SDL2/SDL.h" +#include "SDL2/SDL_ttf.h" +#include "SDL2/SDL_mixer.h" #include "BinaryTree.h" //Terrain Defines @@ -42,8 +44,9 @@ // //Time Defines -#define MS_PER_FRAME 16 //this is normal speed -//#define MS_PER_FRAME 40 //useful slow speed +//#define MS_PER_FRAME 16 //60fps this is normal speed +//#define MS_PER_FRAME 32 //30fps +#define MS_PER_FRAME 48 //20fps keeps kolbo from huffing and puffing #define FRAMES_PER_SECOND (1/MS_PER_FRAME)*1000 //62.5 @16ms #define CLOCKS_PER_FRAME (CLOCKS_PER_SEC/FRAMES_PER_SECOND) @@ -170,7 +173,7 @@ int GetRealTimeMS(); SDL_Surface* LoadSurfaceBMP(const char* filename); -TTF_Font* LoadFont(char* file, int ptsize); +TTF_Font* LoadFont(const char* file, int ptsize); cJSON * LoadJSON(const char* filename); diff --git a/TapestryEngine/json/level_arid_land.json b/TapestryEngine/json/level_arid_land.json @@ -18,28 +18,28 @@ { "world_h": 900, "world_w": 4095, - "terrain" : "arid_land\\arid land_colmap.bmp", + "terrain" : "arid_land/arid land_colmap.bmp", "backgrounds" : [ - {"back" : "arid_land\\arid land_back_0.bmp" , "parallax_factor" : 5, "alpha" : 0 }, - {"back" : "arid_land\\arid land_back_1.bmp" , "parallax_factor" : 4, "alpha" : 0 }, - {"back" : "arid_land\\arid land_back_2.bmp" , "parallax_factor" : 3, "alpha" : 0 }, - {"back" : "arid_land\\arid land_back_transp_3.bmp", "parallax_factor" : 2, "alpha" : 75}, - {"back" : "arid_land\\arid land_back_4.bmp" , "parallax_factor" : 2, "alpha" : 0 } + {"back" : "arid_land/arid land_back_0.bmp" , "parallax_factor" : 5, "alpha" : 0 }, + {"back" : "arid_land/arid land_back_1.bmp" , "parallax_factor" : 4, "alpha" : 0 }, + {"back" : "arid_land/arid land_back_2.bmp" , "parallax_factor" : 3, "alpha" : 0 }, + {"back" : "arid_land/arid land_back_transp_3.bmp", "parallax_factor" : 2, "alpha" : 75}, + {"back" : "arid_land/arid land_back_4.bmp" , "parallax_factor" : 2, "alpha" : 0 } ], "foregrounds" : [ - {"fore" : "arid_land\\arid land_fore_0.bmp", "alpha" : 0}, - {"fore" : "arid_land\\arid land_fore_1.bmp", "alpha" : 0}, - {"fore" : "arid_land\\arid land_fore_2.bmp", "alpha" : 0}, - {"fore" : "arid_land\\arid land_fore_3.bmp", "alpha" : 0}, - {"fore" : "arid_land\\text.bmp", "alpha" : 0} + {"fore" : "arid_land/arid land_fore_0.bmp", "alpha" : 0}, + {"fore" : "arid_land/arid land_fore_1.bmp", "alpha" : 0}, + {"fore" : "arid_land/arid land_fore_2.bmp", "alpha" : 0}, + {"fore" : "arid_land/arid land_fore_3.bmp", "alpha" : 0}, + {"fore" : "arid_land/text.bmp", "alpha" : 0} ], "overlays" : [ - {"over" : "arid_land\\arid land_over_transp_0.bmp", "parallax_factor" : 1, "alpha" : 125}, - {"over" : "arid_land\\arid land_over_transp_1.bmp", "parallax_factor" : 1, "alpha" : 10}, - {"over" : "arid_land\\arid land_over_transp_2.bmp", "parallax_factor" : 1, "alpha" : 245} + {"over" : "arid_land/arid land_over_transp_0.bmp", "parallax_factor" : 1, "alpha" : 125}, + {"over" : "arid_land/arid land_over_transp_1.bmp", "parallax_factor" : 1, "alpha" : 10}, + {"over" : "arid_land/arid land_over_transp_2.bmp", "parallax_factor" : 1, "alpha" : 245} ] }, @@ -144,24 +144,24 @@ "col_data" : {"off_x" : -5, "off_y" : 0, "col_h" : 23, "col_w" : 6}, "anim_set": [ - {"filename" : "player\\player_idle_begin.bmp" , "frame_count" : 2 , "frame_rate" : 250, "id" : "IDLE_BEGIN" }, - {"filename" : "player\\player_idle_begin_drawn.bmp" , "frame_count" : 2 , "frame_rate" : 250, "id" : "IDLE_BEGIN_DRAWN" }, - {"filename" : "player\\player_idle.bmp" , "frame_count" : 6 , "frame_rate" : 275, "id" : "IDLE" }, - {"filename" : "player\\player_idle_drawn.bmp" , "frame_count" : 6 , "frame_rate" : 275, "id" : "IDLE_DRAWN" }, - {"filename" : "player\\player_jump.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP" }, - {"filename" : "player\\player_jump_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_DRAWN" }, - {"filename" : "player\\player_jump_to_fall.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_TO_FALL" }, - {"filename" : "player\\player_jump_to_fall_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_TO_FALL_DRAWN"}, - {"filename" : "player\\player_fall.bmp" , "frame_count" : 5 , "frame_rate" : 75, "id" : "FALL" }, - {"filename" : "player\\player_fall_drawn.bmp" , "frame_count" : 5 , "frame_rate" : 75, "id" : "FALL_DRAWN" }, - {"filename" : "player\\player_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN" }, - {"filename" : "player\\player_run_drawn.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN_DRAWN" }, - {"filename" : "player\\player_swim.bmp" , "frame_count" : 6, "frame_rate" : 50 , "id" : "SWIM" }, - {"filename" : "player\\player_swim_tread.bmp" , "frame_count" : 6, "frame_rate" : 80 , "id" : "TREAD" } + {"filename" : "player/player_idle_begin.bmp" , "frame_count" : 2 , "frame_rate" : 250, "id" : "IDLE_BEGIN" }, + {"filename" : "player/player_idle_begin_drawn.bmp" , "frame_count" : 2 , "frame_rate" : 250, "id" : "IDLE_BEGIN_DRAWN" }, + {"filename" : "player/player_idle.bmp" , "frame_count" : 6 , "frame_rate" : 275, "id" : "IDLE" }, + {"filename" : "player/player_idle_drawn.bmp" , "frame_count" : 6 , "frame_rate" : 275, "id" : "IDLE_DRAWN" }, + {"filename" : "player/player_jump.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP" }, + {"filename" : "player/player_jump_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_DRAWN" }, + {"filename" : "player/player_jump_to_fall.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_TO_FALL" }, + {"filename" : "player/player_jump_to_fall_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_TO_FALL_DRAWN"}, + {"filename" : "player/player_fall.bmp" , "frame_count" : 5 , "frame_rate" : 75, "id" : "FALL" }, + {"filename" : "player/player_fall_drawn.bmp" , "frame_count" : 5 , "frame_rate" : 75, "id" : "FALL_DRAWN" }, + {"filename" : "player/player_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN" }, + {"filename" : "player/player_run_drawn.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN_DRAWN" }, + {"filename" : "player/player_swim.bmp" , "frame_count" : 6, "frame_rate" : 50 , "id" : "SWIM" }, + {"filename" : "player/player_swim_tread.bmp" , "frame_count" : 6, "frame_rate" : 80 , "id" : "TREAD" } ], "special_anims" : [ - {"filename" : "player\\player_attack.bmp" , "frame_count" : 12, "frame_rate" : 40 , "id" : "ATTACK" , "custom_h": 23, "custom_w": 28} + {"filename" : "player/player_attack.bmp" , "frame_count" : 12, "frame_rate" : 40 , "id" : "ATTACK" , "custom_h": 23, "custom_w": 28} ], "loop_ids" : [ @@ -241,24 +241,24 @@ "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 23, "col_w" : 14}, "anim_set": [ - {"filename" : "player\\sword\\sword_idle_begin.bmp" , "frame_count" : 2 , "frame_rate" : 250 ,"id" : "IDLE_BEGIN" }, - {"filename" : "player\\sword\\sword_idle_begin_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 250 ,"id" : "IDLE_BEGIN_DRAWN" }, - {"filename" : "player\\sword\\sword_idle.bmp" , "frame_count" : 6 , "frame_rate" : 275, "id" : "IDLE" }, - {"filename" : "player\\sword\\sword_idle_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 275, "id" : "IDLE_DRAWN" }, - {"filename" : "player\\sword\\sword_jump.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP" }, - {"filename" : "player\\sword\\sword_jump_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_DRAWN" }, - {"filename" : "player\\sword\\sword_jump_to_fall.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_TO_FALL" }, - {"filename" : "player\\sword\\sword_jump_to_fall_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_TO_FALL_DRAWN" }, - {"filename" : "player\\sword\\sword_fall.bmp" , "frame_count" : 5 , "frame_rate" : 75, "id" : "FALL" }, - {"filename" : "player\\sword\\sword_fall_drawn.bmp" , "frame_count" : 5 , "frame_rate" : 75, "id" : "FALL_DRAWN" }, - {"filename" : "player\\sword\\sword_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN" }, - {"filename" : "player\\sword\\sword_run_drawn.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN_DRAWN" }, - {"filename" : "player\\sword\\sword_swim.bmp" , "frame_count" : 6, "frame_rate" : 50 , "id" : "SWIM" }, - {"filename" : "player\\sword\\sword_swim_tread.bmp" , "frame_count" : 6, "frame_rate" : 80 , "id" : "TREAD" } + {"filename" : "player/sword/sword_idle_begin.bmp" , "frame_count" : 2 , "frame_rate" : 250 ,"id" : "IDLE_BEGIN" }, + {"filename" : "player/sword/sword_idle_begin_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 250 ,"id" : "IDLE_BEGIN_DRAWN" }, + {"filename" : "player/sword/sword_idle.bmp" , "frame_count" : 6 , "frame_rate" : 275, "id" : "IDLE" }, + {"filename" : "player/sword/sword_idle_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 275, "id" : "IDLE_DRAWN" }, + {"filename" : "player/sword/sword_jump.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP" }, + {"filename" : "player/sword/sword_jump_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_DRAWN" }, + {"filename" : "player/sword/sword_jump_to_fall.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_TO_FALL" }, + {"filename" : "player/sword/sword_jump_to_fall_drawn.bmp" , "frame_count" : 1 , "frame_rate" : 100, "id" : "JUMP_TO_FALL_DRAWN" }, + {"filename" : "player/sword/sword_fall.bmp" , "frame_count" : 5 , "frame_rate" : 75, "id" : "FALL" }, + {"filename" : "player/sword/sword_fall_drawn.bmp" , "frame_count" : 5 , "frame_rate" : 75, "id" : "FALL_DRAWN" }, + {"filename" : "player/sword/sword_run.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN" }, + {"filename" : "player/sword/sword_run_drawn.bmp" , "frame_count" : 15, "frame_rate" : 20 , "id" : "RUN_DRAWN" }, + {"filename" : "player/sword/sword_swim.bmp" , "frame_count" : 6, "frame_rate" : 50 , "id" : "SWIM" }, + {"filename" : "player/sword/sword_swim_tread.bmp" , "frame_count" : 6, "frame_rate" : 80 , "id" : "TREAD" } ], "special_anims" : [ - {"filename" : "player\\sword\\sword_attack.bmp" , "frame_count" : 12, "frame_rate" : 40 , "id" : "ATTACK" , "custom_h": 23, "custom_w": 28} + {"filename" : "player/sword/sword_attack.bmp" , "frame_count" : 12, "frame_rate" : 40 , "id" : "ATTACK" , "custom_h": 23, "custom_w": 28} ], "loop_ids" : [ @@ -338,11 +338,11 @@ "col_data" : {"off_x" : 0, "off_y" : -29, "col_h" : 37, "col_w" : 8}, "anim_set": [ - {"filename" : "gate\\gate_down.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_DOWN" }, - {"filename" : "gate\\gate_up.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_UP" }, - {"filename" : "gate\\gate_lower.bmp" , "frame_count" : 6 , "frame_rate" : 40 , "id" : "GATE_LOWER" }, - {"filename" : "gate\\gate_lower_begin.bmp" , "frame_count" : 3 , "frame_rate" : 40 , "id" : "GATE_LOWER_BEGIN" }, - {"filename" : "gate\\gate_raise.bmp" , "frame_count" : 38, "frame_rate" : 120 , "id" : "GATE_RAISE" } + {"filename" : "gate/gate_down.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_DOWN" }, + {"filename" : "gate/gate_up.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_UP" }, + {"filename" : "gate/gate_lower.bmp" , "frame_count" : 6 , "frame_rate" : 40 , "id" : "GATE_LOWER" }, + {"filename" : "gate/gate_lower_begin.bmp" , "frame_count" : 3 , "frame_rate" : 40 , "id" : "GATE_LOWER_BEGIN" }, + {"filename" : "gate/gate_raise.bmp" , "frame_count" : 38, "frame_rate" : 120 , "id" : "GATE_RAISE" } ], "special_anims" : [ @@ -379,11 +379,11 @@ "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 17, "col_w" : 22}, "anim_set": [ - {"filename" : "winch\\winch_down.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_DOWN" }, - {"filename" : "winch\\winch_up.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_UP" }, - {"filename" : "winch\\winch_lower.bmp" , "frame_count" : 6 , "frame_rate" : 40 , "id" : "GATE_LOWER" }, - {"filename" : "winch\\winch_lower_begin.bmp" , "frame_count" : 4 , "frame_rate" : 120 , "id" : "GATE_LOWER_BEGIN" }, - {"filename" : "winch\\winch_raise.bmp" , "frame_count" : 40, "frame_rate" : 120 , "id" : "GATE_RAISE" } + {"filename" : "winch/winch_down.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_DOWN" }, + {"filename" : "winch/winch_up.bmp" , "frame_count" : 1 , "frame_rate" : 100 , "id" : "GATE_UP" }, + {"filename" : "winch/winch_lower.bmp" , "frame_count" : 6 , "frame_rate" : 40 , "id" : "GATE_LOWER" }, + {"filename" : "winch/winch_lower_begin.bmp" , "frame_count" : 4 , "frame_rate" : 120 , "id" : "GATE_LOWER_BEGIN" }, + {"filename" : "winch/winch_raise.bmp" , "frame_count" : 40, "frame_rate" : 120 , "id" : "GATE_RAISE" } ], "special_anims" : [ @@ -420,10 +420,10 @@ "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 26, "col_w" : 14}, "anim_set": [ - {"filename" : "NPCs\\gateman\\gateoperator_idle.bmp" , "frame_count" : 6 , "frame_rate" : 250 , "id" : "GATE_DOWN" }, - {"filename" : "NPCs\\gateman\\gateoperator_idle.bmp" , "frame_count" : 6 , "frame_rate" : 250 , "id" : "GATE_UP" }, - {"filename" : "NPCs\\gateman\\gateoperator_lower.bmp" , "frame_count" : 7 , "frame_rate" : 120 , "id" : "GATE_LOWER" }, - {"filename" : "NPCs\\gateman\\gateoperator_raise.bmp" , "frame_count" : 43, "frame_rate" : 120 , "id" : "GATE_RAISE" } + {"filename" : "NPCs/gateman/gateoperator_idle.bmp" , "frame_count" : 6 , "frame_rate" : 250 , "id" : "GATE_DOWN" }, + {"filename" : "NPCs/gateman/gateoperator_idle.bmp" , "frame_count" : 6 , "frame_rate" : 250 , "id" : "GATE_UP" }, + {"filename" : "NPCs/gateman/gateoperator_lower.bmp" , "frame_count" : 7 , "frame_rate" : 120 , "id" : "GATE_LOWER" }, + {"filename" : "NPCs/gateman/gateoperator_raise.bmp" , "frame_count" : 43, "frame_rate" : 120 , "id" : "GATE_RAISE" } ], "special_anims" : [ @@ -541,25 +541,25 @@ }, "anim_set": [ { - "filename": "rabbits\\brabbit_hop.bmp", + "filename": "rabbits/brabbit_hop.bmp", "frame_count": 1, "frame_rate": 100, "id": "RUN" }, { - "filename": "rabbits\\brabbit_idle_eat.bmp", + "filename": "rabbits/brabbit_idle_eat.bmp", "frame_count": 13, "frame_rate": 100, "id": "EAT" }, { - "filename": "rabbits\\brabbit_idle_look.bmp", + "filename": "rabbits/brabbit_idle_look.bmp", "frame_count": 8, "frame_rate": 100, "id": "LOOK" }, { - "filename": "rabbits\\brabbit_sleep.bmp", + "filename": "rabbits/brabbit_sleep.bmp", "frame_count": 1, "frame_rate": 100, "id": "SLEEP" @@ -606,13 +606,13 @@ "col_data" : {"off_x" : -4, "off_y" : 0, "col_h" : 16, "col_w" : 15}, "anim_set": [ - {"filename" : "sludge_seal\\sludgeseal_land_idle.bmp" , "frame_count" : 6 , "frame_rate" : 250 , "id" : "IDLE" }, - {"filename" : "sludge_seal\\sludgeseal_crawl.bmp" , "frame_count" : 8 , "frame_rate" : 30 , "id" : "RUN" }, - {"filename" : "sludge_seal\\sludgeseal_swim.bmp" , "frame_count" : 8 , "frame_rate" : 125 , "id" : "SWIM" }, - {"filename" : "sludge_seal\\sludgeseal_swim_begin.bmp" , "frame_count" : 7 , "frame_rate" : 10 , "id" : "SWIM_BEGIN" }, - {"filename" : "sludge_seal\\sludgeseal_water_idle.bmp" , "frame_count" : 16 , "frame_rate" : 350 , "id" : "TREAD" }, - {"filename" : "sludge_seal\\sludgeseal_die.bmp" , "frame_count" : 6 , "frame_rate" : 350 , "id" : "DIE" }, - {"filename" : "sludge_seal\\sludgeseal_dead.bmp" , "frame_count" : 1 , "frame_rate" : 10 , "id" : "DEAD" } + {"filename" : "sludge_seal/sludgeseal_land_idle.bmp" , "frame_count" : 6 , "frame_rate" : 250 , "id" : "IDLE" }, + {"filename" : "sludge_seal/sludgeseal_crawl.bmp" , "frame_count" : 8 , "frame_rate" : 30 , "id" : "RUN" }, + {"filename" : "sludge_seal/sludgeseal_swim.bmp" , "frame_count" : 8 , "frame_rate" : 125 , "id" : "SWIM" }, + {"filename" : "sludge_seal/sludgeseal_swim_begin.bmp" , "frame_count" : 7 , "frame_rate" : 10 , "id" : "SWIM_BEGIN" }, + {"filename" : "sludge_seal/sludgeseal_water_idle.bmp" , "frame_count" : 16 , "frame_rate" : 350 , "id" : "TREAD" }, + {"filename" : "sludge_seal/sludgeseal_die.bmp" , "frame_count" : 6 , "frame_rate" : 350 , "id" : "DIE" }, + {"filename" : "sludge_seal/sludgeseal_dead.bmp" , "frame_count" : 1 , "frame_rate" : 10 , "id" : "DEAD" } ], "special_anims" : [ @@ -663,9 +663,9 @@ "col_data" : {"off_x" : -32, "off_y" : 0, "col_h" : 26, "col_w" : 32}, "anim_set": [ - {"filename" : "loyal_bug\\loyalbug_idle_begin.bmp" , "frame_count" : 5 , "frame_rate" : 75 , "id" : "IDLE_BEGIN"}, - {"filename" : "loyal_bug\\loyalbug_idle.bmp" , "frame_count" : 11 , "frame_rate" : 120, "id" : "IDLE" }, - {"filename" : "loyal_bug\\loyalbug_walk.bmp" , "frame_count" : 23, "frame_rate" : 20 , "id" : "RUN" } + {"filename" : "loyal_bug/loyalbug_idle_begin.bmp" , "frame_count" : 5 , "frame_rate" : 75 , "id" : "IDLE_BEGIN"}, + {"filename" : "loyal_bug/loyalbug_idle.bmp" , "frame_count" : 11 , "frame_rate" : 120, "id" : "IDLE" }, + {"filename" : "loyal_bug/loyalbug_walk.bmp" , "frame_count" : 23, "frame_rate" : 20 , "id" : "RUN" } ], "special_anims" : [ @@ -700,7 +700,7 @@ "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 7, "col_w" : 13}, "anim_set": [ - {"filename" : "hostile\\bug_walk.bmp" , "frame_count" : 8 , "frame_rate" : 75 , "id" : "RUN"} + {"filename" : "hostile/bug_walk.bmp" , "frame_count" : 8 , "frame_rate" : 75 , "id" : "RUN"} ], "special_anims" : [ @@ -758,7 +758,7 @@ "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 22, "col_w" : 11}, "anim_set": [ - {"filename" : "NPCs\\gardenwoman_idle.bmp" , "frame_count" : 5, "frame_rate" : 300 , "id" : "IDLE"} + {"filename" : "NPCs/gardenwoman_idle.bmp" , "frame_count" : 5, "frame_rate" : 300 , "id" : "IDLE"} ], "special_anims" : [ @@ -787,7 +787,7 @@ "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 22, "col_w" : 13}, "anim_set": [ - {"filename" : "NPCs\\smokingman_idle.bmp" , "frame_count" : 21, "frame_rate" : 260 , "id" : "IDLE"} + {"filename" : "NPCs/smokingman_idle.bmp" , "frame_count" : 21, "frame_rate" : 260 , "id" : "IDLE"} ], "special_anims" : [ @@ -816,7 +816,7 @@ "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 22, "col_w" : 8}, "anim_set": [ - {"filename" : "NPCs\\sitting_man_idle.bmp" , "frame_count" : 11, "frame_rate" : 260 , "id" : "IDLE"} + {"filename" : "NPCs/sitting_man_idle.bmp" , "frame_count" : 11, "frame_rate" : 260 , "id" : "IDLE"} ], "special_anims" : [ @@ -845,7 +845,7 @@ "col_data" : {"off_x" : 0, "off_y" : 0, "col_h" : 25, "col_w" : 8}, "anim_set": [ - {"filename" : "NPCs\\storeowner_idle.bmp" , "frame_count" : 8, "frame_rate" : 415 , "id" : "IDLE"} + {"filename" : "NPCs/storeowner_idle.bmp" , "frame_count" : 8, "frame_rate" : 415 , "id" : "IDLE"} ], "special_anims" : [ @@ -874,7 +874,7 @@ "col_data" : {"off_x" : -5, "off_y" : 0, "col_h" : 23, "col_w" : 6}, "anim_set": [ - {"filename" : "player\\myhatisat.bmp" , "frame_count" : 1, "frame_rate" : 100 , "id" : "IDLE"} + {"filename" : "player/myhatisat.bmp" , "frame_count" : 1, "frame_rate" : 100 , "id" : "IDLE"} ], "special_anims" : [ diff --git a/TapestryEngine/libFLAC-8.dll b/TapestryEngine/libFLAC-8.dll Binary files differ. diff --git a/TapestryEngine/libfreetype-6.dll b/TapestryEngine/libfreetype-6.dll Binary files differ. diff --git a/TapestryEngine/libmodplug-1.dll b/TapestryEngine/libmodplug-1.dll Binary files differ. diff --git a/TapestryEngine/libogg-0.dll b/TapestryEngine/libogg-0.dll Binary files differ. diff --git a/TapestryEngine/libvorbis-0.dll b/TapestryEngine/libvorbis-0.dll Binary files differ. diff --git a/TapestryEngine/libvorbisfile-3.dll b/TapestryEngine/libvorbisfile-3.dll Binary files differ. diff --git a/TapestryEngine/smpeg2.dll b/TapestryEngine/smpeg2.dll Binary files differ. diff --git a/TapestryEngine/sound.cpp b/TapestryEngine/sound.cpp @@ -3,13 +3,13 @@ Mix_Music* LoadMusic(char* filename) { -#ifdef DEBUG - char* basepath = "C:\\Users\\baptistac1\\Documents\\Visual Studio 2015\\Projects\\TapestryEngineDev\\TapestryEngine\\sounds\\"; -#endif +//#ifdef DEBUG +// const char* basepath = "/home/sebastian/projects/TapestryEngine/TapestryEngine/sounds/"; +//#endif -#ifdef RELEASE - char* basepath = ".\\sounds\\"; -#endif +//#ifdef RELEASE + const char* basepath = "./TapestryEngine/sounds/"; +//#endif char pathbuffer[1024]; strcpy(pathbuffer, basepath); @@ -25,13 +25,13 @@ Mix_Music* LoadMusic(char* filename) Mix_Chunk* LoadSound(char* filename) { -#ifdef DEBUG - char* basepath = "C:\\Users\\baptistac1\\Documents\\Visual Studio 2015\\Projects\\TapestryEngineDev\\TapestryEngine\\sounds\\"; -#endif +//#ifdef DEBUG +// const char* basepath = "/home/sebastian/projects/TapestryEngine/TapestryEngine/sounds/"; +//#endif -#ifdef RELEASE - char* basepath = ".\\sounds\\"; -#endif +//#ifdef RELEASE + const char* basepath = "./TapestryEngine/sounds/"; +//#endif char pathbuffer[1024]; strcpy(pathbuffer, basepath); @@ -165,4 +165,4 @@ bool SoundManager::EventProcess(Event eve) return false; break; } -}- \ No newline at end of file +} diff --git a/TapestryEngine/sound.h b/TapestryEngine/sound.h @@ -252,7 +252,7 @@ public: return true; } - Mix_Chunk* GetSoundData(char* name) + Mix_Chunk* GetSoundData(const char* name) { for (int i = 0; i < (int)mNames.size(); i++) { @@ -266,7 +266,7 @@ public: - PointSound* SpawnPointSound(int x, int y, char* name) + PointSound* SpawnPointSound(int x, int y, const char* name) { PointSound* ps = new PointSound(x,y,GetSoundData(name), (int)(mEffects.size()) ); ps->SetChannel(mChannelManager.AssignChannel()); diff --git a/TapestryEngine/zlib1.dll b/TapestryEngine/zlib1.dll Binary files differ. diff --git a/makefile b/makefile @@ -0,0 +1,90 @@ +# Makefile + +CC=g++ -g -fsanitize=address -Wno-conversion-null -Wno-pointer-arith +LDFLAGS=-lSDL2 -lcjson -lSDL2_ttf -lSDL2_mixer +INC=-ITapestryEngine + +Tapestry.out: Main.o + $(CC) -o Tapestry.out Main.o Utils.o Console.o MiscDraw.o DiagnosticDraw.o ActorCollision.o Input.o Actor.o sound.o Dialogue.o Loading.o Level.o Camera.o bones.o Event.o ActorHandle.o Animation.o AnimationGraph.o Physics.o Terrain.o HUD.o Context.o Particle.o symbol.o Mapper.o BinaryTree.o $(LDFLAGS) + +ut_binarytree.out: ut_binarytree.o + $(CC) -o ut_binarytree.out ut_binarytree.o BinaryTree.o Utils.o Console.o $(LDFLAGS) + +ut_binarytree.o: Utils.o Console.o + $(CC) -c TapestryEngine/ut_binarytree.cpp $(INC) -o ut_binarytree.o + +Main.o: Utils.o Console.o MiscDraw.o DiagnosticDraw.o ActorCollision.o Input.o Actor.o sound.o Dialogue.o Loading.o Level.o + $(CC) -c TapestryEngine/Main.cpp $(INC) -o Main.o + +Utils.o: BinaryTree.o + $(CC) -c TapestryEngine/Utils.cpp $(INC) -o Utils.o + +Console.o: Utils.o + $(CC) -c TapestryEngine/Console.cpp $(INC) -o Console.o + +MiscDraw.o: Actor.o bones.o Camera.o Utils.o + $(CC) -c TapestryEngine/MiscDraw.cpp $(INC) -o MiscDraw.o + +DiagnosticDraw.o: Utils.o Console.o Camera.o + $(CC) -c TapestryEngine/DiagnosticDraw.cpp $(INC) -o DiagnosticDraw.o + +ActorCollision.o: Utils.o Console.o DiagnosticDraw.o Event.o Actor.o ActorHandle.o + $(CC) -c TapestryEngine/ActorCollision.cpp $(INC) -o ActorCollision.o + +Input.o: Utils.o Event.o + $(CC) -c TapestryEngine/Input.cpp $(INC) -o Input.o + +Actor.o: Utils.o Console.o Animation.o AnimationGraph.o Physics.o Terrain.o + $(CC) -c TapestryEngine/Actor.cpp $(INC) -o Actor.o + +sound.o: Utils.o Console.o Event.o + $(CC) -c TapestryEngine/sound.cpp $(INC) -o sound.o + +Dialogue.o: Utils.o Console.o HUD.o + $(CC) -c TapestryEngine/Dialogue.cpp $(INC) -o Dialogue.o + +Loading.o: Utils.o Console.o Context.o Event.o + $(CC) -c TapestryEngine/Loading.cpp $(INC) -o Loading.o + +Level.o: Utils.o Console.o Context.o Actor.o ActorCollision.o Particle.o Camera.o Event.o Input.o symbol.o MiscDraw.o sound.o HUD.o Dialogue.o + $(CC) -c TapestryEngine/Level.cpp $(INC) -o Level.o + +Camera.o: Utils.o Console.o Actor.o Event.o + $(CC) -c TapestryEngine/Camera.cpp $(INC) -o Camera.o + +bones.o: Utils.o Console.o + $(CC) -c TapestryEngine/bones.cpp $(INC) -o bones.o + +Event.o: Utils.o Console.o + $(CC) -c TapestryEngine/Event.cpp $(INC) -o Event.o + +ActorHandle.o: Utils.o Console.o Event.o Actor.o + $(CC) -c TapestryEngine/ActorHandle.cpp $(INC) -o ActorHandle.o + +Animation.o: Utils.o Event.o + $(CC) -c TapestryEngine/Animation.cpp $(INC) -o Animation.o + +AnimationGraph.o: Utils.o Console.o Animation.o Event.o + $(CC) -c TapestryEngine/AnimationGraph.cpp $(INC) -o AnimationGraph.o + +Physics.o: Utils.o Console.o + $(CC) -c TapestryEngine/Physics.cpp $(INC) -o Physics.o + +Terrain.o: Utils.o Console.o + $(CC) -c TapestryEngine/Terrain.cpp $(INC) -o Terrain.o +HUD.o: Utils.o Console.o Actor.o MiscDraw.o Event.o + $(CC) -c TapestryEngine/HUD.cpp $(INC) -o HUD.o +Context.o: Utils.o Console.o Event.o Mapper.o MiscDraw.o + $(CC) -c TapestryEngine/Context.cpp $(INC) -o Context.o +Particle.o: Utils.o Console.o Event.o Actor.o + $(CC) -c TapestryEngine/Particle.cpp $(INC) -o Particle.o +symbol.o: Utils.o Console.o Actor.o + $(CC) -c TapestryEngine/symbol.cpp $(INC) -o symbol.o +Mapper.o: Utils.o Console.o + $(CC) -c TapestryEngine/Mapper.cpp $(INC) -o Mapper.o +BinaryTree.o: + $(CC) -c TapestryEngine/BinaryTree.cpp $(INC) -o BinaryTree.o +clean: + rm *.o* + +
.bmp.html){kind=link}
.bmp.html){kind=link}
