amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 13:06:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
317 Commits 3 Branches 0 Tags
aa47f6fb3236c010e4fe2a4c188fe2e17fe5acd4
Commit Graph

79 Commits

Author SHA1 Message Date
twanvl b5f964d85b fixed bug in parser for if statement without else 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@322 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-05-06 01:10:58 +00:00
twanvl cc642c58b0 Fixed cursor position before <atom>s 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@313 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-04-30 15:00:11 +00:00
twanvl e38cc6e2c9 Fixed dependencies for 'styling'; 
Fixed: specific character prefered over .* for keywords

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@306 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-04-28 21:58:29 +00:00
coppro 7c40df0624 Updated a few GCC issues, and case-sensitivity of filenames. 
I had to rename the export function in Apprentice.cpp since "export" is a reserved word according to the C++ standard. I don't know whether GCC supports it yet, but it certainly complains.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@302 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-04-25 00:16:29 +00:00
twanvl 87d751747d fixed infinite loop in parser 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@293 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-04-22 23:18:10 +00:00
twanvl a2e709d86b It is 2007 by now 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@275 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-04-21 17:06:29 +00:00
twanvl fef99c78e3 Added list for refering to keyword parameters; keyword database updated when keywords change 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@270 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-04-20 16:10:54 +00:00
twanvl 9f24da8d02 dependency handling for keywords 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@265 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-04-18 22:59:03 +00:00
twanvl 99f44292d6 enlgish language stuff for keywords 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@264 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-04-18 21:33:32 +00:00
twanvl 8e3049d0ee improved error reporting for the keyword editor 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@260 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-04-16 23:45:01 +00:00
twanvl 7b45f6f69e Editing of keywords 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@255 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-04-13 23:59:42 +00:00
twanvl 7deecad835 cleaned up magic keywords; correct drawing of placeholders 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@235 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-03-24 22:06:15 +00:00
coppro 851799d1b6 Fixed some bugs to make GCC work. I needed to change SimpleValueAction to take the function as a variable as opposed to a template parameter - GCC won't accept pointers from a base class in templates. 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@231 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-03-23 00:57:06 +00:00
twanvl 9052636ff9 Addded script functions for exporting, ExportTemplate package type 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@220 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-03-20 17:21:08 +00:00
twanvl f2ce80d88a Split script/functions.cpp into multiple files in new script/functions/ directory. 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@217 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-03-18 22:13:27 +00:00
twanvl 0464f5f7fc The DECLARE_TYPEOF(()) calls don't work in MSVC, I changed it to use a COMMA macro instead of , 
If this doesn't work in GCC, the COMMA definition could be made only for MSVC, then GCC sees DECLARE_TYPEOF(map<int COMMA string>). GCC doesn't need DECLARE_TYPEOF anyway.

Keyword expansion now works, still todo:
 - marking parameters, e.g. "Cycling 2W" -> "Cycling <param-mana>2W</param-mana>"
 - user interface for toggling reminder text
 - user interface for keywords

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@210 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-03-17 23:58:16 +00:00
coppro 83b6aa36f8 Removed DECLARE_TYPEOF2; replaced with double-parenthesized macro calls. (GCC doesn't accept the other way in all cases.. I don't know whether MSW accepts this way.) Fixed a few resource names. 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@209 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-03-15 23:48:01 +00:00
twanvl e83c00c05a Changed scroll size of PackageList; 
Added 'collapse' option for card notes;
Made variant of  DECLARE_TYPEOF for maps (two template arguments).

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@202 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-02-08 22:15:11 +00:00
twanvl b93e5b2ae3 Reverted resource references for combine_something, you can't use tool_image here, because on MSW that only works for .bmps' 
Added dependency stuff to invalidate Choice images;
Fixed 'duplicate' in symbol editor

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@197 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-02-07 16:17:15 +00:00
twanvl 504269e903 Moved resources to better filenames; 
Updated HoverButton, now an actual custom control, added focused and down states;
Added Help->Website

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@196 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-02-06 21:48:49 +00:00
coppro c6cefaec27 Fixed symbol change crash. The symbol change menu still hovers around being completely out of date from the actual symbol, and the changes don't nessecarilly take place on the card either. Perhaps a caching problem? 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@195 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-02-03 04:33:37 +00:00
twanvl 2291fe4405 Fixed some more compiler warnings 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@192 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-01-31 19:43:27 +00:00
twanvl 315af1f14a Changes to make it work in windows again; 
New header util/platform.hpp for platform specific stuff that doesn't go elsewhere;
Changed resource names from "CURSOR_SOMETHING" to "cursor/something", so it matches the filenames (in progress for other resource types).

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@190 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-01-30 17:27:25 +00:00
coppro 28bcb1068c Compiled Linux version. The welcome screen doesn't display the icon images, and the buttons don't work. Data is found at *prefix*/Magic Set Editor/data and the images at *prefix*/Magic Set Editor/resource. On Ubuntu, *prefix* is /usr/local/share. Resource files are all the image files from resource. I haven't configured them, because I haven't made it past the welcome screen. 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@188 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-01-30 04:03:22 +00:00
twanvl 3a18f787ce Compiles again under MSW after porting changes for linux 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@186 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-01-29 14:16:57 +00:00
twanvl 3d9181e5f6 Eliminated most build errors (gcc,linux,wxGTK). 
What is left is mostly:
 - warning: converting double to int
     -> add a cast/to_int or ignore
 - wrong initialization order in ctor
     -> just swap the order to match the class
 - errors about wxCursors
     -> add a function loadResourceCursor


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@183 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-01-29 00:04:20 +00:00
twanvl fc03b5efa1 Fixed compilation errors for gcc@linux (not all yet). 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@181 0fc631ac-6414-0410-93d0-97cfa31319b6
 2007-01-28 19:13:01 +00:00
