Skip to content

Commit

Permalink
bump to latest Love2d v0.10.2
Browse files Browse the repository at this point in the history
  • Loading branch information
ArneSchwettmann committed Mar 18, 2017
1 parent 80773a1 commit c2a6cfb
Show file tree
Hide file tree
Showing 21 changed files with 1,209 additions and 102 deletions.
174 changes: 146 additions & 28 deletions License.txt
@@ -1,4 +1,4 @@
Copyright (c) 2013-2014 Arne Schwettmann
Copyright (c) 2013-2017 Arne Schwettmann

The above copyright holds for all material in this project that is not part of LÖVE or the libraries distributed with LÖVE.

Expand All @@ -8,20 +8,138 @@ This program is not free software. Default copyright laws apply.


-------
LÖVE also uses the following LGPL libraries:
LOVE is Copyright (c) 2006-2016 LOVE Development Team

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.

---------

This software uses LuaJIT:

LuaJIT is Copyright (c) 2005-2015 Mike Pall

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

---------

This software uses ENet:

Copyright (c) 2002-2014 Lee Salzman

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

---------

This software uses lua-enet:

Copyright (C) 2011 by Leaf Corcoran

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

---------

This software uses UTF8-CPP:

Copyright 2006 Nemanja Trifunovic

Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:

The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

---------

This software uses the following LGPL libraries on Windows, Mac OS X, Linux,
and Android:

- SDL
Website: http://libsdl.org
Source download: http://www.libsdl.org/release/SDL-1.2.14.tar.gz
- libmpg123
Website: http://www.mpg123.de/
Source download: http://sourceforge.net/projects/mpg123/files/latest/download
- OpenAL
Website: http://connect.creativelabs.com/openal/default.aspx
Source download: http://connect.creativelabs.com/openal/Downloads/openal-soft-1.13.tbz2
- DevIL
Website: http://openil.sourceforge.net/
Source download: http://downloads.sourceforge.net/openil/DevIL-1.7.8.tar.gz
- OpenAL Soft
Website: http://kcat.strangesoft.net/openal.html
Source download: http://kcat.strangesoft.net/openal.html#download

Following are the LGPL and GPL license texts:

Expand Down Expand Up @@ -208,7 +326,7 @@ to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
GNU General Public License for most of our software it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.

Expand Down Expand Up @@ -366,7 +484,7 @@ and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.

Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
the conditions stated below. Sublicensing is not allowed section 10
makes it unnecessary.

3. Protecting Users' Legal Rights From Anti-Circumvention Law.
Expand All @@ -389,10 +507,10 @@ technological measures.

You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
appropriately publish on each copy an appropriate copyright notice
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
non-permissive terms added in accord with section 7 apply to the code
keep intact all notices of the absence of any warranty and give all
recipients a copy of this License along with the Program.

You may charge any price or no price for each copy that you convey,
Expand Down Expand Up @@ -421,7 +539,7 @@ terms of section 4, provided that you also meet all of these conditions:
invalidate such permission if you have separately received it.

d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
Appropriate Legal Notices however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.

Expand Down Expand Up @@ -556,21 +674,21 @@ add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:

a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
terms of sections 15 and 16 of this License or

b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
Notices displayed by works containing it or

c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
reasonable ways as different from the original version or

d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
authors of the material or

e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
trade names, trademarks, or service marks or

f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
Expand All @@ -594,7 +712,7 @@ additional terms that apply to those files, or a notice indicating
where to find the applicable terms.

Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
form of a separately written license, or stated as exceptions
the above requirements apply either way.

8. Termination.
Expand Down Expand Up @@ -821,7 +939,7 @@ free software which everyone can redistribute and change under these terms.

To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
state the exclusion of warranty and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

<one line to give the program's name and a brief idea of what it does.>
Expand All @@ -833,7 +951,7 @@ the "copyright" line and a pointer to where the full notice is found.
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
but WITHOUT ANY WARRANTY without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

Expand All @@ -846,13 +964,13 @@ Also add information on how to contact you by electronic and paper mail.
notice like this when it starts in an interactive mode:

<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This program comes with ABSOLUTELY NO WARRANTY for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
under certain conditions type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
might be different for a GUI interface, you would use an "about box".

You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -3,11 +3,11 @@ Arne's SpaceTaxi

Gravity-based space taxi game written in LUA

This is a version of the classic space taxi game written by Arne Schwettmann in LUA, making use of the LÖVE game framework. It is written for LÖVE 0.8.0.
This is a version of the classic space taxi game written by Arne Schwettmann in LUA, making use of the LÖVE game framework. It is written for LÖVE 0.10.2.

Try the 5 player mode.

Pre-compiled executables for Windows and OSX are in the bin directory. To compile from source under Windows, simply drag the src directory onto Love.exe version 0.8.0. For more information on LÖVE, visit love2d.org.
Pre-compiled executables for Windows and OSX are in the bin directory. To compile from source under Windows, simply drag the src directory onto Love.exe version 0.10.2. For more information on LÖVE, visit love2d.org.

See License.txt for licensing details

Expand Down
4 changes: 2 additions & 2 deletions Readme.txt
@@ -1,9 +1,9 @@
Arne's SpaceTaxi

This is a version of the classic space taxi game written by Arne Schwettmann in LUA, making use of the LÖVE game framework. It is written for LÖVE 0.8.0.eEEEEE
This is a version of the classic space taxi game written by Arne Schwettmann in LUA, making use of the LÖVE game framework. It is written for LÖVE 0.10.2

Try the 5 player mode.

Pre-compiled executables for Windows and OSX are in the bin directory. To compile from source under Windows, simply drag the src directory onto Love.exe version 0.8.0. For more information on LÖVE, visit love2d.org.
Pre-compiled executables for Windows and OSX are in the bin directory. To compile from source under Windows, simply drag the src directory onto Love.exe version 0.10.2. For more information on LÖVE, visit love2d.org.

See License.txt for licensing details
Binary file modified bin/OSX/ArnesSpaceTaxi.dmg
Binary file not shown.
Binary file added bin/Win/ArnesSpaceTaxi_v15.exe
Binary file not shown.
Binary file removed bin/Win/ArnesSpaceTaxiv14.exe
Binary file not shown.
Binary file removed bin/Win/DevIL.dll
Binary file not shown.
Binary file modified bin/Win/OpenAL32.dll 100755 → 100644
Binary file not shown.
Binary file removed bin/Win/SDL.dll
Binary file not shown.
Binary file added bin/Win/SDL2.dll
Binary file not shown.

0 comments on commit c2a6cfb

Please sign in to comment.