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,131 Commits 53 Branches 176 Tags
86b92a25de452db32b29ebf00987a29eff1cb389
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gavin Bisesi f8bb295eef Merge pull request #694 from ZeldaZach/flag_fix 
Remove Blank Flag Notation
 2015-02-05 19:39:49 -05:00
Gavin Bisesi 78aa291734 Merge pull request #687 from poixen/base_mention_color 
Changed default mention/username color
 2015-02-04 19:10:10 -05:00
Gavin Bisesi 6d499bdad2 Merge pull request #685 from poixen/mentions_in_om 
Added click mentions to PMs
 2015-02-04 18:18:08 -05:00
Gavin Bisesi 37a05eb731 Merge pull request #671 from kaiserfro/jo-reduce-whitespace-from-game-description 
Reduce the game descriptions whitespace.
 2015-02-04 10:18:23 -05:00
Gavin Bisesi cb50fd0e2c Merge pull request #679 from poixen/deckEditorButtons 
Updated deck editor buttons
 2015-02-03 18:00:13 -05:00
Gavin Bisesi 25cc695190 Merge pull request #672 from ctrlaltca/deckstats 
Fixed "analyze on deckstats"; Fix #662
 2015-02-03 10:30:28 -05:00
Gavin Bisesi e7198edfc7 Merge pull request #676 from poixen/focus_chat 
Chat has focus when starting game
 2015-02-03 09:15:25 -05:00
Gavin Bisesi eeed03b101 Merge pull request #656 from poixen/view_size_fix 
Fixed pile view bug
 2015-02-01 10:35:02 -05:00
Gavin Bisesi 6d4716b38f Merge pull request #648 from poixen/menu_sep 
Added separator
 2015-01-30 10:07:00 -05:00
Gavin Bisesi a8fcd9ec26 Merge pull request #623 from Cockatrice/country-code 
Add country code to user info box.
 2015-01-29 20:27:19 -05: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 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
Gavin Bisesi 739ca6a02e Merge pull request #607 from poixen/osx_fix 
Refactor pileview sorting code
 2015-01-27 20:10:54 -05: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
Gavin Bisesi 93cf7dbaaf Merge pull request #609 from poixen/chat_mention_fixes 
Chat mention fixes
 2015-01-27 06:30:20 -05: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
Gavin Bisesi f51e558e57 Merge pull request #605 from ZeldaZach/more_flags_time 
Additional Flags
 2015-01-26 15:21:25 -05: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
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
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
Gavin Bisesi 2a6291dcde Merge pull request #592 from poixen/tap_animation 
Faster tapping speed
 2015-01-24 21:21:31 -05:00
Gavin Bisesi 11bb32606b Merge pull request #579 from tooomm/readme-fixed-url 
fixed wooger link not working
 2015-01-22 08:10:00 -05:00
Gavin Bisesi 8069eceea1 Merge pull request #572 from ideocl4st/korean-translation 
Updated Korean Translation
 2015-01-21 07:45:12 -05:00
Gavin Bisesi d83987b2b7 Merge pull request #570 from poixen/move_ignore_users 
Moved "Ignore messages from unregistered users"
 2015-01-20 14:14:30 -05:00
Gavin Bisesi 6dfaa81a53 Merge pull request #561 from poixen/chatnamehighlight 
Username block highlighting
 2015-01-20 12:35:41 -05:00
Gavin Bisesi fa8bcccaaa Merge pull request #549 from poixen/cardviewlist 
Sortable card views can now be split into pile types
 2015-01-20 12:15:19 -05:00
Gavin Bisesi 8d768089de Merge pull request #565 from ctrlaltca/deck_schema 
Added xdd schema for "cod" decks; fix #545
 2015-01-20 11:44:12 -05:00
Gavin Bisesi 931b420323 Merge pull request #556 from poixen/settings_dlg_refactorings 
Refactored Settings Tab
 2015-01-20 11:39:25 -05:00
Gavin Bisesi 10aa137475 Merge pull request #562 from poixen/chat_click_mentions 
Click tag mentions
 2015-01-20 10:06:04 -05:00
Gavin Bisesi fe53d6d6cd Merge pull request #567 from poixen/chat_cog 
Added "Chat settings..." shortcut to chat cog
 2015-01-20 10:01:05 -05:00
Gavin Bisesi 7ef5f2d3a4 Merge pull request #558 from ctrlaltca/memory_limit 
Limit pixmap cache size to 2047MB; fix #555
 2015-01-16 12:09:00 -05:00
