Commit Graph

197 Commits

Author SHA1 Message Date
twanvl d590819762 Removed last of the BeginDrawing/EndDrawing calls;
Added english_number_ordinal script function;
Working on symbols with a different aspect ratio (i.e. wider/smaller symbols)

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@558 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-12 17:01:07 +00:00
coppro b21192646b Added new feature allowing data files in the user's settings directory to override those in the default directory
It's for systems where the main data is not writable by everyone. (Unices, mainly, and potentially Windows Vista)
The Windows default directory is a little out-of-the-way, in %HOME%\Application Data\Magic Set Editor\Data
Maybe they should be configurable.
But it also paves the way for the installer being capable of putting packages into the user's local directory.
That way, users don't all have to have all the packages that the other users want.


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@557 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-12 01:10:45 +00:00
twanvl 8833d07c4a Added 'filter' support to position function; Made sure sort script can depend on the value of the field itself.
Cleaned up some things, why is a blank image not thread safe?

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@548 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-10 18:57:41 +00:00
coppro 7676c0b6b6 Compatibility
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@547 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-10 17:14:56 +00:00
twanvl 55a897e392 Implemented nicer string collation, with support for composed characters and accents;
Fixed symbol filter bug, green was not made transparent;
Slightly nicer error messages when forgeting 'type' keys.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@544 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-10 16:19:36 +00:00
twanvl 3c6721a0cb Symmetry actions now work; reflection symmetry is forced to use a multiple of two copies
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@539 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-10 03:15:46 +00:00
twanvl 1a01ac55f2 Rotation and reflection should now work correctly;
Finished the symmetry editor

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@538 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-10 02:47:27 +00:00
twanvl b409188013 Symbol editor now has constraints on selection, but part list allows selection inside groups.
Added logical 'xor' operator for scripting.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@534 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-09 20:43:16 +00:00
twanvl 31e60181ce Fixed bug when opening directory; too early return from function.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@533 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-09 20:41:52 +00:00
twanvl d00b09eb60 New symbol part list control that shows previews and has a built in editor
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@529 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-08 22:26:39 +00:00
twanvl b18dea0f69 Movement of objects with the arrow keys in symbol editor
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@527 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-08 13:48:53 +00:00
twanvl b46d979f9e Added the necessery classes to handle symmetry objects/mirrors in symbols; What used to be SymbolPart is now SymbolShape, SymbolPart is a base class.
This should also pave the way for grouping.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@526 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-08 01:12:55 +00:00
twanvl d4e46e06d8 'Edit' and 'gallery' button for symbol editor
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@522 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-07 18:04:02 +00:00
twanvl 9f567a512e Rotation can now zoom in x and y directions separatly; text can be scaled stretched/compressed horizontally.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@520 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-07 16:19:17 +00:00
twanvl 86235dfc91 Fixed undo issue for combined editor;
Added keyword usage statistics

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@516 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-07 00:55:27 +00:00
twanvl e3939813dc Cursor now moves correctly with script updates; tries to stay outside <sym> tags;
Closing </kw> tags no longer end up in keyword parameters

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@515 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-06 23:28:45 +00:00
twanvl 6e17e7d31f Added an option to create an installer package.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@512 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-06 20:19:02 +00:00
twanvl 86f7cb4176 Uses smart_less for position() script function
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@506 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-06 15:29:48 +00:00
twanvl 64ad82bdd8 Fixed 'todo' in reader in ASCII build
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@503 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-06 13:30:52 +00:00
twanvl 86393f33dc Fixed bug in script parser/compiler: "x[if a then b else c]" was incorrectly optimized;
Sciript parse errors in include files now get reported for the right file and line number.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@458 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-07-01 18:11:48 +00:00
twanvl 31b7380d99 Implemented exporting symbol fonts;
Rendering symbols to an image always uses anti-aliassing (by downsampling from a large size);
Finished the spoiler export template;
Added <soft-line> tag to make line breaks use the line height for soft line breaks

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@440 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-06-27 18:58:43 +00:00
twanvl 2868e014cf Script errors now have information on where the error occureed (what value);
Script operator "int + object" now uses string concatenation instead of converting the object to integer;
Html export window uses a dummy set for editing options, so we don't pollute the set's undo stack;
Choice rendererer in nativelook 'both' style always leaves room for the icon;
Version bump

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@438 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-06-27 12:18:54 +00:00
coppro 4bf2d44ebe Compatibility check - export is still a reserved word.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@431 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-06-24 15:32:15 +00:00
twanvl f0628317a3 Added clone() function to Value.
Added support for per-card styling

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@430 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-06-24 01:30:34 +00:00
twanvl e46cbe66b2 Cleaned up Set::Styling/Card::Styling by spliting that functionality into a 'DelayedIndexMaps' class;
Added 'right' and 'bottom' properties to style as an alternative way of specifying width/height;
Added content_width, content_height and content_lines properties that give feedback on text rendering;
Always show warnings when showing errors and vice-versa, this prevents script errors from appearing before the reader/parse error that caused them;
Finally some preliminairy work on export templates

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@428 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-06-22 23:12:41 +00:00
twanvl 97e0e8d6d6 Choice rendering now uses "style.image()" instead of "style.choice_images[value]";
Added script functions for working with multiple choice values;
Added in_context support for filter_rule;
Optimized toUpper/toLower because they are slow on windows (they use thread local storage and mutexes)

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@427 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-06-17 13:13:56 +00:00
twanvl 8b11433cbd Reader now warns about invalid UTF-8 files;
Fixed possible hang when reading multiline strings with incorrect indentation;
Warnings from reading are shown also in NewSetWindow;
Script parse errors get reported with the correct line number;

