Commit Graph

387 Commits

Author SHA1 Message Date
twanvl c6a74d4576 linux: added console_panel to makefile, removed junk from error.hpp
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1642 0fc631ac-6414-0410-93d0-97cfa31319b6
2011-01-24 11:57:11 +00:00
twanvl df9c539983 version bump to 2.0.0
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1635 0fc631ac-6414-0410-93d0-97cfa31319b6
2011-01-22 17:54:34 +00:00
twanvl fa7f25306b copying messages from console
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1634 0fc631ac-6414-0410-93d0-97cfa31319b6
2011-01-22 13:15:05 +00:00
twanvl df32d0e99b make console panel compile correctly in vc7.1, wx2.6
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1632 0fc631ac-6414-0410-93d0-97cfa31319b6
2011-01-21 14:55:42 +00:00
twanvl bd55326c7d * Added console panel for evaluating scripts and showing error messages.
* Rewrite of error queue code: errors are now pulled, instead of being turned into messageboxes automatically.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1629 0fc631ac-6414-0410-93d0-97cfa31319b6
2011-01-21 13:26:03 +00:00
twanvl 257e8ebbff backwards compatibility for wxAutoBufferedPaintDCBase
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1626 0fc631ac-6414-0410-93d0-97cfa31319b6
2011-01-21 11:44:29 +00:00
twanvl d217349148 Added filter box for keywords
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1615 0fc631ac-6414-0410-93d0-97cfa31319b6
2011-01-16 13:34:50 +00:00
twanvl 9cf9277082 (minor)
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1610 0fc631ac-6414-0410-93d0-97cfa31319b6
2011-01-10 19:39:16 +00:00
twanvl ba700a3f0a Fix #59: cast to Char, not char, the former is wchar_t, the latter is a byte
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1609 0fc631ac-6414-0410-93d0-97cfa31319b6
2011-01-10 19:38:39 +00:00
twanvl 53bbcfe9a9 Be explicit about type of angles: either Radians or Degrees.
Angles are always doubles.
Internally use radians as much as possible.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1605 0fc631ac-6414-0410-93d0-97cfa31319b6
2011-01-09 14:49:59 +00:00
twanvl 6a6c4a7fe3 version bump: now 0.3.9
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1585 0fc631ac-6414-0410-93d0-97cfa31319b6
2011-01-07 19:26:49 +00:00
twanvl 809d9b747a Added some ifdefs around the vc9 fixes so that mse still compiles with msvc7 and wxWidget 2.6
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1568 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-12-30 16:50:20 +00:00
twanvl f9e8bb88e3 profile package open timing
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1541 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-12-07 21:14:10 +00:00
twanvl a9a50c358a compatibility with wxWdigets 2.9+: wxString::c_str now returns an object instead of a Char*, use cast to force conversion.
TODO: This can probably be done more efficiently!

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1538 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-12-07 21:12:44 +00:00
twanvl 527d21794c compatibility with wxWdigets 2.9+: use HandleWindowEvent instead of ProcessEvent, but this function doesn't exist in wx2.8. So, #define the former as the latter for backwards compatibility.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1537 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-12-07 21:12:14 +00:00
twanvl d12e0838a2 compatibility with wxWdigets 2.9+: work around a bug in wx 2.9.1 (should be fixed in newer releases)
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1531 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-12-07 21:06:26 +00:00
twanvl e6884e0db3 compatibility with wxWdigets 2.9+: Vector2D::operator *(int) to prevent ambiguous conversion errors
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1530 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-12-07 21:05:49 +00:00
twanvl 6f922eac7d compatibility with wxWdigets 2.9+: SetLogicalFunction takes wxRasterOperationMode instead of int
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1529 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-12-07 21:05:00 +00:00
twanvl 65cde6c8f3 compatibility with wxWdigets 2.9+: use wxString::const_iterator instead of raw Char*
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1528 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-12-07 21:04:11 +00:00
twanvl 3562891b42 compatibility with wxWdigets 2.9+: there is now a built in wxString::FromUTF8 function, use it
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1527 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-12-07 21:02:55 +00:00
twanvl 9735e24517 Added a panel showing profiler timings
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1523 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-10-13 21:35:30 +00:00
twanvl bcc582f912 added 'file_modified_time' function, which should be faster than using wxFileName
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1519 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-10-03 16:47:38 +00:00
twanvl 2f7d95af9c No longer using namespace boost,
doing that lead to conflicts in new compilers, because both boost and std contain a shared_ptr type.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1517 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-10-03 16:16:28 +00:00
twanvl a3973deb0d fix: Fix error in vc9: some stupid library defined 'near'
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1516 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-10-03 15:48:24 +00:00
twanvl 9b438daf41 Fix error in vc9: use _wassert instead of _assert, the latter no longer exists.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1510 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-10-02 13:51:07 +00:00
twanvl ca7ade0cfd Fix error in vc9: use _wassert instead of _assert, the latter no longer exists.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1508 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-10-02 13:42:31 +00:00
twanvl cc43ea3940 Fix error in vc9: universal-character-name encountered in source
Changed unicode literals from '\u1234' to '\x1234'. Hopefully this doesn't break the build for other compilers.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1507 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-10-02 13:39:33 +00:00
twanvl 50a26e4c76 * find_i function for case insensitive searching
* card::contains uses case insensitive find
* Added card::contains_words for quick search, which searches for each word separately

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1484 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-08-04 22:33:20 +00:00
twanvl be922940a2 Added a "quick search" box for filtering the card list
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1483 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-08-04 21:52:26 +00:00
twanvl 4defd52aa2 allow reading images from the current directory in the CLI interface
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1475 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-08-03 18:25:35 +00:00
twanvl e01b24aa63 Added 'recolor_image' function
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1473 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-08-03 18:19:05 +00:00
twanvl 726bd9c135 don't use locale for error message (mostly to stop mse from whining about the missing entry)
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1471 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-08-03 14:54:52 +00:00
twanvl 463c3d9a81 (minor) use getAngle() instead of trAngle(0)
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1470 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-08-03 14:53:30 +00:00
twanvl 69ea39c64f slightly better error messages when reading an enum value fails: also report the default used
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1464 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-08-02 23:05:05 +00:00
twanvl 44b3d15a68 warn about invalid conversion to int/double/bool in Reader
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1459 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-07-22 13:36:05 +00:00
twanvl f7ae4b5a7b in_tag function now looks for a positive number of tag occurrences.
In particular: in "<tag><tag></tag>x</tag>" the x is now in_tag.
This fixes the rest of #20.

