gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-08-01 08:30:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
2,889 Commits 54 Branches 176 Tags
b53bd081750831768c803de3583472fcf2fc61ba
Commit Graph
2889 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Lowe de38a294b5 Updated color setting 
+ live preview added
+ will now only store the color if valid
 2015-01-30 01:54:57 +01:00
Matt Lowe ec8a2de2eb Chat mention color 
+Chat mention / username color can now be set via hex in the settings
+ Users can invert the color of the mention text black/white
+ if an invalid color is provided, the default will be used
 2015-01-30 00:48:50 +01:00
Gavin Bisesi 8d0a5cf86a Merge pull request #639 from tooomm/installer-add-oracle-text 
add oracle name at the end of installer
 2015-01-29 17:41:49 -05:00
Gavin Bisesi fe7b976b79 Merge pull request #638 from Cockatrice/search-by-cmc 
Search by cmc
 2015-01-29 17:35:52 -05:00
Gavin Bises acb9bc20c4 Fix #640 - don't add muid-0 cards to splitCards map 2015-01-29 17:09:14 -05:00
tooomm de336384cd add oracle name at the end of installer 2015-01-29 22:34:53 +01:00
Gavin Bises 6fa34c6c04 Add cmc to card db filter model 2015-01-29 13:33:06 -05:00
Gavin Bises 7893ab086f Fix broken cmc parsing from cards.xml 
I don't know why this even compiled
 2015-01-29 13:32:17 -05:00
ctrlaltca a31c15c752 Merge pull request #637 from ctrlaltca/fix_cache_size 
Refix #558, Fix #631
 2015-01-29 14:27:36 +01:00
Fabio Bas 29190708c3 Fix merge botch 2015-01-29 14:11:15 +01:00
Fabio Bas 1ffb5bf76d removed hardcoded table name prefix from query 2015-01-29 13:54:15 +01:00
Fabio Bas 0f58e8bcde Servatrice: reuse prepared statements 2015-01-29 13:47:55 +01:00
Gavin Bisesi dd426cbac9 Merge pull request #634 from Cockatrice/oracle-cmc 
Parse cmc from json and store in cards.xml
 2015-01-29 05:48:32 -05:00
Gavin Bisesi 971c7bce53 Merge pull request #636 from poixen/chat_mention_alert 
Taskbar attention when mentioned
 2015-01-29 05:46:44 -05:00
Matt Lowe 2a78d15792 Taskbar attention when mentioned 2015-01-29 10:27:16 +01:00
Fabio Bas 3c65fba539 Avoid double locking of sessions, users table 
QSqlQuery already executes not-empty queries, no need to call exec()
 2015-01-29 09:54:48 +01:00
Jeffrey Oliver 763d8a7919 Merge branch 'master' into jo-remove-name-filters-from-settings 2015-01-28 20:28:36 -08:00
Gavin Bises e2fe25735b Parse cmc from json and store in cards.xml 2015-01-28 20:28:38 -05:00
Gavin Bises 1af6486d74 Capitalize country code in user info box 2015-01-28 19:03:08 -05:00
Gavin Bises b5fbebc883 Add country code to user info box. 
People might not know all the flags
 2015-01-28 11:57:17 -05:00
Matt Lowe 78edb8c661 Check for non-characters 
now checks for non characters, so a mention s like "@username!" will now
work.
Requires some testing though, there are a lot of scenarios to check for.
 2015-01-28 13:27:45 +01:00
Gavin Bisesi 739ca6a02e Merge pull request #607 from poixen/osx_fix 
Refactor pileview sorting code
 2015-01-27 20:10:54 -05:00
Jeffrey Oliver 223b38c27b Add a bool to the gameselector constructor to choose whether or not we should 
load settings from saved values or use defaults.
 2015-01-27 12:40:13 -08:00
Gavin Bisesi 8be659ba47 Merge pull request #616 from ideocl4st/korean-translation-150128 
Updated Korean Translation
 2015-01-27 13:17:04 -05:00
Gavin Bisesi c20b1747bd Merge pull request #615 from ideocl4st/249-country-flags-svg 
New flag images for 249 countries with ISO 3166 codes
 2015-01-27 12:24:04 -05:00