Gavin Bisesi 8e396cadc2 Merge pull request #554 from poixen/chatsettingstab 
Updated chat setting tab
 2015-01-15 08:39:30 -05:00
Gavin Bisesi d3a7320ce2 Readme links to install instructions wiki page 2015-01-14 17:00:05 -05:00
Gavin Bisesi 06ac74ec6b Merge pull request #546 from ideocl4st/master 
Added Korean flag and newly added strings' translations
 2015-01-14 14:29:39 -05:00
Gavin Bisesi ce2520d74f Merge pull request #538 from poixen/settingscleanup 
Realigned Icons
 2015-01-14 07:38:23 -05:00
Gavin Bisesi 2ae9cd2c37 Merge pull request #543 from poixen/clearchat 
Clear chat
 2015-01-12 21:15:55 -05:00
Gavin Bisesi 69e6aa355f Merge pull request #534 from poixen/accountage 
Added account age to user info window
 2015-01-11 21:37:07 -05:00
Gavin Bisesi 761d549f9a Merge pull request #519 from ctrlaltca/message_log 
Message log
 2015-01-07 15:43:54 -05:00
Gavin Bisesi 37a4c0d0e6 Merge pull request #531 from mcallahan/resizing2 
Resize player names in playerlistwidget properly.
 2015-01-07 15:42:03 -05:00
Gavin Bisesi 621d33638f Merge pull request #498 from ctrlaltca/pixmap_memory_2nd_attempt 
Pixmap memory, 2nd attempt
 2015-01-07 15:41:20 -05:00
Gavin Bisesi c98a146746 Merge pull request #520 from mcallahan/always-reveal-top-master-master 
Reset Always reveal top card when starting a new game.
 2015-01-05 16:36:07 -05:00
Gavin Bisesi fba60c20c0 Merge pull request #523 from kaiserfro/apply-filters-at-start2 
Apply filters at start
 2015-01-05 11:26:54 -05:00
Gavin Bisesi 094d6b6422 Merge pull request #527 from poixen/chattime 
Added timestamps to in game chat
 2015-01-05 11:22:32 -05:00
Gavin Bisesi 7476667b69 Merge pull request #524 from ideocl4st/korean-translation 
Fixed a non-standard word in Korean Translation
 2015-01-04 08:45:20 -05:00
Gavin Bisesi 471a690cf0 Merge pull request #518 from ideocl4st/korean-translation 
Added Korean Translation
 2015-01-02 09:27:29 -05: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
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
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
Gavin Bisesi 776d809f2f Merge pull request #483 from ZeldaZach/how_many_cards 
How Many Cards
 2014-12-09 11:39:40 -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
Gavin Bisesi ef8bd60a32 Merge pull request #465 from poixen/urlchat 
Added more space between chat
 2014-12-01 12:45:08 -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
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
Gavin Bisesi db0a77989b Merge pull request #456 from ctrlaltca/gamesmodel_qt 
Port #436 to QDateTime
 2014-11-26 17:28:35 -05:00
Gavin Bisesi f71cfb1240 Merge pull request #436 from mitchellwrosen/master 
Add 'Start time' column to game list
 2014-11-25 09:01:24 -05:00
Gavin Bisesi 19de7cbc03 Merge pull request #428 from woogerboy21/static_reveal_library 
Don't remove card images from revealed decks
 2014-11-25 08:41:08 -05:00
Gavin Bisesi 9d62c578e6 Merge pull request #435 from poixen/bottomdeck 
Action: Move Bottom Card to Graveyard
 2014-11-25 08:40:45 -05:00
Gavin Bisesi 9f79bbd09f Merge pull request #454 from poixen/doubleclick 
Double click/ENTER to join a room in lobby
 2014-11-25 08:38:09 -05:00
Gavin Bisesi 8c7aa41721 Permit linux/clang/qt5 build to fail 2014-11-21 12:15:36 -05:00
Gavin Bisesi 7e92b4e7df Add community resource links to README 
ref #452
 2014-11-21 11:19:58 -05:00
Gavin Bisesi 68bc67cde5 Merge pull request #433 from poixen/scalecards 
Cards Scale with mouse over action
 2014-11-20 16:41:04 -05:00
Gavin Bisesi c35024e155 Merge pull request #440 from poixen/newsearchbar 
QT_VERSION check now checks for correct version
 2014-11-19 20:18:10 -05:00
