Commit Graph
18 Commits
Author SHA1 Message Date
Daenyth 6913f2bb4e Merge branch 'master' into musty
Conflicts:
	common/server_cardzone.cpp
2014-06-14 19:06:49 -04:00
Daenyth db43a0609b Merge branch 'master' of github.com:Daenyth/Cockatrice 2013-07-11 13:51:18 -04:00
Daenyth 347d30a84b Merge branch 'master' of git://github.com/mbruker/Cockatrice 2013-02-27 12:36:14 -05:00
Daenyth b767b72230 Fix #64: Allow [[cardname]] shortcut for card:// 2012-07-25 00:38:26 -04:00
Daenyth af09d0d294 Reject more invalid usernames from clients.
Specifically this should cover people connecting with a username of
"\u200C"
2012-07-25 00:12:35 -04:00
Daenyth 00c03d857e Fix compile error with gcc >= 4.7 2012-06-10 00:11:12 -04:00
Daenyth 9586212f60 Merge remote-tracking branch 'upstream/master' into translation 2012-01-01 12:20:05 -05:00
Daenyth 4fbd6e0a9f .gitignore: Ignore ctags * translation build files 2011-12-28 23:47:29 -05:00
Daenyth edde8bec07 Add Planeswalker loyalty to CardInfoWidget
CIW will also dynamically hide/show power/toughness as well as loyalty.
2011-12-28 23:47:29 -05:00
Daenyth 0c1b6dd9c3 Merge remote-tracking branch 'upstream/master' into show-unjoinable-checkbox 2011-12-20 21:48:30 -05:00
Daenyth 6b7da3223a Fix NPE in GameSelector::GameSelector when called from UserList::gamesOfUserReceived 2011-12-07 23:37:04 -05:00
Daenyth fdded2e8c2 More Gàighlig translations 2011-12-07 20:31:43 -05:00
Daenyth c140327c1b More Gàidhlig translations 2011-12-07 19:35:00 -05:00
Daenyth ab24ff44e5 Add partial Scottish Gaelic (gd) translation 2011-12-07 01:40:08 -05:00
Daenyth 86ae8a47a8 Rename 'unjoinable' games to 'unavailable' 2011-12-04 12:25:51 -05:00
Daenyth edd429d874 Filter registered-only games as unavailable when user isn't regged 2011-12-04 12:16:19 -05:00
Daenyth eebc615c1c Change "Show full" "Show running" checkboxes to a single box
IMO these should not have been split
2011-12-03 23:13:27 -05:00
Daenyth a7f3ce4050 Add code support for planeswalker loyalty.
Added to CardInfo object and to the oracle importer. Next step is the
card info widget.
2011-12-03 17:15:33 -05:00