Commit graph

  • 8d0a5cf86a Merge pull request #639 from tooomm/installer-add-oracle-text Gavin Bisesi 2015-01-29 17:41:49 -05:00
  • fe7b976b79 Merge pull request #638 from Cockatrice/search-by-cmc Gavin Bisesi 2015-01-29 17:35:52 -05:00
  • acb9bc20c4 Fix #640 - don't add muid-0 cards to splitCards map Gavin Bises 2015-01-29 17:09:14 -05:00
  • de336384cd add oracle name at the end of installer tooomm 2015-01-29 22:34:53 +01:00
  • 6fa34c6c04 Add cmc to card db filter model Gavin Bises 2015-01-29 13:33:06 -05:00
  • 7893ab086f Fix broken cmc parsing from cards.xml Gavin Bises 2015-01-29 13:32:17 -05:00
  • a31c15c752 Merge pull request #637 from ctrlaltca/fix_cache_size ctrlaltca 2015-01-29 14:27:36 +01:00
  • 29190708c3 Fix merge botch Fabio Bas 2015-01-29 14:11:15 +01:00
  • 1ffb5bf76d removed hardcoded table name prefix from query Fabio Bas 2015-01-29 13:54:15 +01:00
  • 0f58e8bcde Servatrice: reuse prepared statements Fabio Bas 2015-01-29 13:47:55 +01:00
  • dd426cbac9 Merge pull request #634 from Cockatrice/oracle-cmc Gavin Bisesi 2015-01-29 05:48:32 -05:00
  • 971c7bce53 Merge pull request #636 from poixen/chat_mention_alert Gavin Bisesi 2015-01-29 05:46:44 -05:00
  • 2a78d15792 Taskbar attention when mentioned Matt Lowe 2015-01-29 10:27:16 +01:00
  • 3c65fba539 Avoid double locking of sessions, users table Fabio Bas 2015-01-29 09:54:48 +01:00
  • 763d8a7919 Merge branch 'master' into jo-remove-name-filters-from-settings Jeffrey Oliver 2015-01-28 20:28:36 -08:00
  • e2fe25735b Parse cmc from json and store in cards.xml Gavin Bises 2015-01-28 20:28:38 -05:00
  • 1af6486d74 Capitalize country code in user info box Gavin Bises 2015-01-28 19:03:08 -05:00
  • c759c99924 Change isFemale(player) method to genderOf(player) Gavin Bises 2015-01-28 19:01:45 -05:00
  • da16214010 Rename 'hisOwn' var to 'theirOwn' for zone messages Gavin Bises 2015-01-28 19:00:55 -05:00
  • 748e8ce75f Buddy stars Matt Lowe 2015-01-28 21:09:02 +01:00
  • d069b65948 Use correct unknown gender enum value on db read Gavin Bises 2015-01-28 14:26:51 -05:00
  • 44f197e8da Read 'n' as neutral gender in user database Gavin Bises 2015-01-28 13:28:51 -05:00
  • aa2265b343 Include new gender icon filenames in build Gavin Bises 2015-01-28 13:20:42 -05:00
  • b5fbebc883 Add country code to user info box. Gavin Bises 2015-01-28 11:57:17 -05:00
  • 104e2e2fdc Add neutral gender to pixmap gen Gavin Bises 2015-01-28 11:11:04 -05:00
  • 1b56df092d Add neutral gender enum value Gavin Bises 2015-01-28 10:27:50 -05:00
  • 78edb8c661 Check for non-characters Matt Lowe 2015-01-28 13:27:45 +01:00
  • 76fa6b24b4 Update tab_supervisor.cpp MassCraziness 2015-01-27 21:19:26 -06:00
  • 739ca6a02e Merge pull request #607 from poixen/osx_fix Gavin Bisesi 2015-01-27 20:10:54 -05:00
  • 223b38c27b Add a bool to the gameselector constructor to choose whether or not we should load settings from saved values or use defaults. Jeffrey Oliver 2015-01-27 12:40:13 -08:00
  • 8be659ba47 Merge pull request #616 from ideocl4st/korean-translation-150128 Gavin Bisesi 2015-01-27 13:17:04 -05:00
  • c20b1747bd Merge pull request #615 from ideocl4st/249-country-flags-svg Gavin Bisesi 2015-01-27 12:24:04 -05:00
  • a94cc1c77c Updated Korean Translation Jaeic Lee 2015-01-28 01:57:10 +09:00
  • b7dd64d333 Flag images for 249 countries with ISO 3166 codes Jaeic Lee 2015-01-28 00:08:14 +09:00
  • 0ac3da40e2 Added highlight for unavailable games Matt Lowe 2015-01-27 14:24:46 +01:00
  • 93cf7dbaaf Merge pull request #609 from poixen/chat_mention_fixes Gavin Bisesi 2015-01-27 06:30:20 -05:00
  • 3c0aca70e0 Updated method name Matt Lowe 2015-01-27 10:55:52 +01:00
  • db9b2792d1 Merge f60bce5452 into aa1814ef8f MassCraziness 2015-01-27 01:33:43 +00:00
  • aa1814ef8f Merge pull request #610 from Cockatrice/oracle-save-location Gavin Bisesi 2015-01-26 20:33:42 -05:00
  • 62c4c0f4eb Merge pull request #597 from ideocl4st/tweak-hand-context-menu Gavin Bisesi 2015-01-26 20:33:17 -05:00
  • bfc1bd04b5 Added separators Jaeic Lee 2015-01-27 09:54:11 +09:00
  • f60bce5452 Update tab_supervisor.cpp MassCraziness 2015-01-26 18:25:41 -06:00
  • cbdb1b8bcd Inform user of cards.xml save location on success Gavin Bises 2015-01-26 19:05:32 -05:00
  • 639cbefee0 Chat mention fixes Matt Lowe 2015-01-27 00:43:11 +01:00
  • 366e86b18a Merge cf9c44494e into f51e558e57 MassCraziness 2015-01-26 23:11:15 +00:00
  • cf9c44494e Update tab_supervisor.cpp MassCraziness 2015-01-26 17:11:14 -06:00
  • b89535f7ff Refactored code Matt Lowe 2015-01-26 22:19:00 +01:00
  • f51e558e57 Merge pull request #605 from ZeldaZach/more_flags_time Gavin Bisesi 2015-01-26 15:21:25 -05:00
  • 1f91a0783a Update tab_supervisor.cpp MassCraziness 2015-01-26 14:00:33 -06:00
  • 3b2d666494 Update tab_supervisor.cpp MassCraziness 2015-01-26 13:32:14 -06:00
  • cb55c793b6 Update tab_supervisor.cpp MassCraziness 2015-01-26 13:28:59 -06:00
  • ac6effabc3 Update tab_supervisor.cpp MassCraziness 2015-01-26 13:03:37 -06:00
  • 5b912650c5 Update tab_supervisor.cpp MassCraziness 2015-01-26 12:39:09 -06:00
  • c6800c48d2 More ellipsis Jaeic Lee 2015-01-27 03:32:58 +09:00
  • 1b37757583 Update tab_supervisor.cpp MassCraziness 2015-01-26 12:24:57 -06:00
  • 46fb5f820e Tweaked some texts Jaeic Lee 2015-01-27 03:14:52 +09:00
  • 486690408d Merge pull request #602 from tooomm/oracle-add-default-selection-info Gavin Bisesi 2015-01-26 13:06:38 -05:00
  • 627624a9c9 adding more flags Zach H 2015-01-26 11:57:28 -05:00
  • c923086629 Ignore ds_store and intellij hidden files Gavin Bises 2015-01-26 11:50:24 -05:00
  • 613f7717ab Merge pull request #595 from poixen/shufflefix Zach 2015-01-26 10:24:55 -05:00
  • ceead6b9e3 Merge pull request #593 from poixen/other_user_mention_option Gavin Bisesi 2015-01-26 07:18:24 -05:00
  • 4963cf4618 Added text line about default selection tooomm 2015-01-26 00:59:28 +01:00
  • c328f28cde Merge pull request #600 from tooomm/readme-tweaks Gavin Bisesi 2015-01-25 15:33:00 -05:00
  • ffb5ac6b9a Merge pull request #599 from poixen/removed_unused_connect Gavin Bisesi 2015-01-25 15:31:26 -05:00
  • f1addc2882 2 changes tooomm 2015-01-25 18:44:44 +01:00
  • c0aafec907 Removed a connection Matt Lowe 2015-01-25 12:15:53 +01:00
  • 02277b2442 Removed other user mention BG Matt Lowe 2015-01-24 23:43:28 +01:00
  • cc14e3cfc6 Submenus for moving all cards in a zone to another Jaeic Lee 2015-01-25 11:34:51 +09:00
  • 2a6291dcde Merge pull request #592 from poixen/tap_animation Gavin Bisesi 2015-01-24 21:21:31 -05:00
  • 2850e9e9ad Merge pull request #594 from poixen/fix_green_text Zach 2015-01-24 18:39:21 -05:00
  • ec198c33ca Fixed shuffle issue Matt Lowe 2015-01-25 00:34:41 +01:00
  • 359391acba Fix for #557 Matt Lowe 2015-01-24 23:59:53 +01:00
  • e409d96bb9 Faster tapping speed Matt Lowe 2015-01-24 23:01:10 +01:00
  • d96e566411 Add back in the games description filter storage. Jeffrey Oliver 2015-01-23 20:53:21 -08:00
  • 2c0e0e5be6 Merge 948adb4917 into 712f12a7a6 poixen 2015-01-24 00:27:01 +00:00
  • 948adb4917 WIP file Matt Lowe 2015-01-24 01:26:40 +01:00
  • 31302df43e WIP Matt Lowe 2015-01-24 01:18:32 +01:00
  • 712f12a7a6 Merge pull request #587 from ZeldaZach/return_align_fix Zach 2015-01-23 12:08:18 -05:00
  • 22a1bcdf60 adding return Zach H 2015-01-23 12:07:53 -05:00
  • e047508e2a Merge 29a14d8f1d into dac5726dab ctrlaltca 2015-01-23 15:14:16 +00:00
  • dac5726dab Merge pull request #504 from ctrlaltca/local_scry_and_move Zach 2015-01-23 10:14:05 -05:00
  • ccccc78f91 Updated colors and alignment Matt Lowe 2015-01-23 14:34:20 +01:00
  • 0aef6ecc94 Added option in chat settings Matt Lowe 2015-01-23 10:25:56 +01:00
  • 8890dae24e Whitespace change on tab_room.cpp Ninja Ferret 2015-01-23 04:24:23 -05:00
  • 9318e74c3b Whitespace change on tab_room.cpp Ninja Ferret 2015-01-23 04:23:20 -05:00
  • 5c1a8e1d42 Switched sender and reciever roles Ninja Ferret 2015-01-23 03:06:21 -05:00
  • cc75210ac6 Removed the loading and saving of the user name and game description from the persistent filter settings. Jeffrey Oliver 2015-01-22 20:39:28 -08:00
  • d5c8f45ab9 Added buddy stars to chat Matt Lowe 2015-01-23 02:09:01 +01:00
  • b06b81895b Merge pull request #580 from poixen/room_user_level poixen 2015-01-22 23:26:14 +01:00
  • 8fdaadf462 refactorings #3 Matt Lowe 2015-01-22 22:37:49 +01:00
  • 86bbf75ddd refactorings #2 Matt Lowe 2015-01-22 22:23:21 +01:00
  • 8ac58259b4 Refactorings Matt Lowe 2015-01-22 22:05:08 +01:00
  • 1406a27775 Updated game view Matt Lowe 2015-01-22 20:46:24 +01:00
  • 71a067030d Merge pull request #578 from poixen/user_chat_mentions poixen 2015-01-22 21:04:30 +01:00
  • b10267dbf1 Move Community Ressources up tooomm 2015-01-22 19:54:40 +01:00
  • 9531b56634 move gitter & travis buttons tooomm 2015-01-22 19:47:34 +01:00
  • 11bb32606b Merge pull request #579 from tooomm/readme-fixed-url Gavin Bisesi 2015-01-22 08:10:00 -05:00
  • 6929303705 fixed wooger link not working tooomm 2015-01-22 13:50:49 +01:00
  • 497fed6b15 Updated colors Matt Lowe 2015-01-22 12:39:24 +01:00
  • 0334fe3c8f Other mentions -- DRAFT -- Matt Lowe 2015-01-22 09:32:56 +01:00