Also added is_in_tag function that returns a bool instead of the tag position.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1456 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-07-21 22:42:46 +00:00
twanvl 864cabb590 fixed nullptr exception when opening a stylesheet without a game twice, the solution is to re-load when loading/validating fails the first time
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1451 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-07-21 18:49:12 +00:00
twanvl f88d92acab curly_quotes now considers EM_DASH to be a space, so it uses an open quote after it.
Fixes #33

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1449 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-07-21 18:23:57 +00:00
twanvl f8c7961c03 trim filenames, apparently writing a file "some card " is not possible on windows, it drops the trailing space.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1448 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-07-21 18:06:54 +00:00
twanvl 51dfed69b4 Instead of the new_intrusive<T>() functions, use intrusive(new T)
This means we no longer need 8 different functions for different numbers of arguments, and non-const references can now also be passed to constructors without problems.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1443 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-07-21 14:32:28 +00:00
coppro 85854b1bd2 Fix warnings
Semi-fix bug #6 (does not work if the zipfile was loaded from a directory)


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1439 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-03-04 01:46:04 +00:00
coppro cf91f9c43b Update copryright date to 2010.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1438 0fc631ac-6414-0410-93d0-97cfa31319b6
2010-03-01 23:33:25 +00:00
coppro 47aa7ce923 Rename 'cannocial_name_form' to 'canonical_name_form'
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1433 0fc631ac-6414-0410-93d0-97cfa31319b6
2009-12-04 06:04:57 +00:00
coppro 5a8f8e8d70 Following a fine MSE tradition of forgetting to svn add new files.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1428 0fc631ac-6414-0410-93d0-97cfa31319b6
2009-09-28 23:02:54 +00:00
coppro f2d6714da9 (sorry for making this all one commit)
Fiddled with the backbone for scripts some more.
VCS are now suppported in sets but configuration/non-svn-systems missing
Linux build now uses precompiled headers (build time--)
A couple warning fixes too.


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1427 0fc631ac-6414-0410-93d0-97cfa31319b6
2009-09-16 23:40:44 +00:00
coppro 7af4cd4bd0 Lots of miscellaneous fixes, also added basic VCS framework
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1416 0fc631ac-6414-0410-93d0-97cfa31319b6
2009-08-01 22:34:04 +00:00
coppro b73f081b60 Updated copyright information (2009 + my real name)
MSE now handles opening more gracefully - can handle directories and failures
Changed behavior to always save cards to separate files with intent to add VCS later (note: shouldn't do this for zip, but can't see a good way to approach this)


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1388 0fc631ac-6414-0410-93d0-97cfa31319b6
2009-06-19 03:09:05 +00:00
coppro 4c9f3afb05 MSE can now save cards in separate files (needs manual config editing still).
Trailing slashes are stripped from commandline arguments (because directory.mse-set/ should be accepted)


git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1386 0fc631ac-6414-0410-93d0-97cfa31319b6
2009-06-18 02:18:23 +00:00
twanvl c767b6969d fix for non Unicode build; why won't it die already?
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1364 0fc631ac-6414-0410-93d0-97cfa31319b6
2009-01-15 22:59:40 +00:00
coppro 30671ad5b0 Fixed a bunch of linker errors preventing optimized compile on Linux.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1352 0fc631ac-6414-0410-93d0-97cfa31319b6
2009-01-14 19:13:05 +00:00