Gavin Bisesi 6d19f8e157 Merge pull request #423 from Cockatrice/travis-qt4-5-builds 
Build both Qt4 and Qt5
 2014-11-18 14:48:19 -05:00
Gavin Bisesi b4dc9b79d4 Don't install qt4 when building qt5 on osx 2014-11-18 12:41:08 -05:00
Gavin Bisesi ee2ba4abd3 Include qtmultimedia and qtsvg for travis qt5 build 2014-11-18 12:18:30 -05:00
Gavin Bisesi 1ba6b468de Install updated cmake from ubuntu sdk ppa 2014-11-18 07:48:55 -05:00
Gavin Bisesi d2e706164d Install qt5tools-dev for ubuntu build 2014-11-18 06:08:56 -05:00
Gavin Bisesi 1640e77848 Notify gitter about build changes 2014-11-17 11:29:20 -05:00
Gavin Bisesi fbbe40fbf3 Use correct qt version path for cmake on osx 2014-11-14 17:11:50 -05:00
Gavin Bisesi 5f944f1d6e Actually use Qt5 for qt5-osx build 2014-11-14 16:32:56 -05:00
Gavin Bisesi 9599fe7b33 Merge remote-tracking branch 'origin/master' into travis-qt4-5-builds 2014-11-14 16:07:05 -05:00
Gavin Bisesi b351abcce4 Update gitter chat room for org change 2014-11-14 10:54:02 -05:00
Gavin Bisesi c93fdbefe2 Update travis build badge link for org change 2014-11-14 10:52:39 -05:00
Gavin Bisesi e918900d4e Refine travis config to only install qt4 or qt5 per build instead of both 2014-11-14 10:47:48 -05:00
Gavin Bisesi 438d4e4661 Merge pull request #417 from poixen/newsearchbar 
Updated Search Bar Style
 2014-11-14 10:19:24 -05:00
Gavin Bisesi 687d441a49 Merge pull request #426 from woogerboy21/patch-2 
Default logging to enable with no config file
 2014-11-11 14:22:11 -05:00
Gavin Bisesi a91106f90e Add ppa for qt5 on travis ubuntu 2014-11-10 15:36:31 -05:00
Gavin Bisesi 4b478efa61 Build both Qt4 and Qt5 2014-11-10 15:12:45 -05:00
Gavin Bisesi 277c050d76 Merge pull request #421 from ctrlaltca/even_more_pictures 
Add fallback urls for cards without a muId set
 2014-11-10 10:27:47 -05:00
Gavin Bisesi a320af70da Merge pull request #418 from ctrlaltca/osx_info_plist 
OSX: Add proper infos to info.plist
 2014-11-09 17:34:35 -05:00
Gavin Bisesi 6b1df247d1 Merge pull request #415 from ctrlaltca/no_pictures_yet 
Rework the picture download behavior
 2014-11-09 17:16:00 -05:00
Gavin Bisesi b3715c5da2 Merge pull request #416 from poixen/partialsearch 
Partial Card Name Search
 2014-11-09 17:08:02 -05:00
Gavin Bisesi e1c5f4d436 Merge pull request #419 from ctrlaltca/oracle_url 
Oracle: add button to restore default download url
 2014-11-09 17:06:56 -05:00
Gavin Bisesi 13f6da15ec Merge pull request #420 from ctrlaltca/unreg_create_game 
Fix #408
 2014-11-09 17:06:12 -05:00
Gavin Bisesi 8d2e5d3c43 Merge pull request #306 from Mawu3n4/translation 
French translation
 2014-11-07 10:11:53 -05:00
Gavin Bisesi 8f801825a9 Merge pull request #379 from poixen/uicolors 
Changed UI colors
 2014-11-05 15:45:53 -05:00
Gavin Bisesi 5ad869c636 Merge pull request #378 from poixen/animation 
Card Animation performance improvement
 2014-11-05 15:45:24 -05:00
Gavin Bisesi 67db347d12 Merge pull request #366 from poixen/removeoldimages 
Resource cleanup
 2014-11-05 15:31:17 -05:00
Gavin Bisesi a051133af9 Merge pull request #397 from woogerboy21/patch-1 
Correct gametype primary key
 2014-11-03 10:22:24 -05:00
Gavin Bisesi 1d7850fff8 Merge pull request #406 from ctrlaltca/fix_405 
Fix for #405
 2014-10-29 09:53:21 -04:00