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
3,385 Commits 53 Branches 176 Tags
82742bbd47a661d8a648fc6b80e60c154bb7abce
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ctrlaltca d51a6c1ae7 Merge pull request #2003 from ctrlaltca/appveyor_nsis 
Appveyor updates
 2016-06-04 17:26:46 +02:00
Fabio Bas 016601bdc2 Appveyor updates 2016-06-04 15:24:17 +02:00
ctrlaltca cf3e172d25 Merge pull request #1981 from MarkyMarkMcDonald/feature/create-token-dialog-uses-name-as-search 
Create token dialog uses name as search
 2016-05-17 21:49:49 +02:00
ctrlaltca 575376403f Merge pull request #1985 from ctrlaltca/p_1405 
Use QCommandLineParser instead of by-hand parsing.
 2016-05-16 22:09:22 +02:00
ctrlaltca 36470c5061 Merge pull request #1979 from ctrlaltca/make_qt5_great_again 
Drop Qt4 and other dependencies
 2016-05-16 21:48:24 +02:00
Fabio Bas bb5292aa8d Drop Qt4, libgcrypt, qtmobility dependencies 2016-05-11 12:45:58 +02:00
ctrlaltca 2ab320923f Merge pull request #1970 from ctrlaltca/translationz 
Updated translations
 2016-05-06 13:19:43 +02:00
Fabio Bas 01e467fa98 Updated translations 2016-05-06 13:17:20 +02:00
ctrlaltca c213b67fc4 Merge pull request #1959 from ctrlaltca/translations 
Update translations
 2016-04-25 18:47:08 +02:00
Fabio Bas af3b4ded22 Update translations 2016-04-25 18:45:24 +02:00
ctrlaltca 6bebbf284f Merge pull request #1955 from leematos/gender-neutral 
Make client gender neutral
 2016-04-25 17:18:25 +02:00
Fabio Bas a92b2ba600 CMake: add Qt-Svg to dependencies 2016-04-15 17:56:04 +02:00
Fabio Bas a340d25077 Fix #1942 2016-04-14 14:36:46 +02:00
ctrlaltca 768a1c5fb4 Merge pull request #1939 from ctrlaltca/fix_appveyor 
Appveyor: stick with a known working nsis version
 2016-04-12 23:08:49 +02:00
Fabio Bas 993cbf5ae9 Appveyor: stick with a known working nsis version 2016-04-12 22:05:30 +02:00
ctrlaltca 6f84f921f3 Merge pull request #1933 from tooomm/patch-3 
docker - tweaks and link to wiki
 2016-04-11 19:46:49 +02:00
ctrlaltca 03af9afe17 Merge pull request #1930 from ctrlaltca/fix_1929 
Fix calculation of card info popup size
 2016-04-11 19:22:20 +02:00
ctrlaltca cb29e0a057 Merge pull request #1931 from ctrlaltca/docker 
Updated Dockerfile and doc
 2016-04-11 19:04:06 +02:00
Fabio Bas a72f9af984 Updated Dockerfile and doc 2016-04-11 18:51:44 +02:00
Fabio Bas 14d731da98 fix calculation of card info popup size 2016-04-11 17:07:07 +02:00
ctrlaltca 4f30b5cd31 Merge pull request #1921 from ctrlaltca/number 
Implemented !setnumber!
 2016-04-11 15:16:25 +02:00
ctrlaltca 73da10e485 Merge pull request #1919 from ctrlaltca/fix_1918 
Fix english language in options
 2016-04-11 15:16:02 +02:00
Fabio Bas 8c17e2d12a Implemented !setnumber! 
fix #1741
 2016-04-08 22:22:22 +02:00
ctrlaltca 8d67c75028 Merge pull request #1920 from ctrlaltca/fix_1915 
Fix card mention in chat
 2016-04-08 21:54:22 +02:00
Fabio Bas c7061523e6 fix #1915 2016-04-08 19:48:29 +02:00
Fabio Bas 2e7298d064 Fix english language in options 2016-04-08 19:34:28 +02:00
ctrlaltca 948a5c62ef Merge pull request #1910 from ctrlaltca/translations 
Translations update
 2016-04-05 19:36:24 +02:00
