b2feccc039Restored changes in main() that I overwrote in merge
Yves Rizoud
2009-10-31 18:11:13 +00:00
ba36fa675f-Moved test script to "scripts" directory -Allow to add other scripts to this dir and run them too. --Cette ligne, et les suivantes ci-dessous, seront ignorées--
Adrien Destugues
2009-10-31 17:33:04 +00:00
b021a52fc3Skins: Fix preview area after loading invalid file
Yves Rizoud
2009-10-31 17:16:48 +00:00
fb3404e2baPartial patch to allow loading spare page from command line. It's not working yet but does not introduce regressions instead. Cleaned up version of patch proposed on the issue tracker.
Adrien Destugues
2009-10-31 16:42:08 +00:00
036d8008cb(internal) Skins have their own GUI color indices : avoids sharing/restoring MC_ colors
Yves Rizoud
2009-10-31 15:46:07 +00:00
1a2ac678e0Splitted loadsave.c : - loadsave.c : common things - fileformats.c : format that make a full backup of any picture without palette loss - miscfileformats.c : formats that are not saving all the picture (palette only, pixels only, constrained palette)
Adrien Destugues
2009-10-31 15:20:44 +00:00
7105566433Compilation fixes: A typo, and a cast double->int
Yves Rizoud
2009-10-31 13:50:55 +00:00
8114cae1e9Added (r,g,b)=getcolor(c) to lua binding.
Adrien Destugues
2009-10-31 13:01:56 +00:00
49cce9643eLoad the favorite colors from the skin, not the ini file. We may want to override them, but for now just change the skin's palette.
Adrien Destugues
2009-10-31 12:10:07 +00:00
2b02ff505fMoved skin preview to the Gfx struct so it is not overwritten if you cancel skin loading.
Adrien Destugues
2009-10-31 11:19:44 +00:00
a2fd796e59Proper remapping on skin change in (almost) all cases. I commit this before breaking everything trying to fix the remaining issue...
Adrien Destugues
2009-10-31 10:44:09 +00:00
f9dc259af5-Update Doxyfile for newer doxygen version -Fix some problems with doxygen comments -Regenerate doxygen documentation
Adrien Destugues
2009-10-31 09:36:35 +00:00
d4b730cb4dRemap the preview of the skin and use the old colors to draw the list in order to keep the skin changer looking good even if skins use different MC_ indexes. Thingsd are still messed up after loading a skin but I can't find out why this happens and remap does not seem to help.
Adrien Destugues
2009-10-30 21:56:56 +00:00
b2a32b93c6Added version of the classic skin with remapped colors for testing the skin switcher
Adrien Destugues
2009-10-30 19:23:24 +00:00
f4defe7e75Moved "show limits" and "separate colors" to skin dialog
Adrien Destugues
2009-10-30 15:19:59 +00:00
7af6b92e3eReset quicksearch when entering a directory.
Adrien Destugues
2009-10-30 11:51:07 +00:00
56a4c704feAdded lua binding to select the color brush.
Adrien Destugues
2009-10-30 10:45:52 +00:00
9b45134596Apply patch from issue 223 and some more tweaks as later suggested in the comments.
Adrien Destugues
2009-10-30 10:26:44 +00:00
0ae98c2e56Makefile fixes for lua packaging
Yves Rizoud
2009-10-29 23:35:59 +00:00
0694f69c9ctrunk: Lua binding works on Windows.
Yves Rizoud
2009-10-29 22:50:34 +00:00
b0aa1dcbabAdded Ok and Cancel buttons in value requester. Don't do anything in palette screen if user enters strange value, not even a reduction to 256 as this drops unused colors.
Adrien Destugues
2009-10-29 22:05:14 +00:00
2a67c9bdceRefactored (yes, already) the lua API to allow also generating pictures directly. Updated doc, and added sample script.
Adrien Destugues
2009-10-29 17:27:49 +00:00
06892015eaadded lua binding to set a color in the palette
Adrien Destugues
2009-10-29 15:52:21 +00:00
1934425972Added "Brush Factory", allowing you to run a lua script to generate (or alter, untested yet) a brush. Added a simple (and ugly) sample script. This needs updates to the makefile for platforms other than linux. TODO: add a listbox to select the script you want to run. Do we have a simple API to handle filelists yet ?
Adrien Destugues
2009-10-29 15:22:45 +00:00
4d20be0053Fixed some more amiga vbcc warnings
Adrien Destugues
2009-10-27 10:28:32 +00:00
54a673f10fFixed some warnings spotted by vbcc on amiga.
Adrien Destugues
2009-10-25 14:36:49 +00:00
42ac69177fAdded a color counter to the palette screen. It needs the setting to autocount colors to be enabled and probably display garbage when it's disabled. Is this setting really useful ? Do someone dsable it ?
Adrien Destugues
2009-10-24 14:06:12 +00:00
111fbbcf33-Introduce new Requester_window to ask the user to enter a single value -Reduce colors in the palette screen is now a dropdown for easy access to usual values. "Other" option opens a requester to enter a custom one if needed -Some cleanup to make things a little more readable -Build fixes after versionning system revert
Adrien Destugues
2009-10-24 13:42:59 +00:00
19decb6d4cTrunk: Restored working behavior for version and pversion
Yves Rizoud
2009-10-21 23:00:58 +00:00
3781dae7d3[layers] Updated from trunk.
Yves Rizoud
2009-10-21 22:44:45 +00:00
2a8546eaeftrunk: Windows' .ICO icons can be read too. Removed jpeg.dll, not used.
Yves Rizoud
2009-10-21 22:28:38 +00:00
db130fc60dtrunk: Implemented file loading of JPEG, TGA, TIFF and a few others, by using SDL_Image builtin loader. Added visible 'hourglass' cursor during 24bit color reduction.
Yves Rizoud
2009-10-21 22:12:56 +00:00
22d5e7de70[layers] Updated from trunk: 'All formats' filter in file selectors
Yves Rizoud
2009-10-21 09:57:38 +00:00
9ef0e6b74c(trunk) File save/load only shows common file extensions by default. (choice 'all' in filter, different from '*.*')
Yves Rizoud
2009-10-21 01:52:07 +00:00
9e68266ff8Merged release into trunk
Yves Rizoud
2009-10-20 19:02:54 +00:00
4afff2ca9bRelease: Fix issue 217: high CPU usage while idle
Yves Rizoud
2009-10-20 18:46:37 +00:00
8cf9b530a8Release: Fix issue 217: high CPU usage while idle
Yves Rizoud
2009-10-20 18:43:34 +00:00
89f2173d70[layers] Implemented SwapUp and SwapDown (Alt-PgUp, Alt-PgDown) to change layers order; Implemented layer merge (Alt-End); improved GIF loader to read images with optimized layers (smaller) and the ones with a transparent color different than zero.
Yves Rizoud
2009-10-18 19:06:07 +00:00
abb6204757[layers] Limited to 32 layers. (previously there was no limit and the 16-bit depth buffer wrapped). Fixed a display bug after picture transforms or layers add/del.
Yves Rizoud
2009-10-14 00:13:49 +00:00
2dcc1cf8bd[layers] Stats on memory usage in the Stats screen. Tracks the number and total memory size of the pages (bitmaps) used by layers and their backups. Doesn't count housekeeping costs.
Yves Rizoud
2009-10-13 19:07:58 +00:00
7690cd9e50[layers] Added functions to add and delete layers (Keyboard shortcuts alt-ins and alt-del) Now defaults back to 1 layer per image on startup.
Yves Rizoud
2009-10-13 01:03:32 +00:00
64f1449a3b[layers] Merged in the changes from r1070.
Yves Rizoud
2009-10-12 23:50:09 +00:00
d9e95ae921(trunk) Tell svn to ignore changes in gfx2.cfg
Yves Rizoud
2009-10-12 23:39:49 +00:00
2049f96c59[layers] Implemented layer insertion. No keys or menu yet, but it's already used when loading images, to make an image with right number of layers. Undoing/redoing such change works. Implemented single-layer deletion (untested)
Yves Rizoud
2009-10-08 23:54:02 +00:00
dc70d2f59f[layers] Merged-in the trunk changes (support for variable-height menu bar). Color replacer now works. Saving non-layer formats issues a warning and saves flattened version of the visible layers.
Yves Rizoud
2009-10-08 21:41:25 +00:00
eb1878e413[layers] Fix a merge error from last commit which disabled layer selection. Implemented Fill. Color replacer in progress (ie: it crashes).
Yves Rizoud
2009-10-08 00:58:45 +00:00
953185205dInternal support for variable-height menu
Yves Rizoud
2009-10-07 22:27:14 +00:00
0b07b43722[layers] Merged r1063 from trunk. Separated the controls for layers from translucency keys. Can now control up to 8 layers
Yves Rizoud
2009-10-07 00:07:27 +00:00
2f1888e50d[layers] Implemented 'Copy to spare - pixels'. It replaces the current layer in the spare, resizing the whole spare (all layers) as needed.
Yves Rizoud
2009-10-06 23:28:37 +00:00
6f8223b09btrunk: Continued the handling of multiple effect on single shortcuts. Multiple window-open work (one after an other), and the restriction on shortcuts that are disabled while drawing is now applied correctly.
Yves Rizoud
2009-10-06 23:24:00 +00:00
5fd28bdd3btrunk: Reserved hotkeys for layers. Allowed a single shortcut to launch several actions (Issue 88)
Yves Rizoud
2009-10-06 22:42:43 +00:00
bdf0186c7f-Added help about rgb option -Better formatting of the video mode list
Adrien Destugues
2009-10-06 12:26:29 +00:00
874ccd4430[layers] Fix a bug with scroll. Implemented basic save/load of layers in GIF as non-looping animation.
Yves Rizoud
2009-10-04 01:25:38 +00:00
f253728e5eSomewhat fixed joystick cursor management on gp2X... doesn't work so well but still, it's useable now.
Adrien Destugues
2009-10-03 13:14:24 +00:00
33c371798dFix build on gp2x. Joystick handling of cursor is moving way too fast on the small 320x240 screen, but I can't understnad why...
Adrien Destugues
2009-10-03 12:33:52 +00:00
56e62c4b47[layers] Fixed many embarrassing memory overruns and uninitialized memory reads. Woops.
Yves Rizoud
2009-10-01 22:11:26 +00:00
9be9ed9c17[layers] Sped up the switching from one active layer to another, when the new layer was already displayed (thanks to the depth buffer, again)
Yves Rizoud
2009-09-30 21:37:16 +00:00
61f0a4ec71[layers] Sped up the scrolling/adjusting of single layers. Speed is no longer relative to the number of visible layers. Pulkomandy, your idea of depth buffer was genius.
Yves Rizoud
2009-09-29 17:57:43 +00:00
473679ce29[layers] Implemented shared layers. Speeds up Backup() by 800. Little unrelated bug: On program start, use 'tab' at least once, or the undo buffers won't be updated on screen.
Yves Rizoud
2009-09-28 22:00:04 +00:00
2fd88b81bb[layers] work on layer sharing (still stable)
Yves Rizoud
2009-09-28 21:01:29 +00:00
057d5e76e4[layers] working swap between main/spare, and loading files in command-line. Start of work on variable layers number and layer sharing.
Yves Rizoud
2009-09-28 18:48:05 +00:00
b534cfd7d4[layers] Picture effects now work
Yves Rizoud
2009-09-26 18:01:25 +00:00
b18266e017[layers] Resizing canvas now works
Yves Rizoud
2009-09-26 17:51:08 +00:00
78e59e6127(layers branch) Adjust tool implemented. Left click and drag to move a single layer, Right-click and drag to move everything.
Yves Rizoud
2009-09-22 22:55:02 +00:00
cedb706326First svn commit of the experiment with layers. Preemptive backup (to shorten delay before drawing) is currently disabled. Basic Undo/Redo works, but not image resizing, the adjust tool, and saving (not even flattened)
Yves Rizoud
2009-09-21 14:16:41 +00:00
faea65e62bInitializing branch 'layers' from trunk at revision 1034
Yves Rizoud
2009-09-21 13:59:30 +00:00
93efc7e9e9Everything compiles. Some kludges left regarding version and pversion. Now to get it to link...
Adrien Destugues
2009-09-19 23:49:52 +00:00
b3f2deedac... and fixes the build back.
Adrien Destugues
2009-09-19 22:47:10 +00:00
b12423d03bTrying to compile on amiga with vbcc. Removed some useless unixisms. Still not working. Hope I did not break too much things.
Adrien Destugues
2009-09-19 22:41:51 +00:00
7a19586b2d(trunk) Version label: '2.2wip'
Yves Rizoud
2009-09-13 16:06:55 +00:00
e1d8ca9d05Fixed one compilation warning, fixed typo in help, Updated help and credits (pending approval by Pulkomandy!)
Yves Rizoud
2009-09-11 19:52:09 +00:00
2ce0a2538bMerged in fix by Petter (issue 211 comment 26). Made the C64 save window remember its settings (while the program is open)
Yves Rizoud
2009-09-06 18:59:20 +00:00
c894caf2f8Merged in Petter's save options for c64 pictures. (issue 211 comment 25)
Yves Rizoud
2009-09-05 22:10:49 +00:00
ba42b3cb17In fullscreen mode, auto-activate wide/tall pixels when you load a C64 multicolor picture, or a PNG picture you saved with wide/tall pixels.
Yves Rizoud
2009-09-05 21:20:43 +00:00
b92e8f288eUpdated copyright line
Yves Rizoud
2009-09-05 19:53:15 +00:00
2e46820b83Fixed tabulations to 2spaces (the most common in this file). Tiny bit of error-check on saving. Implemented preview scaling to display c64 widepixel pictures properly. Not done yet: Auto-set wide or wide2 pixels after loading a picture with wide pixels.
Yves Rizoud
2009-09-05 19:49:18 +00:00
6c3963bf33We're going to get it right...
Adrien Destugues
2009-09-05 17:02:18 +00:00
62ba2fd885Added c64 picture samples Put the correct version of loadsave.c. Sorry I'm a little ill today.
Adrien Destugues
2009-09-05 16:22:35 +00:00
cc47a21ecaAdded support for loading and saving c64 fileformats. Please test it :)
Adrien Destugues
2009-09-05 13:55:51 +00:00
04cbf954caFixed a display bug with small picture in zoom mode and grad rect.
Adrien Destugues
2009-09-05 13:41:23 +00:00