gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-30 23:50:19 -07:00
Code Issues Packages Projects Releases Wiki Activity
2,087 Commits 53 Branches 176 Tags
5222183ff388c8bce37d0e451d405e499fec8c22
Commit Graph
2087 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabio Bas 2896f05823 Merge remote-tracking branch 'upstream/master' into message_log 
Conflicts:
	servatrice/CMakeLists.txt
 2015-01-01 15:02:17 +01:00
Jaeic Lee be973879d0 Added Korean Translation 2015-01-01 22:58:35 +09:00
ctrlaltca 16bbc5e8c0 Merge pull request #516 from mcallahan/compilation-warnings 
Clean up a small pile of compiler warnings.
 2015-01-01 14:32:53 +01:00
Gavin Bisesi 0f1c8c59ac Merge pull request #508 from Blitzmerker/master 
Fixes the "Card preview window gets stuck and can't be removed" issue by...
 2015-01-01 08:08:29 -05:00
Gavin Bisesi a6c750668a Merge pull request #496 from ctrlaltca/set_extinfo 
Remove branch decoration
 2015-01-01 08:07:19 -05:00
Gavin Bisesi b38cd7833f Merge pull request #500 from ctrlaltca/translation_fixes 
Translation fixes
 2015-01-01 08:07:06 -05:00
ctrlaltca 37dd99ea5e Merge pull request #507 from ctrlaltca/osx_plugins_debug 
Optimize qt plugins installation
 2015-01-01 13:56:31 +01:00
Gavin Bisesi ec5a81d8a3 Merge pull request #515 from mcallahan/player-icon-size 
Better icon packing in PlayerListWidget.
 2014-12-31 14:18:25 -05:00
Michael Callahan 3a0c86938c Clean up a small pile of compiler warnings. 2014-12-30 15:54:38 -07:00
Michael Callahan 3c9ddd780e Better icon packing in PlayerListWidget. 2014-12-30 15:27:21 -07:00
Blitzmerker 6af8a49aae Fixes the "Card preview window gets stuck and can't be removed" issue by saving the cardname, instead of getting it back from the popup (with possible issues with case sensitivity). Also closes an old popup when a new is created. 2014-12-29 19:00:28 +01:00
Fabio Bas 54ce135e0c Optimize qt plugins installation 
* Always install “release” plugins
 * install only plugins actually used
 2014-12-28 22:21:45 +01:00
Fabio Bas ea1067189d Specify the player when triggering a move on a revealed card 
Fixes #72, #493
 2014-12-27 17:12:21 +01:00
Fabio Bas dd88476796 Changed parameter name to something more meaningful 2014-12-27 15:02:20 +01:00
Gavin Bisesi f52935791c Merge pull request #501 from ctrlaltca/crash_on_exit 
Fix crash on close #255
 2014-12-26 20:05:54 -05:00
Gavin Bisesi f462719134 Merge pull request #502 from ctrlaltca/fix_484 
Fix #484: Missing tooltip
 2014-12-26 20:00:45 -05:00
ctrlaltca eacd06d2b8 Merge pull request #503 from ctrlaltca/travis_osx_qt5 
Fix travis compilation with osx+qt5
 2014-12-26 17:00:15 +01:00
Fabio Bas 49310b5291 Fix travis compilation with osx+qt5 
Homebrew currently installs qt 5.4.0
 2014-12-26 16:34:42 +01:00
Fabio Bas 390a8f1985 Fix #484 
Missing tooltip
 2014-12-26 16:09:56 +01:00
Fabio Bas 15e4c852dd Fix crash on close #255 2014-12-26 16:03:59 +01:00
Fabio Bas 2d932c68de Fixed translation for "clear downloaded pictures" button 2014-12-26 14:48:58 +01:00
Fabio Bas 499f148783 Regnerate translations 2014-12-26 14:45:41 +01:00
Fabio Bas 72ba5a1683 Parse header files for translatable strings 
We previously parsed only .cpp files, but some strings are inlined in
header files.
 2014-12-26 14:45:31 +01:00