Fabio Bas e9736d298e Translations update 2016-04-05 19:35:24 +02:00
ctrlaltca 4691f3e2c5 Merge pull request #1906 from ctrlaltca/fix_1903 
Token dialog: disable progressive loading
 2016-04-05 08:30:32 +02:00
ctrlaltca 2b138cce93 Merge pull request #1900 from ctrlaltca/dbview 
Save deck editor's database view columns state
 2016-04-05 08:29:46 +02:00
ctrlaltca ef62261e43 Merge pull request #1901 from ctrlaltca/carddb_loading 
CardDb: be permissive when loading xmls
 2016-04-05 08:29:06 +02:00
Fabio Bas 2a3701b036 fix #1903 2016-04-03 18:33:10 +02:00
Fabio Bas ce56e5f1a4 CardDb: be permissive when loading xmls 2016-04-03 11:15:16 +02:00
Fabio Bas 58f85e7ebd Save deck editor's database view columns state 2016-04-02 09:38:34 +02:00
ctrlaltca f217551f5f Merge pull request #1877 from Psithief/patch-2 
Prevent PTColumn from being the last column shown.
 2016-03-30 22:55:49 +02:00
ctrlaltca 55f3e9314b Merge pull request #1859 from ctrlaltca/carddb 
Rework some parts of the card database
 2016-03-30 22:55:36 +02:00
ctrlaltca 830a4c2f56 Merge pull request #1894 from woogerboy21/clientid_update 
Updated ClientID Functionality
 2016-03-30 22:55:17 +02:00
Fabio Bas e94f59d7c2 Crash fix 2016-03-22 17:07:45 +01:00
Fabio Bas 2d2958e931 cmake: Enable c++11 for all targets 2016-03-21 13:09:56 +01:00
Fabio Bas a55b3784eb cmake: Enable c++11 for all targets 2016-03-21 11:42:38 +01:00
Fabio Bas 18993b397b First test for card database: loading and clear 2016-03-21 11:08:14 +01:00
Fabio Bas df393638ed Small Fix 2016-03-18 21:18:48 +01:00
ctrlaltca 535e19f8b8 Merge pull request #1866 from ZeldaZach/fix_1860 
Prevent trayIcon Null Crash
 2016-03-18 21:03:54 +01:00
ctrlaltca 41494b49dd Merge pull request #1873 from ctrlaltca/serva_emailz 
Servatrice: Split requireemail into requireemail and requireemailaction
 2016-03-18 18:59:17 +01:00
Fabio Bas 68e2fb912f Servatrice: Split requireemail into requireemail and requireemailactivation 2016-03-17 16:22:42 +01:00
Fabio Bas 1e3fb6c6e1 Rework "paths" settings loading and card database loading 
* main.cpp: removed path checking and db loading
 * card database: merge card loading methods into a single one
 * settings cache: take care of returning safe paths for decks,
replays, etc..
 * main window: if db loading fails (eg. first run), propose to run
oracle

NSIS: propose to run cockatrice instead of oracle

Rework card database loading

 * Move carddatabase-related method out of deckeditor tab
 * Load cards in another thread and render them progressively
 * Optimize database reload after enabled sets change

Fix deck editor column width

 * removed the noCard hack.
 * getCard() no more creates cards instead of just returning existing
ones
 * Fix the “edit tokens” dialog.
 * PictureLoader: avoid trying to download twice the same card
 * PictureLoader: correct return of card background
 * AbstractCardItem: avoid recalculating card color at every paint

Use a different file to save custom tokens

Misc required improvements

 * Use nullptr;
 * Refactor CardInfoWidget to use CardInfoPicture and CardInfoText
instead of duplicating code;
 * Added CardInfo::getColorChar()
 * Fixed some potential crashes
 * removed dead code related to CardInfoWidget
 * Don't require a restart after adding a new custom sets file
 * Bump CMake requirements to 3.1
 2016-03-15 22:27:55 +01:00
