Commit graph

242 commits

Author SHA1 Message Date
Pere Pujal i Carabantes
a1c778135d Merge branch 'master' into sdl2.0
Merging master 2019-september-24 into sdl2.0 branch
2019-09-24 14:52:40 +02:00
Bill Kendrick
2911b35a50 Elevate "Fill" from Magic Tool to real Tool
Replace the somewhat-recently-added "nothing" item in the tool bar
with the "Fill" tool, which has been converted back from a Magic tool
to a regular tool.

Also, change bash "==" to sh "=" in "if [ ... ]" tests in Makefile.

Also, link to math library (via "-lm") to make sure "max()" is available to
magic tools.

Also, add missing mention of "--newcolorslast" and "--newcolorsfirst" to manpage.
2019-09-12 23:04:13 -07:00
Bill Kendrick
7938480174 Clean up GCC warnings (2019-08-29 edition)
Updated most parts of the code that were throwing warnings in GCC.
2019-08-30 00:01:00 -07:00
Pere Pujal i Carabantes
f836cc775a Magic tools: Inline->static for android, corrected paths to avoid double slash which makes SDL2 not loading the stuff from assets.
Thoose changes were already in the SDL2 and android versions, they were reverted somehow...
2018-02-28 00:23:15 +01:00
Pere Pujal i Carabantes
1e0ea6d4b3 Indentation. 2017-12-19 02:17:27 +01:00
Pere Pujal i Carabantes
d38b4abd68 Integrating android support. 2017-12-06 06:39:40 +01:00
Pere Pujal i Carabantes
35f7ebd482 Mosaic_shaped seems to work again with SDL2 (manually merged) 2017-12-06 06:39:39 +01:00
Pere Pujal i Carabantes
8693724975 More on SDL2. Now compiles, still needs a lot of cleaning and work to deal with SDL_DisplayFormat* from 1.2 2017-12-06 06:39:37 +01:00
Bill Kendrick
4ab8280bbe indent xor.c 2017-10-15 11:51:27 -07:00
Bill Kendrick
5a88d476c8 indent waves.c 2017-10-15 11:51:22 -07:00
Bill Kendrick
cc7dd8e3c9 indent tv.c 2017-10-15 11:51:18 -07:00
Bill Kendrick
011f7f27c1 indent tornado.c 2017-10-15 11:51:13 -07:00
Bill Kendrick
cf3173690d indent toothpaste.c 2017-10-15 11:51:10 -07:00
Bill Kendrick
5871ef9b3a indent tint.c 2017-10-15 11:51:06 -07:00
Bill Kendrick
d311aeb236 indent string.c 2017-10-15 11:51:02 -07:00
Bill Kendrick
29b25992ad indent snow.c 2017-10-15 11:50:59 -07:00
Bill Kendrick
6071c06c06 indent smudge.c 2017-10-15 11:50:37 -07:00
Bill Kendrick
e6a81956de indent shift.c 2017-10-15 11:50:00 -07:00
Bill Kendrick
fee4c7ca44 indent sharpen.c 2017-10-15 11:49:48 -07:00
Bill Kendrick
ac74e0ed51 indent rosette.c 2017-10-15 11:49:41 -07:00
Bill Kendrick
fea1b424ba indent ripples.c 2017-10-15 11:49:34 -07:00
Bill Kendrick
247be68e46 indent realrainbow.c 2017-10-15 11:49:17 -07:00
Bill Kendrick
408bb07151 indent rain.c 2017-10-15 11:49:06 -07:00
Bill Kendrick
b52cf2b0a5 indent rainbow.c 2017-10-15 11:49:01 -07:00
Bill Kendrick
b06b7e51b4 indent rails.c 2017-10-15 11:48:54 -07:00
Bill Kendrick
6a89ec2384 indent puzzle.c 2017-10-15 11:48:44 -07:00
Bill Kendrick
04580641df indent perspective.c 2017-10-15 11:48:38 -07:00
Bill Kendrick
88e9a3dfcf indent noise.c 2017-10-15 11:48:27 -07:00
Bill Kendrick
53a328e903 indent negative.c 2017-10-15 11:48:18 -07:00
Bill Kendrick
5e83b2408d indent mosaic_shaped.c 2017-10-15 11:48:08 -07:00
Bill Kendrick
bd18815216 indent mosaic.c 2017-10-15 11:48:02 -07:00
Bill Kendrick
18be491419 indent mirror_flip.c 2017-10-15 11:47:45 -07:00
Bill Kendrick
800d8af3b7 indent metalpaint.c 2017-10-15 11:47:37 -07:00
Bill Kendrick
7e524f44ad indent light.c 2017-10-15 11:47:27 -07:00
Bill Kendrick
e146c3df38 indent kalidescope.c 2017-10-15 11:47:20 -07:00
Bill Kendrick
3bfbc3e741 indent halftone.c 2017-10-15 11:47:04 -07:00
Bill Kendrick
fb1e2a092d indent grass.c 2017-10-15 11:46:50 -07:00
Bill Kendrick
9fd870b985 indent glasstile.c 2017-10-15 11:45:55 -07:00
Bill Kendrick
8a7edd82bf indent fretwork.c 2017-10-15 11:45:47 -07:00
Bill Kendrick
31cb4f4505 indent fold.c 2017-10-15 11:45:23 -07:00
Bill Kendrick
c855261af2 indent foam.c 2017-10-15 11:44:56 -07:00
Bill Kendrick
8eff6a9930 indent flower.c 2017-10-15 11:44:48 -07:00
Bill Kendrick
b11972979c indent fisheye.c 2017-10-15 11:44:41 -07:00
Bill Kendrick
0608ce4c34 indent fill.c 2017-10-15 11:44:35 -07:00
Bill Kendrick
ce8121301a indent fade_darken.c 2017-10-15 11:44:27 -07:00
Bill Kendrick
16a92fb71a indent emboss.c 2017-10-15 11:44:03 -07:00
Bill Kendrick
3d2cd7d327 indent distortion.c 2017-10-15 11:43:55 -07:00
Bill Kendrick
aac7e00ba2 indent confetti.c 2017-10-15 11:43:43 -07:00
Bill Kendrick
44286395b3 indent cartoon.c 2017-10-15 11:43:06 -07:00
Bill Kendrick
0a167dbc71 indent calligraphy.c 2017-10-15 11:39:45 -07:00