Fabio Bas f88621fd97 Use QPixmapCache for card images 
Drop CardInfo’s own pixmap caches; use QPixmapCache instead.
Use QPixmap references instead of pointers.
Being stored in QPixmapCache, all card images are now subjected to
QPixmapCache’s size limit
 2014-12-24 16:18:55 +01:00
Fabio Bas b96104bed4 Expose QPixmapCache's cache limit size as an user preference 2014-12-24 16:16:34 +01:00
Fabio Bas a5a92e0a7d Remove branch decoration 2014-12-18 17:39:07 +01:00
Fabio Bas c875054fb5 Log messages from rooms, games and chats 2014-12-13 18:43:59 +01:00
Fabio Bas 02978ce404 Implement the logging method 2014-12-13 18:43:31 +01:00
Fabio Bas ba71d3a256 Add db schema and fix sql plugins installation 2014-12-13 18:43:05 +01:00
Gavin Bisesi 776d809f2f Merge pull request #483 from ZeldaZach/how_many_cards 
How Many Cards
 2014-12-09 11:39:40 -05:00
Zach H b738428941 Adding a way to see how many of each type 2014-12-08 17:18:21 -05:00
Gavin Bisesi 8670bc674f Merge pull request #471 from ctrlaltca/set_extinfo 
More sets handling improvements
 2014-12-08 10:38:54 -05:00
Gavin Bisesi 745a7f195d Merge pull request #481 from ZeldaZach/remove_lotus_project 
Removing Black Lotus Price from System
 2014-12-06 10:07:25 -05:00
Zach H a44b7367be removing blp pricing 2014-12-05 21:26:41 -05:00
Fabio Bas 9cc8d8b86c Misc fixes 
ucfirst(setCode): requires oracle re-run
reorder columns
rename the “short name“ column as “set code“
ensure proper casting for releaseDate and sortKey fields (refs 00a5ed0)
 2014-12-05 08:48:33 +01:00
Fabio Bas 0ba351c955 Add "saved" msgbox 2014-12-04 21:09:50 +01:00
Fabio Bas 00a5ed0b79 Fix compilation with qt <= 5.2 2014-12-04 18:29:06 +01:00
Fabio Bas 2745cb2c62 Removed debug 2014-12-02 14:43:39 +01:00
Fabio Bas 36ed4480c2 Re-added save and restore buttons 2014-12-02 14:38:36 +01:00
Gavin Bisesi ef8bd60a32 Merge pull request #465 from poixen/urlchat 
Added more space between chat
 2014-12-01 12:45:08 -05:00
woogerboy21 8b0d67ea5c Merge pull request #441 from woogerboy21/servatrice_trustedsources 
Servatrice trustedsources
 2014-12-01 10:46:55 -05:00
Gavin Bisesi 0be45e3969 Merge pull request #463 from poixen/chatlinkunderline 
Added underline to links in chat
 2014-12-01 09:27:42 -05:00
Fabio Bas e48a815d25 Add move buttons, misc improvements 2014-11-30 21:37:06 +01:00
Matt Lowe 0cb1dde8c8 Added more space between chat 
Added a couple extra pixels in the chat. Make it look a little less
squished.

Before: http://imgur.com/7U6oe82
After: http://imgur.com/C8gGpDY
 2014-11-29 02:49:22 +01:00
Matt Lowe 52cadd75f3 Added underline to links in chat 
[REVIEW]
Links now have a blue underline to better indicate they are clickable.

Preview: http://imgur.com/gQZEv4I
 2014-11-29 01:18:52 +01:00
Gavin Bisesi 9e1f8a0892 Merge pull request #449 from ctrlaltca/set_extinfo 
Sets handling improvements
 2014-11-27 06:13:29 -05:00
Gavin Bisesi 0c92b3779a Merge pull request #461 from poixen/clickfix 
Double click room fix
 2014-11-27 06:11:14 -05:00
Matt Lowe 0f6dc6be6c Fix for #460 2014-11-27 09:52:27 +01:00
Gavin Bisesi db0a77989b Merge pull request #456 from ctrlaltca/gamesmodel_qt 
Port #436 to QDateTime
 2014-11-26 17:28:35 -05:00
Fabio Bas c8aeff0b0c Port #436 to QDateTime 2014-11-26 12:34:26 +01:00