Jaeic Lee a94cc1c77c Updated Korean Translation 
Added new strings
Changed all instances of ‘zone’ based on oracle text of Torrent
Elemental
Changed all instances of ‘registered users’ into more commonly used term
 2015-01-28 01:57:10 +09:00
Jaeic Lee b7dd64d333 Flag images for 249 countries with ISO 3166 codes 
From https://github.com/joielechong/iso-country-flags-svg-collection.
(States that flag images are public domain)
 2015-01-28 00:08:14 +09:00
Gavin Bisesi 93cf7dbaaf Merge pull request #609 from poixen/chat_mention_fixes 
Chat mention fixes
 2015-01-27 06:30:20 -05:00
Matt Lowe 3c0aca70e0 Updated method name 
+ updated method name
+ added some doc
 2015-01-27 10:55:52 +01:00
Gavin Bisesi aa1814ef8f Merge pull request #610 from Cockatrice/oracle-save-location 
Inform user of cards.xml save location on success
 2015-01-26 20:33:42 -05:00
Gavin Bisesi 62c4c0f4eb Merge pull request #597 from ideocl4st/tweak-hand-context-menu 
Submenus for moving all cards in a zone to another
 2015-01-26 20:33:17 -05:00
Jaeic Lee bfc1bd04b5 Added separators 
Looks better imo.
 2015-01-27 09:54:11 +09:00
Gavin Bises cbdb1b8bcd Inform user of cards.xml save location on success 2015-01-26 19:05:32 -05:00
Matt Lowe 639cbefee0 Chat mention fixes 
+ fixed some issues with highlighting entire line
+ added case insensative mentions
 2015-01-27 00:43:11 +01:00
Matt Lowe b89535f7ff Refactored code 2015-01-26 22:19:00 +01:00
Gavin Bisesi f51e558e57 Merge pull request #605 from ZeldaZach/more_flags_time 
Additional Flags
 2015-01-26 15:21:25 -05:00
Jaeic Lee c6800c48d2 More ellipsis 
Should be the last of them
 2015-01-27 03:32:58 +09:00
Jaeic Lee 46fb5f820e Tweaked some texts 
Per Daenyth’s request
 2015-01-27 03:14:52 +09:00
Gavin Bisesi 486690408d Merge pull request #602 from tooomm/oracle-add-default-selection-info 
Added text line about default sets selection in Oracle
 2015-01-26 13:06:38 -05:00
Zach H 627624a9c9 adding more flags 2015-01-26 11:57:28 -05:00
Gavin Bises c923086629 Ignore ds_store and intellij hidden files 2015-01-26 11:50:24 -05:00
Zach 613f7717ab Merge pull request #595 from poixen/shufflefix 
Fixed shuffle issue
 2015-01-26 10:24:55 -05:00
Gavin Bisesi ceead6b9e3 Merge pull request #593 from poixen/other_user_mention_option 
Removed other user mention BG
 2015-01-26 07:18:24 -05:00
tooomm 4963cf4618 Added text line about default selection 2015-01-26 00:59:28 +01:00
Gavin Bisesi c328f28cde Merge pull request #600 from tooomm/readme-tweaks 
2 changes
 2015-01-25 15:33:00 -05:00
Gavin Bisesi ffb5ac6b9a Merge pull request #599 from poixen/removed_unused_connect 
Removed a connection
 2015-01-25 15:31:26 -05:00
tooomm f1addc2882 2 changes 
- moved "Community Resources" up as talked about here 7e92b4e7df
- moved Gitter and Travis buttons for cleaner and nicer look
 2015-01-25 18:44:44 +01:00
Matt Lowe c0aafec907 Removed a connection 
This isnt being used anymore
 2015-01-25 12:15:53 +01:00
Matt Lowe 02277b2442 Removed other user mention BG 
Due to feedback, I have removed the background color for other user
mentions. I think this looks cleaner, and doesnt require an additional
option.
 2015-01-25 09:44:07 +01:00
Jaeic Lee cc14e3cfc6 Submenus for moving all cards in a zone to another 2015-01-25 11:34:51 +09:00