Commit Graph

1882 Commits

Author SHA1 Message Date
wagic.the.homebrew@gmail.com
e4c3cdbe3d Erwan
-JGUI Bugfix
2010-02-16 11:37:05 +00:00
wagic.the.homebrew@gmail.com
391c608b1a Erwan
- daily build (0.11.0 Alpha)
2010-02-16 11:16:13 +00:00
wagic.the.homebrew@gmail.com
d5be045859 Erwan
- Adding (dead) code for Story mode. This is FAR from being ready so it's deactivated in the code. I just don't want to create a branch (I'm lazy) and I'm fed up with synching. My Goal is to have a tutorial ready with this for the release after this one. If you want to test it (Note: the sample story is not interesting at ALL), just look for "Story mode" and uncomment (3 occurrences). PSP Or Linux need additions to the Makefile...
2010-02-16 10:55:03 +00:00
jean.chalard
8a19b0567b J :
* Add support for key icons in the keybinding menu
2010-02-16 02:30:11 +00:00
wagic.jeck
7104eff946 Jeck - for HQ users, added flexible image scales to task board backdrop. 2010-02-16 01:22:47 +00:00
wagic.jeck
62609ee1b1 Jeck - Some cleanup, fixed a double-deletion error in GameStateDeckViewer (when unlocking all cards). 2010-02-15 23:29:54 +00:00
wagic.jeck
92979fb184 Jeck - Linked task menu into shop's r-trigger. 2010-02-15 22:02:28 +00:00
jean.chalard
2faabf98b5 J :
* Little progress on the interface for key bindings.
* This seems to still be stable so I commit while I'm at it.
2010-02-15 18:14:24 +00:00
jean.chalard
e7d72b7722 J :
* The key bindings now display (semi-)correctly.
  - Here, "semi-" means the local keys display as a string under X and
    a number everywhere else. The number is all but helpful and will
    have to be replaced before it is usable, but at the moment, the
    code is stable afaik.
2010-02-15 17:34:30 +00:00
jean.chalard
16ca1a929f J :
* Some interface for key bindings
2010-02-15 14:32:56 +00:00
jean.chalard
16abaa249c J :
* Remove a useless debug print
2010-02-15 11:01:09 +00:00
jean.chalard
6d2857c341 J :
* Remove an ugly debug print :o
2010-02-15 10:28:13 +00:00
jean.chalard
ec61fede8d J :
* Restore the old Alt key behavior.
2010-02-15 10:26:07 +00:00
jean.chalard
162621c09a J :
* Remove a now-useless #define
2010-02-14 23:53:04 +00:00
wagic.jeck
350f06fab8 Jeck - Jean, please review for cross-platform compatibility. Fix stupid error in GameStateDeckViewer.cpp, also fix windows compile of JGE.cpp. 2010-02-14 18:41:08 +00:00
wagic.jeck
cd746e7cbc Jeck - Fix potential memory leak. 2010-02-14 17:40:52 +00:00
jean.chalard
ac29f9715c J :
* Seems Visual doesn't understand #elsif... lol
2010-02-14 14:25:23 +00:00
jean.chalard
376022c2f0 J :
* Try fix NAN under windows
2010-02-14 14:10:12 +00:00
jean.chalard
f0dae9e87e J :
* Bugfix
2010-02-14 14:04:45 +00:00
jean.chalard
4f0a2794d1 J :
* Remove useless, deprecated, and ill-willed files
2010-02-14 14:02:08 +00:00
jean.chalard
8c86752e1d J :
* Bugfix
2010-02-14 13:57:43 +00:00
jean.chalard
a42e726b4a J :
* Some bugfixes
2010-02-14 13:55:57 +00:00
jean.chalard
56ce4a14ae J :
* Create the subsystem for keybindings.
2010-02-14 13:21:12 +00:00
wagic.jeck
4913eec2fb Jeck - fix for cheat menu. No longer checks for "has 1 of each card" (we wanted "has 4 of each card", but I think the value of writing a specific check for that is pretty low in this case). 2010-02-14 12:19:00 +00:00
wagic.jeck
a4bd6728f6 Jeck - Minor updates to GameStateDeckViewer.cpp. Cosmetic change to cheat placement, possible fix for statistics. 2010-02-14 10:02:33 +00:00
Psyyringe
4911ee05a9 Psringe - fixed mantle of Leadership (thanks to arcaneous for bug report and solution) 2010-02-11 22:43:02 +00:00
wagic.jeck
470e3321e4 Jeck - Potential crash fix, removed unused variable. 2010-02-11 21:03:27 +00:00
wagic.jeck
b7c66657f6 Jeck - Quick fix to pack loading in cases where no pack directory exists. 2010-02-11 19:04:12 +00:00
wagic.jeck
ab34fc16f9 Jeck - Added custom booster packs (see miki), numerous small fixes. Once we hit feature-freeze I'll be reviewing this stuff in depth, as again there's likely a lot of room for cleaning... just wanted to get it in first :).
I cut some bits out that weren't ready for SVN, hopefully I've committed everything correctly.
2010-02-11 18:32:44 +00:00
solo81@web.de
103a3d2822 Fixed issue323, issue327 and issue 329. 2010-02-11 18:22:18 +00:00
Psyyringe
1e5acc6ade Psyringe - added some Metadata (thanks to Niegen for reporting the sets which lacked it). BRB and BTD have been added to the "Duel" block, which is questionable, but imho better than leaving them without a block. 2010-02-11 10:39:18 +00:00
Psyyringe
3b7281cfe8 Psyringe - fixed bugs with Yavimaya Dryad (thanks PrimsSoup), Ogre Arsonist and Crosis's Charm (thanks Niegen), and added a missing text= identifier to "Call of the Herd" (in mtg_todo.dat) 2010-02-11 07:54:09 +00:00
solo81@web.de
64cc648179 Fixed Mercenary Knight. 2010-02-10 16:40:44 +00:00
wagic.jeck
cf03d4cc64 Jeck - fix to issue 318. 2010-02-10 15:48:38 +00:00
wagic.jeck
4189c238b9 Jeck - Fix for issue 315. 2010-02-10 15:36:09 +00:00
wagic.jeck
3d6829a7d1 Jeck - fix for issue 317. 2010-02-10 14:50:01 +00:00
wagic.jeck
e59aca67b7 Jeck - Fix for issue 320, also fix for countByName. 2010-02-10 14:46:10 +00:00
wagic.jeck
9806edc6d0 Jeck - Fix for issue 316 (shop selection not cyclical). 2010-02-10 14:03:08 +00:00
wagic.jeck
7fd2956399 Jeck - Added option to disable screen transitions. 2010-02-10 02:38:41 +00:00
wagic.jeck
f962297d6b Jeck - Repair faulty merge from r1845. 2010-02-09 19:37:25 +00:00
wagic.jeck
4be2dddaf9 Jeck - Cleaned up filters a tiny bit (they no longer use idiotically duplicated vector<pair<string,string>>'s), added colorless mana filter ability, "exclusively X color" filter. 2010-02-09 19:25:53 +00:00
wagic.jeck
3c2d57508e Jeck - Increased shop "text list" fade-in time, changed alternateRender to display "Land" rarity as well as common-mythic. 2010-02-09 17:13:49 +00:00
wagic.jeck
2a2bcef71a Jeck - Hooked economic difficulty into booster prices. 2010-02-09 16:56:39 +00:00
wagic.jeck
5444c4e507 Jeck - Changed filter pricing scheme- filter tax is now inversely proportional to the amount of results. Added preliminary "economic difficulty" option. Note that it requires difficulty modes to be unlocked (at least to appear in the gui). Should we make it available from the start? 2010-02-09 16:23:29 +00:00
Psyyringe
8de2d4a892 Psyringe - bugfix to r1843 (one text= identifier was missing). Also fixed added one missing "auto=trample" to Vorrac battlehorns. Cosmetic change: Reordered the lines added in r1844 to keep current order (anything derived from the card's rules text gets written before the text= line) consistent. That's not compulsory by any means, I just like the efficiency of not having to look at anything below the text= line when checking / debugging / updating cards. :) 2010-02-09 01:46:55 +00:00
wagic.jeck
69967b6d9c Jeck - Added 7 primitives with the "can't be blocked by more than one blocker" ability: Charging Rhino, Familiar Ground, "Huang Zhong, Shu General", Ironhoof Ox, Norwood Riders, Vorrac Battlehorns, "Yuan Shao, the indecisive". 2010-02-09 01:17:02 +00:00
Psyyringe
d84ce36c55 Psyringe - complete wording update for all cards in mtg.txt and mtg_todo.dat. As a side effect, there shouldn't be any non-basic-ASCII characters left in these files anymore.
Note: I replaced paragraphs (which Wagic can't display at the moment) with the sequence " -- ". If that's not desired, they can be easily replaced, but I think they improve readability. Previously, paragraphs where transcribed into slightly larger spaces, and I found that slightly confusing when reading the texts in-game.
2010-02-09 00:28:20 +00:00
wagic.jeck
2508a64634 Jeck - Completing a collection using the cheat profile now also unlocks all sets in trophy room. 2010-02-08 23:53:04 +00:00
wagic.jeck
e5be940766 Jeck - Added filtering by card's first letter. This is pretty much the last filter I can think of, except possibly some more complex ones like the mana producer filter. 2010-02-08 23:10:45 +00:00
wagic.jeck
251f89d7b9 Jeck - Consolidated card price functions from deckviewer/shop into PriceList. Also moved price discount hash variable. (As of around r1825, price discount has been based on (mtgid + static int randomKey) % 20. randomKey updates at the end of any won game, making prices for a given fixed between visits to the shop on the same "day") 2010-02-08 20:13:48 +00:00