Skip to content

Commit

Permalink
Update copyright years: Happy 2017! 🎆
Browse files Browse the repository at this point in the history
[skip ci]
  • Loading branch information
soulweaver91 committed Jan 4, 2017
1 parent 2068132 commit e965bbb
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
Binary file modified CarrotQt5.rc
Binary file not shown.
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,4 +1,4 @@
Copyright (c) 2013-2016 Soulweaver <soulweaver@hotmail.fi>
Copyright (c) 2013-2017 Soulweaver <soulweaver@hotmail.fi>

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
2 changes: 1 addition & 1 deletion src/menu/MainMenuRoot.cpp
Expand Up @@ -53,7 +53,7 @@ void MainMenuRoot::renderTick(bool topmost, bool) {

BitmapString::drawString(canvas, root->getFont(SMALL), CP_VERSION + " v" + CP_VERSION_NUM +
" built on " + QString(__DATE__) + " " + QString(__TIME__), 10, viewHeight - 34);
BitmapString::drawString(canvas, root->getFont(SMALL), "(c) 2013-2016 Project Carrot Team", 10, viewHeight - 22);
BitmapString::drawString(canvas, root->getFont(SMALL), "(c) 2013-2017 Project Carrot Team", 10, viewHeight - 22);

}

Expand Down
2 changes: 1 addition & 1 deletion src/ui/AboutCarrotDialog.ui
Expand Up @@ -67,7 +67,7 @@
<enum>QFrame::Plain</enum>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Project Carrot is a free, open-source engine clone of Epic Games' late 1990's game Jazz Jackrabbit 2, which was fated to be the last true game starring the titular character. The purpose of the project was not only to rewrite the engine but also make it possible to add new features.&lt;/p&gt;&lt;p&gt;Project Carrot © 2013–2016 Soulweaver &amp;lt;&lt;a href=&quot;mailto:soulweaver@hotmail.fi&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;soulweaver@hotmail.fi&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;p&gt;This software uses third party libraries whose terms and licenses are listed below.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Qt 5.7.0&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://www.qt.io/developers/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://www.qt.io/developers/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;See the &amp;quot;About Qt&amp;quot; menu option for more details.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;SFML 2.4&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;http://www.sfml-dev.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.sfml-dev.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;SFML - Copyright (C) 2007-2015 Laurent Gomila - laurent@sfml-dev.org&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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:&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.&lt;/p&gt;&lt;p&gt;3. This notice may not be removed or altered from any source distribution.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;External libraries used by SFML&lt;br/&gt;-------------------------------&lt;br/&gt;* OpenAL-Soft is under the LGPL license&lt;br/&gt;* libjpeg is public domain&lt;br/&gt;* stb_image and stb_image_write are public domain&lt;br/&gt;* freetype is under the FreeType license or the GPL license&lt;br/&gt;* libogg is under the BSD license&lt;br/&gt;* libvorbis is under the BSD license&lt;br/&gt;* libflac is under the BSD license&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;BASS 2.4&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;http://www.un4seen.com/bass.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.un4seen.com/bass.html&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;BASS is free for non-commercial use. If you are a non-commercial entity (eg. an individual) and you are not making any money from your product (through sales/advertising/etc), then you can use BASS in it for free. If you wish to use BASS in commercial products, then please also see the next section.&lt;/p&gt;&lt;p&gt;TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, BASS IS PROVIDED &amp;quot;AS IS&amp;quot;, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS SHALL NOT BE HELD LIABLE FOR ANY DAMAGE THAT MAY RESULT FROM THE USE OF BASS. YOU USE BASS ENTIRELY AT YOUR OWN RISK.&lt;/p&gt;&lt;p&gt;Usage of BASS indicates that you agree to the above conditions.&lt;/p&gt;&lt;p&gt;All trademarks and other registered names contained in the BASS package are the property of their respective owners.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;BASS FX 2.4&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;http://www.un4seen.com/bass.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.un4seen.com/bass.html&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;The BASS_FX library is free, so if anyone tries to charge you for it, kick 'em where it hurts.&lt;/p&gt;&lt;p&gt;This software is provided &amp;quot;as is&amp;quot;, without warranty of ANY KIND, either expressed or implied, including but not limited to the implied warranties of merchantability and/or fitness for a particular purpose. The author shall NOT be held liable for ANY damage to you, your computer, or to anyone or anything else, that may result from its use, or misuse. Basically, you use it at YOUR OWN RISK.&lt;/p&gt;&lt;p&gt;Usage of BASS_FX indicates that you agree to the above conditions.&lt;/p&gt;&lt;p&gt;You may freely distribute the BASS_FX package as long as NO FEE is charged and all the files remain INTACT AND UNMODIFIED.&lt;/p&gt;&lt;p&gt;All trademarks and other registered names contained in the BASS_FX package are the property of their respective owners.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Project Carrot is a free, open-source engine clone of Epic Games' late 1990's game Jazz Jackrabbit 2, which was fated to be the last true game starring the titular character. The purpose of the project was not only to rewrite the engine but also make it possible to add new features.&lt;/p&gt;&lt;p&gt;Project Carrot © 2013–2017 Soulweaver &amp;lt;&lt;a href=&quot;mailto:soulweaver@hotmail.fi&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;soulweaver@hotmail.fi&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;p&gt;This software uses third party libraries whose terms and licenses are listed below.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;Qt 5.7.0&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://www.qt.io/developers/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://www.qt.io/developers/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;See the &amp;quot;About Qt&amp;quot; menu option for more details.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;SFML 2.4&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;http://www.sfml-dev.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.sfml-dev.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;SFML - Copyright (C) 2007-2015 Laurent Gomila - laurent@sfml-dev.org&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;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:&lt;/p&gt;&lt;p&gt;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.&lt;/p&gt;&lt;p&gt;2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.&lt;/p&gt;&lt;p&gt;3. This notice may not be removed or altered from any source distribution.&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;p&gt;External libraries used by SFML&lt;br/&gt;-------------------------------&lt;br/&gt;* OpenAL-Soft is under the LGPL license&lt;br/&gt;* libjpeg is public domain&lt;br/&gt;* stb_image and stb_image_write are public domain&lt;br/&gt;* freetype is under the FreeType license or the GPL license&lt;br/&gt;* libogg is under the BSD license&lt;br/&gt;* libvorbis is under the BSD license&lt;br/&gt;* libflac is under the BSD license&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;BASS 2.4&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;http://www.un4seen.com/bass.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.un4seen.com/bass.html&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;BASS is free for non-commercial use. If you are a non-commercial entity (eg. an individual) and you are not making any money from your product (through sales/advertising/etc), then you can use BASS in it for free. If you wish to use BASS in commercial products, then please also see the next section.&lt;/p&gt;&lt;p&gt;TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, BASS IS PROVIDED &amp;quot;AS IS&amp;quot;, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND/OR FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS SHALL NOT BE HELD LIABLE FOR ANY DAMAGE THAT MAY RESULT FROM THE USE OF BASS. YOU USE BASS ENTIRELY AT YOUR OWN RISK.&lt;/p&gt;&lt;p&gt;Usage of BASS indicates that you agree to the above conditions.&lt;/p&gt;&lt;p&gt;All trademarks and other registered names contained in the BASS package are the property of their respective owners.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;BASS FX 2.4&lt;/span&gt;&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;http://www.un4seen.com/bass.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.un4seen.com/bass.html&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;The BASS_FX library is free, so if anyone tries to charge you for it, kick 'em where it hurts.&lt;/p&gt;&lt;p&gt;This software is provided &amp;quot;as is&amp;quot;, without warranty of ANY KIND, either expressed or implied, including but not limited to the implied warranties of merchantability and/or fitness for a particular purpose. The author shall NOT be held liable for ANY damage to you, your computer, or to anyone or anything else, that may result from its use, or misuse. Basically, you use it at YOUR OWN RISK.&lt;/p&gt;&lt;p&gt;Usage of BASS_FX indicates that you agree to the above conditions.&lt;/p&gt;&lt;p&gt;You may freely distribute the BASS_FX package as long as NO FEE is charged and all the files remain INTACT AND UNMODIFIED.&lt;/p&gt;&lt;p&gt;All trademarks and other registered names contained in the BASS_FX package are the property of their respective owners.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
Expand Down

0 comments on commit e965bbb

Please sign in to comment.