ctrlaltca cbea43267e Merge pull request #1850 from ctrlaltca/fix_win_mysql 
Fix mysql plugin deploy on windows
 2016-03-08 16:12:22 +01:00
Fabio Bas 62cb89d224 Fix mysql plugin deploy on windows 2016-03-08 12:54:04 +01:00
ctrlaltca 49c22f3810 Merge pull request #1834 from ctrlaltca/fix_server 
Warning/ban notifications: null check userInfo pointer before dereferencing it
 2016-02-25 00:47:13 +01:00
Fabio Bas b462f95343 Warning/ban notifications: null check userInfo pointer before dereferencing it 2016-02-24 23:47:35 +01:00
ctrlaltca f31a89ebbb Merge pull request #1828 from ctrlaltca/fix_mysqlconnector 
Fix libmysqlclient detection on 64-bit linux
 2016-02-24 21:38:37 +01:00
ctrlaltca b2c1ae264b Merge pull request #1832 from tooomm/restructure 
move sounds+themes folder inside cockatrice
 2016-02-24 21:38:09 +01:00
Fabio Bas ac06544849 Added 64bit libraries each path for libmysqlclient 2016-02-23 08:56:47 +01:00
ctrlaltca 66634c9b3d Merge pull request #1808 from ctrlaltca/innodb 
Move schema to Innodb and add FKs
 2016-02-22 16:39:03 +01:00
ctrlaltca 2d43ab9f50 Merge pull request #1819 from ctrlaltca/fix_xp 
Cmake: build Windows Xp compatible packages
 2016-02-17 21:25:46 +01:00
Fabio Bas aac2d09f48 Move schema to Innodb and add FKs 
Fix #1805
 2016-02-17 21:24:28 +01:00
Fabio Bas 195ab9a150 Try to build windowsxp compatible packages 2016-02-17 15:08:56 +01:00
Fabio Bas a8c723326d Game tab: use short title for undocked wdgets 
fix #1777
 2016-02-12 14:49:37 +01:00
Fabio Bas ae8296a50e Game tab: reset docks sizes on "reset layout" 2016-02-11 18:29:50 +01:00
Fabio Bas 058b913455 Game: save and restore dock sizes 2016-02-07 21:58:51 +01:00
ctrlaltca 323fc06885 Merge pull request #1787 from ctrlaltca/speak_this 
Some updated translations from transfix
 2016-02-02 22:05:30 +01:00
Fabio Bas 50dde5dde1 Some updated translations from transfix 2016-02-02 22:04:49 +01:00
ctrlaltca f35c047dee Merge pull request #1779 from ctrlaltca/translations 
Updated translations
 2016-01-29 00:31:19 +01:00
Fabio Bas 7c128f69b0 Updated translations 2016-01-29 00:30:54 +01:00
ctrlaltca 5dd20181fd Merge pull request #1753 from ctrlaltca/pr_1544 
Re-Dockified the game & replay review areas
 2016-01-28 22:44:32 +01:00
ctrlaltca 14e94f1f8b Merge pull request #1767 from Fizztastic/fix_1764 
Sounds on buddy login & logout.
 2016-01-28 22:33:10 +01:00
ctrlaltca 5fcd8a73ff Merge pull request #1776 from ctrlaltca/button_fix 
Updater: Disable download button when download starts
 2016-01-28 22:27:49 +01:00
Fabio Bas ee42d547bf Disable downlod button when download starts 2016-01-28 22:27:14 +01:00
ctrlaltca 5577d618bd Merge pull request #1727 from TMiguelT/target 
Client update implementation
 2016-01-28 22:25:54 +01:00
ctrlaltca b6f3630cbf Merge pull request #1774 from ctrlaltca/fix_1773 
Remove unneeded debug in servatrice
 2016-01-24 23:03:08 +01:00
Fabio Bas d79d65797f Remove unneeded debug 2016-01-24 23:02:25 +01:00
ctrlaltca 7ec3968c02 Merge pull request #1770 from ctrlaltca/fix_pixmaps 
Fix pixmap usage in pictureloader
 2016-01-23 18:23:55 +01:00
Fabio Bas 133693d9ce Fix pixmap usage in pictureloader 
fix #1765
 2016-01-23 11:00:10 +01:00
ctrlaltca 2789e0df19 Merge pull request #1756 from tooomm/patch-2 
reworked parts of readme
 2016-01-16 00:11:49 +01:00
Fabio Bas bacb289eff Oracle: follow redirects 2016-01-15 16:07:26 +01:00
ctrlaltca f7f9827b91 Merge pull request #1761 from ZeldaZach/oracle_secure 
mtgjson now secure
 2016-01-15 09:27:57 +01:00
ctrlaltca 0318ae8087 Merge pull request #1758 from ctrlaltca/replay_overflow 
fix replay progress bar
 2016-01-15 09:01:32 +01:00
Fabio Bas 3605cc55b7 fix replay progress bar 2016-01-13 00:17:02 +01:00
Fabio Bas fddcbb8296 Lazy loading of card database view => faster startup times 2015-12-28 15:26:10 +01:00
ctrlaltca c917a6c272 Merge pull request #1722 from ctrlaltca/rev-related 
Implement reverse-related tag for cards
 2015-12-27 18:44:05 +01:00
ctrlaltca 04797eaf48 Merge pull request #1724 from ctrlaltca/windows_merda 
Fix win32 package creation
 2015-12-27 18:04:10 +01:00
Fabio Bas 49b22b7d2f Try to fix package creation 2015-12-27 16:03:32 +01:00
Fabio Bas 4b1c59424e Implement reverse-related tag for cards 2015-12-26 19:57:20 +01:00
ctrlaltca f03051b6cf Merge pull request #1642 from ctrlaltca/dont_merge_this_yet 
Split PictureLoader out of CardDatabase
 2015-12-26 17:13:21 +01:00
Fabio Bas e721280bc0 Implemented proposed changes 2015-12-26 16:40:17 +01:00
Fabio Bas 4d7795ca3a Split pictuloader out of carddatabase 2015-12-26 16:40:17 +01:00
ctrlaltca aebc18fc3f Merge pull request #1717 from ctrlaltca/fix_1716 
Possibly fix server crash #1716
 2015-12-26 16:24:10 +01:00
ctrlaltca 4e17014ebf Merge pull request #1714 from ctrlaltca/fix_1598 
Possible fix for server crash
 2015-12-20 14:45:06 +01:00
Fabio Bas 81cad7cefd Possibly fix #1716 2015-12-20 14:38:27 +01:00
ctrlaltca 0e1c26a071 Merge pull request #1715 from ctrlaltca/pr_1668 
Add gear icon to settings menu entry
 2015-12-19 14:21:32 +01:00
Fabio Bas 696ae7e85f Add gear icon to settings menu entry 2015-12-19 11:48:54 +01:00
Fabio Bas 25d77fb64a Possibly fix #1598 2015-12-15 16:58:44 +01:00
ctrlaltca 7e6972a358 Merge pull request #1713 from ctrlaltca/translations 
Small typos + reextracted strings
 2015-12-15 16:32:16 +01:00
Fabio Bas 5093ea4170 Small typos + reextracted strings 2015-12-15 16:31:58 +01:00
ctrlaltca f5749886ee Merge pull request #1712 from ctrlaltca/translations 
Extracted new translation strings
 2015-12-15 15:59:39 +01:00
Fabio Bas 2712dd4248 Extracted new translation strings 2015-12-15 15:59:20 +01:00
ctrlaltca ade0a4b7e2 Merge pull request #1708 from ctrlaltca/appveyor_deploy 
Deploy from Appveyor to Bintray
 2015-12-14 16:29:36 +01:00
Fabio Bas 5636b43e67 Test appveyor deploy 2015-12-14 15:06:16 +01:00
ctrlaltca db8548521c Merge pull request #1707 from ctrlaltca/fix_1703 
Add correct encrypted api key to deploy to bintray
 2015-12-14 09:53:21 +01:00
Fabio Bas 1a6a1171e6 Add bintray badges 2015-12-14 09:47:03 +01:00