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,111 Commits 53 Branches 176 Tags
e68b8b314afbab2d603775286aeabbdcf70fde10
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabio Bas 7a4bf9a313 Fix crash on loading invalid cards.xml 
Additionally, move the custom database load after the LoadStatus check,
so that they don't bring up the “fix your card database path” settings
dialog
 2015-09-22 21:56:02 +02:00
Fabio Bas 2df50f5766 Removed unused sound names 2015-09-20 12:08:55 +02:00
Fabio Bas 2a20b6028e Changed problematic shortcuts 2015-09-18 08:38:54 +02:00
ctrlaltca c7c84bca8f Merge pull request #1521 from tooomm/patch-2 
remove debug code; fix #1520
 2015-09-16 08:42:48 +02:00
Fabio Bas 6257ea701e Revert "remove qtmobility from apt packages" 
This reverts commit 669568b918.
 2015-09-13 19:44:37 +02:00
Fabio Bas a6bc709583 merged master 2015-09-13 19:39:42 +02:00
Fabio Bas 5aaae5279c revert to using QAudioOutput 2015-09-13 19:37:49 +02:00
Fabio Bas f78c01fa88 Avoid multiple sounds playing at the same time 2015-09-13 17:22:58 +02:00
Fabio Bas 85aa866e02 sound themes 2015-09-13 02:01:50 +02:00
Fabio Bas 28df389ea6 Fixed flags size: they're not squared 2015-09-13 00:53:11 +02:00
Fabio Bas dfe9719637 Removed unused parameter 2015-09-13 00:26:28 +02:00
Fabio Bas 00e3e63f41 Themes: remove all hardcoded extensions 2015-09-13 00:14:36 +02:00
ctrlaltca d5afd97ff4 Merge pull request #1509 from Fizztastic/1505_fix 
Fix library, grave, exile crash on windows
 2015-09-12 23:38:22 +02:00
Fabio Bas 669568b918 remove qtmobility from apt packages 2015-09-11 00:45:35 +02:00
Fabio Bas a06c7b2f9d Rework the sound engine to use QSound 
plus misc fixes
 2015-09-11 00:43:22 +02:00
Fabio Bas 6d56e0dfd6 fix wav file names 2015-09-11 00:42:50 +02:00
Fabio Bas 0b072e2d60 Remove dependency to qt multimedia/mobility under qt4 and unused phonon plugins 2015-09-11 00:42:37 +02:00
Fabio Bas b2f855aeb0 fix settings icon spacing 2015-09-10 23:37:16 +02:00
Fabio Bas a7616835e3 Clamp zone view widget's titlebar inside the viewable area 2015-09-10 23:29:01 +02:00
ctrlaltca c984a7c962 Merge pull request #1488 from ctrlaltca/translations 
Translations update
 2015-09-08 19:25:34 +02:00
Fabio Bas fcc5370082 Fetched new translations 2015-09-08 19:12:41 +02:00
Fabio Bas 5951c95e81 extracted new translatable strings 2015-09-08 19:10:57 +02:00
Fabio Bas c214234bb2 fix typo 2015-09-08 19:08:34 +02:00
Fabio Bas 09b926a7ac Added transifex cli configuration 2015-09-08 19:08:04 +02:00
Fabio Bas 4ee12f0b69 Don't change window maximized state when clicking a notification 2015-09-08 17:49:31 +02:00
Fabio Bas db18c7da10 Fix loading of "increase life counter" shortcut in settings 2015-09-08 17:13:47 +02:00
Fabio Bas 3be1bcd356 Add back "remove" buttons to deck editor's filter 2015-09-08 10:25:33 +02:00
Fabio Bas 50aa6e3a4d Fix autoconnect 2015-09-08 08:37:19 +02:00
Fabio Bas f14ebb0028 Fix replay crash due to completer 2015-09-08 08:12:00 +02:00
Fabio Bas e50d0c6db2 get cardback image from theme 2015-09-06 11:44:19 +02:00
ctrlaltca 0a9057d1b8 Merge pull request #1451 from ctrlaltca/fix_1449 
Let git track the empty dir "themes/Default"
 2015-09-01 10:29:35 +02:00
Fabio Bas d9ecb5db8b Let git track this empty dir 2015-09-01 08:57:30 +02:00
Fabio Bas 6d7baec37b Merge with master 2015-08-31 22:55:46 +02:00
Fabio Bas 5cfb034452 merged with master 2015-08-31 22:48:14 +02:00
ctrlaltca 949b0183c8 Merge pull request #1448 from woogerboy21/log_session_mismatch 
Log inconsistent session / session table situation
 2015-08-31 21:45:55 +02:00
ctrlaltca 885edc8953 Merge pull request #1429 from ctrlaltca/translations 
Fetched new translations. Arrr!
 2015-08-27 18:32:54 +02:00
Fabio Bas fcff6301ed Fetched new translations. Arrr! 2015-08-27 18:32:14 +02:00
ctrlaltca ab33258ce9 Merge pull request #1415 from ctrlaltca/translations 
Translations: extracted new strings
 2015-08-23 20:54:50 +02:00
Fabio Bas b335bc5e7d Translations: extracted new strings 2015-08-23 20:54:11 +02:00
ctrlaltca 18ec8e20b6 Merge pull request #1381 from ZeldaZach/flags_to_lower 
Country to lower (fix win bug)
 2015-08-22 11:53:22 +02:00
Fabio Bas 76ba3b557d Fix compilation of servatrice with mdvc 
Should fix #1336
 2015-08-09 18:17:10 +02:00
ctrlaltca 4b5fb30248 Merge pull request #1318 from ctrlaltca/fix_linking_faq_url 
Fix "Linking FAQ" url
 2015-08-01 11:18:16 +02:00
ctrlaltca 622e018cd4 Merge pull request #1320 from ctrlaltca/translations 
Updated translations
 2015-08-01 11:18:04 +02:00
Fabio Bas 7e7c0ef4d2 Updated translations 2015-08-01 10:55:06 +02:00
Fabio Bas 6dfd2e65f6 Fix "Linking FAQ" url 2015-08-01 08:07:47 +02:00
ctrlaltca 8d2cd29a3f Merge pull request #1308 from ZeldaZach/fix_1301 
Allow URL redirects for card images
 2015-08-01 07:59:58 +02:00
Fabio Bas 8d325b9e19 Servatrice: do not disclose user emails to clients 2015-07-28 22:20:40 +02:00
Fabio Bas a001238b74 Force cache clear on sets database save. 2015-07-26 11:46:09 +02:00
Fabio Bas 9c38b08407 Again on the same problem 2015-07-25 19:51:32 +02:00
Fabio Bas c714932e25 Fix compilation under OSX with homebrew's qt5.5 2015-07-25 19:28:30 +02:00
Fabio Bas 1ffc9b4561 Refactor servatrice email send 2015-07-25 18:48:34 +02:00
Fabio Bas 800a17e483 Force black text color on deck list; fix #1289 2015-07-24 19:35:31 +02:00
Fabio Bas 119871d114 fix compilation with gcc in paranoic mode 
deckview.cpp:244:6: warning: no previous declaration for 'bool
sortCardsByName(DeckViewCard*, DeckViewCard*)' [-Wmissing-declarations]
 2015-07-24 19:29:06 +02:00
ctrlaltca 903292ad3b Merge pull request #1288 from ctrlaltca/travis_qt5_homebrew 
Hack to make travis always detect the installed qt5 version
 2015-07-22 21:30:15 +02:00
Fabio Bas 713fa92c65 Hack to make travis always detect the installed qt5 version 2015-07-22 18:04:56 +02:00
Fabio Bas 946410de2b Fix misleading error message in servatrice; fix #1275 2015-07-22 17:51:30 +02:00
Fabio Bas 90655ff631 Prefer enabled sets when loading images; fix #1235 2015-07-22 17:35:44 +02:00
Fabio Bas 7f358d289e Fix calculation of ban expiration; fix #1283 2015-07-21 22:32:31 +02:00
ctrlaltca 0d5e169648 Merge pull request #1270 from ctrlaltca/fix_1269 
Fix change flag in edit account; Fix #1269
 2015-07-16 18:01:40 +02:00
Fabio Bas c9e1585322 Fix change flag in edit account; Fix #1269 2015-07-16 17:59:28 +02:00
ctrlaltca 61b2b46b79 Merge pull request #1267 from Cockatrice/revert-1261-fix_982 
Revert "Confirmation dialog on close"
 2015-07-16 12:30:37 +02:00
ctrlaltca 9b9db297b3 Revert "Confirmation dialog on close" 2015-07-16 14:30:12 +02:00
Fabio Bas ef831d2749 Reworded settings sentence 2015-07-15 22:44:24 +02:00
Fabio Bas 5dc7c60b4d reorder parameters 2015-07-15 15:17:23 +02:00
Fabio Bas 056edd8570 Merge memory leak fix for smtp client 
source:
https://github.com/bluetiger9/SmtpClient-for-Qt/commit/c12f70b721a80dfbb
fd4feb5c0f17ddef93d5a56
 2015-07-15 12:42:56 +02:00
Fabio Bas efe388bddd Fix server message color; try to detect words inside parentheses, punctuation, etc.. 2015-07-15 11:52:04 +02:00
Fabio Bas 2e3e6c55ff Updated with latest changes from #1243 2015-07-14 09:19:07 +02:00
Fabio Bas 87c70466a4 Rework message parser 2015-07-12 23:56:32 +02:00
Fabio Bas a65b2e6c94 Changed url to cockatrice's tokens repo + minor fix 2015-07-08 19:31:04 +02:00
Fabio Bas eda55679da Implemented suggested improvements 2015-07-08 10:19:05 +02:00
Fabio Bas 24aabc4cfe Oracle: download tokens; fix #915 2015-07-07 20:06:14 +02:00
Fabio Bas 68e176cc00 Add an option to annotate tokens from card text (default off); fix #241 2015-07-07 19:19:58 +02:00
Fabio Bas 1c2ddccb46 Order cards by name in deck-load screen; fix #247 2015-07-07 17:56:11 +02:00
Fabio Bas 6013974b5e Gender => Pronouns 2015-07-07 14:10:15 +02:00
Fabio Bas 14bce93c7a make gcc an happy puppy 2015-07-06 09:14:29 +02:00
Fabio Bas 68f1358f54 rebased on master 2015-07-05 22:48:09 +02:00
Fabio Bas 15998fb3e6 Misc fixes 2015-07-05 22:44:35 +02:00
Fabio Bas 7f5f290c93 Profile management 2015-07-05 22:44:35 +02:00
Fabio Bas 960cb04286 Misc fixes 2015-07-05 21:13:39 +02:00
Fabio Bas 26f317ee75 Profile management 2015-07-05 16:39:55 +02:00
Fabio Bas f5be6f836e Improved logging of SIGHUP and cmdReloadConfig 2015-07-03 09:09:41 +02:00
Fabio Bas 5e1566046e removed debug 2015-07-02 15:31:14 +02:00
Fabio Bas 5f28dff30e Fix #1188 2015-07-02 09:22:05 +02:00
Fabio Bas af9140d8c4 make gcc an happy puppy 2015-07-01 20:13:38 +02:00
Fabio Bas 8cac72158a MSVC fixes 2015-06-30 22:33:29 +02:00
Fabio Bas 6cf3db7e6b Servatrice: refactor signal handling and permit config reloading 2015-06-30 22:21:26 +02:00
Fabio Bas 6b54d8cbfd Fixed issues 2015-06-30 21:40:39 +02:00
Fabio Bas 02dcaff356 Publish username rules in login failure, too 2015-06-30 18:44:40 +02:00
Fabio Bas 4c27304047 publish username rules in registration failure 2015-06-29 23:35:27 +02:00
ctrlaltca 9947af7be9 Merge pull request #1172 from ctrlaltca/translations 
Updated translations
 2015-06-28 15:18:15 +02:00
Fabio Bas 56db6cd060 Updated translations 2015-06-28 15:17:46 +02:00
ctrlaltca 4f972848a5 Merge pull request #1162 from ctrlaltca/oracle_fixes 
Oracle fixes
 2015-06-28 15:00:37 +02:00
ctrlaltca 08d7f8e950 Merge pull request #1169 from ctrlaltca/nsis_fix 
NSIS: Add components sections on uninstall.
 2015-06-27 00:14:39 +02:00
Fabio Bas 74fef04a57 NSIS: Add components sections on uninstall. 2015-06-25 17:43:33 +02:00
Fabio Bas a8de6d5c67 Enable HiDpi on oracle too 2015-06-25 16:02:26 +02:00
Fabio Bas f84d6fec1b Never send wrong row numbers 2015-06-25 15:39:03 +02:00
ctrlaltca 816c01e6dd Merge pull request #1159 from poixen/server_usernames 
Moved username formatting to INI file
 2015-06-24 13:28:07 +02:00
ctrlaltca a311678153 Merge pull request #1167 from ctrlaltca/translations 
Updated translations
 2015-06-24 13:26:57 +02:00
Fabio Bas fa6e9c7344 updated translations 2015-06-24 13:26:02 +02:00
Fabio Bas d0c0531bfc extracted new translatable strings 2015-06-24 13:01:23 +02:00