Added support for showing multiple choice fields as a single image;
Added 'line_below' to ChoiceField::Choice, for putting a line below menu items.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@420 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-06-12 19:35:24 +00:00
coppro af89fe04d5 Fixed caret size.
Made delete card button greyed-out with only one card in set (oops)


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@404 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-20 21:28:28 +00:00
coppro 9a2b992c06 Fixed GTK GetTextExtent bug
Added resources shell script


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@401 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-19 21:15:20 +00:00
twanvl b4c7cfb5bc attempt at fixing text extent for gtk
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@400 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-19 18:59:30 +00:00
coppro c51d7f8458 Fixed keyword list replacements messing up due to being multi-line.
Fixed GCC warnings.
Added linux installer directory.



git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@394 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-19 15:11:14 +00:00
twanvl e9597a142c Fixed bug in fields in style file;
No longer doing GetTextExtent("\n");
Moved pt boxes to style files;

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@390 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-18 22:22:18 +00:00
twanvl 4a6e10ad93 Support for extra card fields in stylesheets;
Fixed some bugs:
 - Missing choice images can crash mse.
 - The wrong style is used for making preview choice images on style panel.
FOR_EACH(x, *y.z) should now work without parentheses on linux as well.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@389 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-18 21:26:21 +00:00
twanvl d2fe3b6ba0 Fixed another smart pointer bug (assignment operator copied ref count);
Fixed symbol editor grid

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@385 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-16 19:18:16 +00:00
coppro 82a7690909 Fixed input.
Update configure script to wxWidgets 2.8
Added required 2.8 includes.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@382 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-15 16:41:08 +00:00
twanvl f21f11ac87 Support for automatic curly quotes
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@375 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-14 18:24:01 +00:00
twanvl ce51c7061a Legends for graphs; pie scatter graphs
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@369 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-14 15:37:04 +00:00
twanvl 73c2d9b152 Reader now correctly reads the last line of input (if no newline at eof)
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@365 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-14 00:07:07 +00:00
twanvl 04366b3505 Fixed: custom keywords not immediatly active;
Version bump;
Moved the busy cursor to actual loading of set;

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@364 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-13 23:55:37 +00:00
twanvl 41989c0755 Scatter plots
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@363 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-13 23:43:24 +00:00
twanvl 3702ff5846 clipboard functions for keywords
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@358 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-13 22:16:58 +00:00
twanvl 8d5fc6949f Choice images recomputed less often;
Implemented GraphType for choosing different layouts on the stats panel;
Added option to define order of graph groups;
Added busy cursor when loading recent file;
Parentheses in FOR_EACH macro

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@351 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-13 15:22:26 +00:00
twanvl 3b45bb81f6 Support for 2d bar graphs;
separator_after for keywords;
Slightly more advanced english_plural/singular;
Windows uninstaller will remove app data

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@348 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-13 01:22:11 +00:00
twanvl 2d48f27fe0 Added support for separators that are part of a parameter;
Keywords match whole words only;
Added english_singular/plural functions;
Fixed possible infinite loop in reader

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@347 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-12 20:17:49 +00:00
twanvl 0ffc387983 indication of ascii build in about box
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@343 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-12 15:36:27 +00:00
twanvl 33fd2b5e18 default smart pointer type switched to intrusive_ptr
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@337 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-11 21:34:53 +00:00
twanvl 3b6743b110 Added support for custom colors for graphs;
Moved 'choice colors' from styel to field, split into 'choice colors' and 'choice colors cardlist';
Added support for pie graphs (no gui to use them, though);
Fixed bugs caused by selecting a card before the set was changed on all panels.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@336 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-11 14:10:29 +00:00
twanvl 3c4729aaa2 Added 'position hint' to packages, used to specify the order of the packages in a package list;
Added 'pack type', intended for playtesting (random boosters/starters);
Added 'default(_image)' property to ImageStyle, and added the frame fillers for magic;
Added blurring and bold printing (rather hacky) to the text rendering functions (used for "double click to add image" text);
Added 'symmetric overlay' combine mode, which will look really nice for hybrids;
Moved the watermark choices from the game to an include file in magic-watermarks;
Working on a replacement for the image scripting system that plays nicer with the rest of the code. In particular, it will be possible to compare generated images quickly, so they can be updated continuously. This is a work in progress, currently there are two versions of everything.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@327 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-09 21:41:15 +00:00
twanvl 90b685f0f8 Working on installer packages;
Nicer warnings about using spaces for indentation

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@321 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-06 00:30:53 +00:00
twanvl 6feef4feb0 Fixed/hacked 'no parameter' for 0.2.7 keyword compatability;
Added 'just_header' flag to make stylesheet list load faster;
Added versioning and dependency support to packages

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@320 0fc631ac-6414-0410-93d0-97cfa31319b6
2007-05-05 23:19:52 +00:00