twanvl 439dbfce6b rewritten retrying part of reader, it is now implemented how it should have been from the start. 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@175 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-25 16:52:07 +00:00
twanvl 282d4b9751 fixed parser bug: I_RET was not always added 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@174 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-25 14:46:23 +00:00
twanvl 5bed5892f3 thumbnails for choice editor 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@159 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-23 21:12:26 +00:00
twanvl 2233295cfd scrollbar in text editor 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@154 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-23 12:47:08 +00:00
twanvl 69e4edff95 changed <line> semantics, usage is now <line>\n</line> 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@149 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-22 20:00:18 +00:00
twanvl 3eece6eb61 support for masks in choice styles 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@148 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-22 19:29:51 +00:00
twanvl cf39deec24 combined_editor function, and improved dependency handling (removing duplicates), viewer refreshes on events from script manager 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@147 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-22 19:05:52 +00:00
twanvl a9a93c07c3 exception/error handling 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@137 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-21 22:09:42 +00:00
twanvl 2ba1d0b1b8 events on script update; fix in cycle_sort; card list updated on value action 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@136 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-21 21:56:49 +00:00
twanvl e8f580b691 cards dependencies, clearing order cache 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@134 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-21 19:54:18 +00:00
twanvl 9ddc690d68 mtg editor import 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@118 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-18 23:06:43 +00:00
twanvl 4c10107dbb Thread for generating thumbnail images; 
Used for card list;
Implemented reordering from card list

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@115 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-18 19:30:44 +00:00
twanvl ca42f31ccc Localisation, using Locale class 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@113 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-12 16:09:05 +00:00
twanvl 0a69db594e added order_by support to position function, orders are cached; TODO: clear the cache when a card changes 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@109 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-10 23:49:34 +00:00
twanvl a400644b25 implemented import formats 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@102 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-09 23:22:33 +00:00
twanvl c130916465 Added 'symbol_variation' script function 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@101 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-09 16:31:22 +00:00
twanvl 86328aaeec more script functions and text editor improvements 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@100 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-12-06 21:41:02 +00:00
twanvl e2701a646f added SymbolValueEditor + minor fixes 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@96 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-11-26 18:51:31 +00:00
twanvl 8dcda6fd93 Dependency following now works 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@95 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-11-25 22:48:14 +00:00
twanvl 563afde7a3 implemented choice editor with drop down list, todo: submenus 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@93 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-11-25 00:35:33 +00:00
twanvl edfe24a05f Added drop down list box, specialization for color editor; todo: proper positioning & sizing, redrawing the arrow button 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@91 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-11-23 21:01:46 +00:00
twanvl e2544e9d53 implemented resampled text ("high quality") 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@87 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-11-22 20:23:28 +00:00
twanvl 11a0276232 Added dummy keyword panel; fixed directory finding; added more controls to style panel 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@86 0fc631ac-6414-0410-93d0-97cfa31319b6
 2006-11-21 16:26:22 +00:00