Merge branch 'master' into sdl2.0
This commit is contained in:
Pere Pujal i Carabantes
commit
b6b0636eb5
340 changed files with 28445 additions and 40745 deletions
|
|
@ -5,7 +5,7 @@
|
|||
Copyright © 2002-2021 by various contributors; see AUTHORS.
|
||||
http://www.tuxpaint.org/
|
||||
|
||||
September 6, 2021
|
||||
September 19, 2021
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
|
|
@ -337,9 +337,11 @@ Stamps
|
|||
also create WAV or OGG files with the locale's label in the
|
||||
filename, in the form: "stamp_LOCALE.EXT"
|
||||
|
||||
"stamp.png"'s sound effect, when Tux Paint is run in Spanish mode,
|
||||
would be "stamp.png". In French mode, "stamp_es.wav". In Brazilian
|
||||
Portuguese mode, "stamp_fr.wav". And so on...
|
||||
The sound effect that will be played when the stamp corresponding to
|
||||
the image file "stamp.png" is selected, and when Tux Paint is using
|
||||
the Spanish locale, would be "stamp_es.wav". Under the French
|
||||
locale, it would be "stamp_fr.wav". Under the Brazilian Portuguese
|
||||
locale, "stamp_pt_BR.wav". And so on...
|
||||
|
||||
If no localized sound effect can be loaded, Tux Paint will attempt
|
||||
to load the 'default' sound file. (e.g., "stamp.wav")
|
||||
|
|
@ -366,10 +368,11 @@ Stamps
|
|||
files with both "_desc" and the locale's label in the filename, in
|
||||
the form: "stamp_desc_LOCALE.EXT"
|
||||
|
||||
"stamp.png"'s descriptive sound, when Tux Paint is run in Spanish
|
||||
mode, would be "stamp_desc_es.wav". In French mode,
|
||||
"stamp_desc_fr.wav". In Brazilian Portuguese mode,
|
||||
"stamp_desc_pt_BR.wav". And so on...
|
||||
The descriptive sound that will be played when the stamp
|
||||
corresponding to the image file "stamp.png" is selected, and when
|
||||
Tux Paint is using the Spanish locale, would be "stamp_desc_es.wav".
|
||||
Under the French locale, it would be "stamp_desc_fr.wav". Under the
|
||||
Brazilian Portuguese locale, "stamp_desc_pt_BR.wav". And so on...
|
||||
|
||||
If no localized descriptive sound can be loaded, Tux Paint will
|
||||
attempt to load the 'default' sound file. (e.g., "stamp_desc.wav")
|
||||
|
|
@ -423,15 +426,28 @@ Stamps
|
|||
one of the following lines to the stamp's data file:
|
||||
|
||||
Normal tinter — "tinter=normal" (the default)
|
||||
This is the normal tinting mode. (Hue range is ±18°, 27
|
||||
replace.)
|
||||
|
||||
'Any hue' tinter — "tinter=anyhue"
|
||||
This remaps all hues in the stamp. (Hue range is ±180°.)
|
||||
This is the normal tinting mode. First, the primary hue
|
||||
of the stamp is determined. (For example, a picture of a
|
||||
flower with a stem will have the petal color seen as the
|
||||
primary hue of the overall image.) Next, the most highly
|
||||
saturated part of the picture is found. With "normal
|
||||
tinter", the range of hue used to do this starts out
|
||||
within ±18° of the pimary hue found in step 1. (If none
|
||||
can be found, it widens the range by 50% and tries
|
||||
again.) Finally, the image is tinted. Anything falling
|
||||
within 50% of the range (e.g., ±27°) is altered to have
|
||||
the hue of the color chosen by the user.
|
||||
|
||||
Narrow tinter — "tinter=narrow"
|
||||
This like the "anyhue" option, but with a narrower hue
|
||||
angle. (Hue range is ±6°, 9 replace.)
|
||||
This like the "normal" option described above, but
|
||||
starts a narrower hue range of ±6°. Anything found
|
||||
within 50% of the range (e.g. ±9°) is tinted. If too
|
||||
much of your stamp is being tinted, try this option.
|
||||
|
||||
'Any hue' tinter — "tinter=anyhue"
|
||||
This remaps all hues in the stamp. It works similarly to
|
||||
the "anyhue" and "narrow" options described above, but
|
||||
the hue range is ±180°.
|
||||
|
||||
Vector tinter — "tinter=vector"
|
||||
This maps 'black through white' to 'black through
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
Copyright © 2002-2021 by various contributors; see AUTHORS.
|
||||
http://www.tuxpaint.org/
|
||||
|
||||
September 5, 2021
|
||||
September 17, 2021
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
|
|
@ -197,7 +197,7 @@ Compiling and Installation
|
|||
64bit (x86_64) dependency libraries for Tux Paint
|
||||
|
||||
You can install tools and libraries required for compiling Tux Paint
|
||||
on MSYS2/MINGW using "pacman" except for SDL_Pango.
|
||||
on MSYS2/MINGW using "pacman" except for SDL_Pango and SDL_gfx.
|
||||
|
||||
"ntldd" is a small tool which examine windows executable files to
|
||||
list Dynamic Link Library (.dll) files they depends on. Tux Paint's
|
||||
|
|
@ -216,11 +216,9 @@ Compiling and Installation
|
|||
|
||||
Note: Close the shell before proceeding to the remaining process.
|
||||
|
||||
Install SDL_Pango and re-install SDL on the 64bit environment
|
||||
Install SDL_Pango and SDL_gfx on the 64bit environment
|
||||
|
||||
SDL_Pango should be installed manually. In addition, you have to
|
||||
re-install SDL from the source code or you will see unnecessary
|
||||
blank window opens when starting Tux Paint.
|
||||
SDL_Pango and SDL_gfx should be installed manually.
|
||||
|
||||
This time, use the MinGW "64bit" shell. Open the shell from the
|
||||
"Start Menu" -> "MSYS2 64bit" -> "MSYS2 MinGW 64-bit"
|
||||
|
|
@ -243,14 +241,15 @@ Compiling and Installation
|
|||
$ patch -p0 < ../SDL_Pango-configure-extra-api.patch
|
||||
$ ./configure --prefix=/mingw64 && make && make install
|
||||
|
||||
SDL
|
||||
SDL_gfx
|
||||
|
||||
Download source tar-ball of SDL_1.2.15 from libsdl.org.
|
||||
Download source tar-ball of SDL_gfx-2.0.25 from SDL_gfx's page on
|
||||
Sourceforge.net.
|
||||
|
||||
Re-install SDL as follows.
|
||||
Install SDL_gfx as follows.
|
||||
|
||||
$ tar zxvf SDL-1.2.15.tar.gz
|
||||
$ cd SDL-1.2.15
|
||||
$ tar zxvf SDL_gfx-2.0.25.tar.gz
|
||||
$ cd SDL_gfx-2.0.25
|
||||
$ ./configure --prefix=/mingw64 && make && make install
|
||||
|
||||
Proceed to the next "MinGW 32bit (i686) toolchains" section, or skip
|
||||
|
|
@ -269,7 +268,7 @@ Compiling and Installation
|
|||
32bit (i686) dependency libraries for Tux Paint
|
||||
|
||||
You can install tools and libraries required for compiling Tux Paint
|
||||
on MSYS2/MINGW using "pacman" except for SDL_Pango.
|
||||
on MSYS2/MINGW using "pacman" except for SDL_Pango and SDL_gfx.
|
||||
|
||||
"ntldd" is a small tool which examine windows executable files to
|
||||
list Dynamic Link Library (.dll) files they depends on. Tux Paint's
|
||||
|
|
@ -288,11 +287,9 @@ Compiling and Installation
|
|||
|
||||
Note: Close the shell before proceeding to the remaining process.
|
||||
|
||||
Install SDL_Pango and re-install SDL on the 32bit environment
|
||||
Install SDL_Pango and SDL_gfx on the 32bit environment
|
||||
|
||||
SDL_Pango should be installed manually. In addition, you have to
|
||||
re-install SDL from the source code or you will see unnecessary
|
||||
blank window opens when starting Tux Paint.
|
||||
SDL_Pango and SDL_gfx should be installed manually.
|
||||
|
||||
This time, use the MinGW "32bit" shell. Open the shell from the
|
||||
"Start Menu" -> "MSYS2 64bit" -> "MSYS2 MinGW 32-bit"
|
||||
|
|
@ -315,14 +312,15 @@ Compiling and Installation
|
|||
$ patch -p0 < ../SDL_Pango-configure-extra-api.patch
|
||||
$ ./configure --prefix=/mingw32 && make && make install
|
||||
|
||||
SDL
|
||||
SDL_gfx
|
||||
|
||||
Download source tar-ball of SDL_1.2.15 from libsdl.org.
|
||||
Download source tar-ball of SDL_gfx-2.0.25 from SDL_gfx's page on
|
||||
Sourceforge.net.
|
||||
|
||||
Re-install SDL as follows.
|
||||
Install SDL_gfx as follows.
|
||||
|
||||
$ tar zxvf SDL-1.2.15.tar.gz
|
||||
$ cd SDL-1.2.15
|
||||
$ tar zxvf SDL_gfx-2.0.25.tar.gz
|
||||
$ cd SDL_gfx-2.0.25
|
||||
$ ./configure --prefix=/mingw32 && make && make install
|
||||
|
||||
-------------------------------------------------------
|
||||
|
|
@ -634,6 +632,7 @@ Compiling and Installation
|
|||
* libsdl_mixer
|
||||
* libsdl_pango
|
||||
* libsdl_ttf
|
||||
* libsdl_gfx
|
||||
* pkgconfig
|
||||
* zlib
|
||||
... but you should install any package that is required by the
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
</p>
|
||||
|
||||
<p>
|
||||
September 6, 2021 </p>
|
||||
September 19, 2021 </p>
|
||||
</center>
|
||||
|
||||
<hr size="2"
|
||||
|
|
@ -502,7 +502,7 @@
|
|||
For sounds for different locales (e.g., if the sound is someone saying a word, and you want translated versions of the word said), also create WAV or OGG files with the locale's label in the filename, in the form: "<code>stamp_LOCALE.EXT</code>" </p>
|
||||
|
||||
<p>
|
||||
"<code>stamp.png</code>"'s sound effect, when Tux Paint is run in Spanish mode, would be "<code>stamp.png</code>". In French mode, "<code>stamp_es.wav</code>". In Brazilian Portuguese mode, "<code>stamp_fr.wav</code>". And so on... </p>
|
||||
The sound effect that will be played when the stamp corresponding to the image file "<code>stamp.png</code>" is selected, and when Tux Paint is using the Spanish locale, would be "<code>stamp_es.wav</code>". Under the French locale, it would be "<code>stamp_fr.wav</code>". Under the Brazilian Portuguese locale, "<code>stamp_pt_BR.wav</code>". And so on... </p>
|
||||
|
||||
<p>
|
||||
If no localized sound effect can be loaded, Tux Paint will attempt to load the 'default' sound file. (e.g., "<code>stamp.wav</code>") </p>
|
||||
|
|
@ -531,7 +531,7 @@
|
|||
<p>
|
||||
For descriptive sounds for different locales, also create WAV or OGG files with <em>both</em> "<code>_desc</code>" <em>and</em> the locale's label in the filename, in the form: "<code>stamp_desc_LOCALE.EXT</code>" </p>
|
||||
|
||||
"<code>stamp.png</code>"'s descriptive sound, when Tux Paint is run in Spanish mode, would be "<code>stamp_desc_es.wav</code>". In French mode, "<code>stamp_desc_fr.wav</code>". In Brazilian Portuguese mode, "<code>stamp_desc_pt_BR.wav</code>". And so on...
|
||||
The descriptive sound that will be played when the stamp corresponding to the image file "<code>stamp.png</code>" is selected, and when Tux Paint is using the Spanish locale, would be "<code>stamp_desc_es.wav</code>". Under the French locale, it would be "<code>stamp_desc_fr.wav</code>". Under the Brazilian Portuguese locale, "<code>stamp_desc_pt_BR.wav</code>". And so on...
|
||||
<p>
|
||||
If no localized descriptive sound can be loaded, Tux Paint will attempt to load the 'default' sound file. (e.g., "<code>stamp_desc.wav</code>") </p>
|
||||
</blockquote>
|
||||
|
|
@ -612,21 +612,21 @@
|
|||
Normal tinter — "<code><b>tinter=normal</b></code>" (the default) </dt>
|
||||
|
||||
<dd>
|
||||
This is the normal tinting mode. (Hue range is ±18°, 27 replace.) </dd>
|
||||
|
||||
<dt>
|
||||
'Any hue' tinter — "<code><b>tinter=anyhue</b></code>"
|
||||
</dt>
|
||||
|
||||
<dd>
|
||||
This remaps all hues in the stamp. (Hue range is ±180°.) </dd>
|
||||
This is the normal tinting mode. First, the primary hue of the stamp is determined. (For example, a picture of a flower with a stem will have the petal color seen as the primary hue of the overall image.) Next, the most highly saturated part of the picture is found. With "normal tinter", the range of hue used to do this starts out within ±18° of the pimary hue found in step 1. (If none can be found, it widens the range by 50% and tries again.) Finally, the image is tinted. Anything falling within 50% of the range (e.g., ±27°) is altered to have the hue of the color chosen by the user. </dd>
|
||||
|
||||
<dt>
|
||||
Narrow tinter — "<code><b>tinter=narrow</b></code>"
|
||||
</dt>
|
||||
|
||||
<dd>
|
||||
This like the "<code>anyhue</code>" option, but with a narrower hue angle. (Hue range is ±6°, 9 replace.) </dd>
|
||||
This like the "<code>normal</code>" option described above, but starts a narrower hue range of ±6°. Anything found within 50% of the range (e.g. ±9°) is tinted. If too much of your stamp is being tinted, try this option. </dd>
|
||||
|
||||
<dt>
|
||||
'Any hue' tinter — "<code><b>tinter=anyhue</b></code>"
|
||||
</dt>
|
||||
|
||||
<dd>
|
||||
This remaps <em>all</em> hues in the stamp. It works similarly to the "<code>anyhue</code>" and "<code>narrow</code>" options described above, but the hue range is ±180°. </dd>
|
||||
|
||||
<dt>
|
||||
Vector tinter — "<code><b>tinter=vector</b></code>"
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
</p>
|
||||
|
||||
<p>
|
||||
September 5, 2021 </p>
|
||||
September 17, 2021 </p>
|
||||
</center>
|
||||
|
||||
<hr size="2" noshade />
|
||||
|
|
@ -305,7 +305,7 @@
|
|||
|
||||
<blockquote>
|
||||
<p>
|
||||
You can install tools and libraries required for compiling Tux Paint on MSYS2/MINGW using "<code>pacman</code>" except for SDL_Pango. </p>
|
||||
You can install tools and libraries required for compiling Tux Paint on MSYS2/MINGW using "<code>pacman</code>" except for SDL_Pango and SDL_gfx. </p>
|
||||
<p>
|
||||
"<code>ntldd</code>" is a small tool which examine windows executable files to list Dynamic Link Library (<code>.dll</code>) files they depends on. Tux Paint's packaging process for binary distribution uses it to find required <code>.dll</code> files. </p>
|
||||
<p>
|
||||
|
|
@ -328,11 +328,11 @@
|
|||
</blockquote>
|
||||
|
||||
<h4>
|
||||
Install SDL_Pango and re-install SDL on the 64bit environment </h4>
|
||||
Install SDL_Pango and SDL_gfx on the 64bit environment </h4>
|
||||
|
||||
<blockquote>
|
||||
<p>
|
||||
SDL_Pango should be installed manually. In addition, you have to re-install SDL from the source code or you will see unnecessary blank window opens when starting Tux Paint. </p>
|
||||
SDL_Pango and SDL_gfx should be installed manually. </p>
|
||||
<p>
|
||||
This time, use the MinGW "64bit" shell. Open the shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MinGW 64-bit" </p>
|
||||
|
||||
|
|
@ -360,15 +360,15 @@
|
|||
</p>
|
||||
</blockquote>
|
||||
|
||||
<h5>SDL</h5>
|
||||
<h5>SDL_gfx</h5>
|
||||
<blockquote>
|
||||
<p>
|
||||
Download <a href="http://www.libsdl.org/release/SDL-1.2.15.tar.gz">source tar-ball of SDL_1.2.15</a> from <a href="http://www.libsdl.org/">libsdl.org</a>. </p>
|
||||
Download <a href="https://sourceforge.net/projects/sdlgfx/files/SDL_gfx-2.0.25.tar.gz/download">source tar-ball of SDL_gfx-2.0.25</a> from <a href="https://sourceforge.net/projects/sdlgfx/">SDL_gfx's page on Sourceforge.net</a>. </p>
|
||||
<p>
|
||||
Re-install SDL as follows. <blockquote>
|
||||
Install SDL_gfx as follows. <blockquote>
|
||||
<code>
|
||||
$ tar zxvf SDL-1.2.15.tar.gz<br/>
|
||||
$ cd SDL-1.2.15<br/>
|
||||
$ tar zxvf SDL_gfx-2.0.25.tar.gz<br/>
|
||||
$ cd SDL_gfx-2.0.25<br/>
|
||||
$ ./configure --prefix=/mingw64 && make && make install
|
||||
</code>
|
||||
</blockquote>
|
||||
|
|
@ -403,7 +403,7 @@
|
|||
|
||||
<blockquote>
|
||||
<p>
|
||||
You can install tools and libraries required for compiling Tux Paint on MSYS2/MINGW using "<code>pacman</code>" except for SDL_Pango. </p>
|
||||
You can install tools and libraries required for compiling Tux Paint on MSYS2/MINGW using "<code>pacman</code>" except for SDL_Pango and SDL_gfx. </p>
|
||||
<p>
|
||||
"<code>ntldd</code>" is a small tool which examine windows executable files to list Dynamic Link Library (<code>.dll</code>) files they depends on. Tux Paint's packaging process for binary distribution uses it to find required <code>.dll</code> files. </p>
|
||||
<p>
|
||||
|
|
@ -426,11 +426,11 @@
|
|||
</blockquote>
|
||||
|
||||
<h4>
|
||||
Install SDL_Pango and re-install SDL on the 32bit environment </h4>
|
||||
Install SDL_Pango and SDL_gfx on the 32bit environment </h4>
|
||||
|
||||
<blockquote>
|
||||
<p>
|
||||
SDL_Pango should be installed manually. In addition, you have to re-install SDL from the source code or you will see unnecessary blank window opens when starting Tux Paint. </p>
|
||||
SDL_Pango and SDL_gfx should be installed manually. </p>
|
||||
<p>
|
||||
This time, use the MinGW "32bit" shell. Open the shell from the "Start Menu" -> "MSYS2 64bit" -> "MSYS2 MinGW 32-bit" </p>
|
||||
|
||||
|
|
@ -458,15 +458,15 @@
|
|||
</p>
|
||||
</blockquote>
|
||||
|
||||
<h5>SDL</h5>
|
||||
<h5>SDL_gfx</h5>
|
||||
<blockquote>
|
||||
<p>
|
||||
Download <a href="http://www.libsdl.org/release/SDL-1.2.15.tar.gz">source tar-ball of SDL_1.2.15</a> from <a href="http://www.libsdl.org/">libsdl.org</a>. </p>
|
||||
Download <a href="https://sourceforge.net/projects/sdlgfx/files/SDL_gfx-2.0.25.tar.gz/download">source tar-ball of SDL_gfx-2.0.25</a> from <a href="https://sourceforge.net/projects/sdlgfx/">SDL_gfx's page on Sourceforge.net</a>. </p>
|
||||
<p>
|
||||
Re-install SDL as follows. <blockquote>
|
||||
Install SDL_gfx as follows. <blockquote>
|
||||
<code>
|
||||
$ tar zxvf SDL-1.2.15.tar.gz<br/>
|
||||
$ cd SDL-1.2.15<br/>
|
||||
$ tar zxvf SDL_gfx-2.0.25.tar.gz<br/>
|
||||
$ cd SDL_gfx-2.0.25<br/>
|
||||
$ ./configure --prefix=/mingw32 && make && make install
|
||||
</code>
|
||||
</blockquote>
|
||||
|
|
@ -812,6 +812,7 @@
|
|||
<li><code>libsdl_mixer</code></li>
|
||||
<li><code>libsdl_pango</code></li>
|
||||
<li><code>libsdl_ttf</code></li>
|
||||
<li><code>libsdl_gfx</code></li>
|
||||
<li><code>pkgconfig</code></li>
|
||||
<li><code>zlib</code></li>
|
||||
</ul>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue