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,469 Commits 53 Branches 176 Tags
0e8206a36f620e1fa6db63c9fd128ccff24e303d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabio Bas 0e8206a36f Updates translations 2016-09-20 22:23:36 +02:00
ctrlaltcaandZach H 7f28a7e844 Fix #601; Fix #725 (#2126) 
Analyze deck on tappedout
Fix small bug in deckstats interface
 2016-09-02 01:34:56 -04:00
ctrlaltcaandZach H 680277ad6a fix #2129 (#2132) 
Remove selection move at all
 2016-08-31 14:13:30 -04:00
ctrlaltcaandGitHub 8571815cbd Merge pull request #2134 from ctrlaltca/fix_1992 
Renamed !setnumber! to !collectornumber!
 2016-08-27 10:02:58 +02:00
Fabio Bas ae456a5bc3 Renamed !setnumber! to !collectornumber! 2016-08-20 10:27:23 +02:00
ctrlaltcaandGitHub da2eb97c7b Merge pull request #2125 from ctrlaltca/fix_1762 
Fix clipboard behavior in deck editor and game
 2016-08-10 09:23:33 +02:00
ctrlaltcaandGitHub ac841ee2c6 Merge pull request #2117 from ctrlaltca/fix_2088 
Webclient: misc improvements (was: parse html in server message)
 2016-08-09 11:14:01 +02:00
Fabio Bas c321227fa7 Fix clipboard behavior in deck editor and game 2016-08-09 11:13:36 +02:00
Fabio Bas a68df3611b Fix #2088 
Add an autocomplete with known server names to the connect dialog;
Added support for server messages (identification, shutdown, user
warning and promotion)
Connection dialog’s inputs are now wider
Only declare implemented client features
Added check for protocol version on connect before login
Avoid listbox being rendered as dropdown on mobiles
 2016-08-09 10:39:03 +02:00
ctrlaltcaandZach H 0f0f9a1246 fix #2118 (#2119) 2016-08-02 21:58:56 -04:00
ctrlaltcaandGitHub 1834e09c0f Merge pull request #2115 from Cockatrice/single_game_types 
Radio buttons for game types
 2016-07-30 10:31:04 +02:00
ctrlaltcaandGitHub 8644016d3c Merge pull request #2114 from ctrlaltca/fix_2107 
Webclient: Fix room closing on disconnect
 2016-07-26 12:50:39 +02:00
Fabio Bas 8eb36fa2f1 fix #2107 2016-07-26 12:49:07 +02:00
ctrlaltcaandGitHub 2cbfc5a8e6 Merge pull request #2096 from ctrlaltca/fix_2091 
Fix infinite loop on local game close
 2016-07-24 12:29:03 +02:00
Fabio Bas d61d9c98a0 Avoid locking on local server shutdown 2016-07-20 16:53:57 +02:00
ctrlaltcaandGitHub b28b174056 Merge pull request #2097 from ctrlaltca/fix_shutdown 
Remove additional minute in server shutdown
 2016-07-19 13:21:33 +02:00
Fabio Bas 36e62df67d Remove additional minute 2016-07-19 11:57:11 +02:00
ctrlaltcaandGitHub 0939cd8b21 Merge pull request #2082 from ctrlaltca/fix_2081 
Remove newlines from Deck name in TabDeckEditor
 2016-07-15 11:14:13 +02:00
Fabio Bas b0efcf9f89 Remove newlines from Deck name in TabDeckEditor 2016-07-15 10:57:42 +02:00
ctrlaltcaandGitHub cbff59ae59 Merge pull request #2078 from skwerlman/patch-1 
fix typo in sample servatrice ini
 2016-07-14 09:06:47 +02:00
ctrlaltcaandGitHub 0c731e378a Merge pull request #2077 from ctrlaltca/webclient_ui 
Some web client UI fixes
 2016-07-13 09:01:33 +02:00
Fabio Bas 1a38e4ef98 Some web client UI fixes 2016-07-12 23:15:42 +02:00
ctrlaltcaandGitHub a11e57503e CONTRIBUTING: Syntax highlight, protobuf 2016-07-10 11:01:15 +02:00
ctrlaltcaandGitHub 35df6485ab CONTRIBUTING: C++11, nullptr, Database migrations 2016-07-10 10:47:19 +02:00
ctrlaltcaandGitHub d4ced6f6af Merge pull request #2067 from ctrlaltca/fix_2066 
Fix compilation warning
 2016-07-09 10:31:55 +02:00
Fabio Bas 430f1baf2f make gcc an happy puppy 2016-07-09 10:18:12 +02:00
ctrlaltcaandGitHub 6a152ffbac Merge pull request #1991 from ctrlaltca/websockets 
Implementation of websockets in servatrice and test js client
 2016-07-05 14:45:31 +02:00
ctrlaltcaandGitHub 07bc215b3e Merge pull request #2021 from ZeldaZach/color_list 
Colors to deck editor
 2016-07-05 14:45:09 +02:00
ctrlaltcaandGitHub 066aff96d7 Merge pull request #2049 from Cockatrice/filterBuddiesOnly 
filter buddies only
 2016-07-03 23:08:44 +02:00
ctrlaltcaandGitHub 7f2e39500e Merge pull request #2038 from ctrlaltca/translations 
Translations update
 2016-06-30 15:27:55 +02:00
Fabio Bas 670f55bc28 Translations update 2016-06-30 15:26:52 +02:00
ctrlaltcaandGitHub a045cf1c41 Merge pull request #2037 from Cockatrice/tooomm-tx_charts 
readme: fix transifex charts
 2016-06-30 11:22:38 +02:00
ctrlaltcaandGitHub 9807bcb48f Merge pull request #2025 from ctrlaltca/logui 
Log UI
 2016-06-29 13:56:46 +02:00
ctrlaltcaandGitHub 60ada0c278 Merge pull request #2036 from ctrlaltca/fix_2031 
Fix openssl detection on win64
 2016-06-29 13:54:59 +02:00
Fabio Bas 204f351a61 Fix openssl detection on win64 2016-06-29 09:53:50 +02:00
Fabio Bas 8db10be892 Log UI 2016-06-27 22:18:39 +02:00
Fabio Bas 5b21dc8cde Implementation of websockets in servatrice and test js client 2016-06-26 19:38:53 +02:00
ctrlaltcaandGitHub c19f225806 Merge pull request #2015 from Cockatrice/tooomm-tr_tags 
fix hardcoded strings
 2016-06-26 18:52:37 +02:00
ctrlaltcaandGitHub 7282aa7eea Merge pull request #2014 from Cockatrice/tooomm-patch-1 
properly differentiate between singular and plural
 2016-06-26 18:52:17 +02:00
ctrlaltcaandGitHub 287bed7e6d Merge pull request #2016 from Cockatrice/tooomm-fix_travis_compile 
fix travis debug error
 2016-06-17 18:12:16 +02:00
ctrlaltcaandGitHub f6a3551168 Merge pull request #2011 from ctrlaltca/fix_2010 
Fix some translation issues
 2016-06-15 22:18:34 +02:00
Fabio Bas 1bc56e1c86 Fix some translation issues 
Fix #2010
 2016-06-15 22:17:31 +02:00
ctrlaltcaandGitHub b40d9da01d Merge pull request #2002 from Cockatrice/1977-version-check 
Check for x86/x86_64 update version on windows.
 2016-06-13 08:49:35 +02:00
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