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,916 Commits 53 Branches 176 Tags
1c3e13109f034c84bff4077dc8f60d40478b4021
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ctrlaltca 78a53f0691 Merge pull request #1151 from ZeldaZach/fix_1050 
Fix False Notifications
 2015-06-24 12:55:13 +02:00
Fabio Bas ed24b38add support <tablerow> for tokens; fix #232 2015-06-24 10:31:00 +02:00
ctrlaltca 9f24728301 Merge pull request #1160 from ctrlaltca/image_blacklist 
Small improvements to card image downloading
 2015-06-24 09:57:30 +02:00
Fabio Bas aed20324da reverted #163 2015-06-23 21:45:08 +02:00
Fabio Bas f95fe57c1b Import split cards of any size; fix #181 2015-06-23 21:42:25 +02:00
Fabio Bas 6afc6cc4fd Cleaned and commented code 2015-06-23 19:36:40 +02:00
Fabio Bas a1d28736d7 Oracle remove old code handling split cards; fix #382 2015-06-23 19:23:07 +02:00
Fabio Bas 872177a5ed Card images blacklist; changed fallback urls 2015-06-23 15:44:43 +02:00
Fabio Bas ec45a099e1 Made items not collapsible; changed players widget's min height from 60 to 40 px 2015-06-22 18:24:05 +02:00
ctrlaltca 0c24f48aa2 Merge pull request #1145 from ZeldaZach/fix_182 
Fix Moved From Error
 2015-06-22 17:29:15 +02:00
ctrlaltca 2415ba2605 Merge pull request #1134 from ctrlaltca/related_cards 
Related cards
 2015-06-22 17:22:47 +02:00
ctrlaltca e581ef77e5 Merge pull request #1150 from ctrlaltca/deckeditor_fix2 
Fix deckeditor jitter problem; fix #1143
 2015-06-19 14:57:44 +02:00
Fabio Bas c400d6d4ec use the new card frame in game; mitigates #1144 2015-06-19 14:57:20 +02:00
Fabio Bas 1ae79fbcaa Removed double margin around chatbox in game 2015-06-19 14:42:13 +02:00
Fabio Bas 1251338619 enforce max size for user avatar on userinfobox; refs #1144 2015-06-19 14:33:23 +02:00
Fabio Bas d6ce1852a1 Fix deckeditor jitter problem; fix #1143 2015-06-18 23:13:12 +02:00
ctrlaltca 8cf0c3beed Merge pull request #1141 from ZeldaZach/hq_options2 
Allow Custom Download URL
 2015-06-16 09:02:20 +02:00
ctrlaltca 48c3e64ef5 Merge pull request #1137 from ctrlaltca/deck_editor 
Reworked deck editor
 2015-06-15 12:51:51 +02:00
Fabio Bas fac44966fd Reworked to use a qtabwidget: better cross-os look 2015-06-15 12:27:54 +02:00
Fabio Bas 3af5804073 Reworked deck editor 2015-06-13 20:37:51 +02:00
Fabio Bas 518bda8c09 Rotate 180 degrees the art of flipped cards 2015-06-13 16:10:06 +02:00
Fabio Bas 8826908923 Automatically attach related cards to the original card 2015-06-13 15:40:59 +02:00
Fabio Bas 9ca1329cac Fix for gcc compilation (-Werror=reorder) 2015-06-11 13:01:05 +02:00
Fabio Bas 946598375f Expose related cards in card menu 2015-06-11 12:45:25 +02:00
Fabio Bas da84bb33e1 Import related cards in the card database 2015-06-11 10:48:50 +02:00
Fabio Bas 25a202b6fc Typo 2015-06-03 08:38:50 +02:00
Fabio Bas 0688dce449 Sql: Added "IF NOT EXISTS" where missing 2015-06-01 14:48:38 +02:00
Fabio Bas 135205d368 Implement migrations; fix #153 2015-05-31 17:36:15 +02:00
ctrlaltca 2de99475b0 Merge pull request #1121 from ctrlaltca/fix_1119 
Permit the use of the same game type in more rooms; Fix #1119
 2015-05-31 16:55:22 +02:00
Fabio Bas 83773e5e37 Fix #1119 2015-05-31 16:52:22 +02:00
ctrlaltca be641a3146 Merge pull request #1120 from ctrlaltca/fix_1102 
Fix "welcome" popup appearing more than once
 2015-05-31 16:33:55 +02:00
Fabio Bas 7ff318bd04 Fix "welcome" popup appearing more than once 2015-05-31 16:32:46 +02:00
ctrlaltca fab0a0ee4e Merge pull request #1110 from tooomm/text-works2 
text works
 2015-05-30 14:23:48 +02:00
ctrlaltca 595d70cf23 Merge pull request #1088 from ctrlaltca/customsets 
Load additional xml sets from $userprofile/customsets/
 2015-05-30 14:23:01 +02:00
Fabio Bas 657a5164e9 Fix servatrice compilation with msvc 2015-05-25 17:07:47 +02:00
Fabio Bas 13b8fd4516 gcc -Werror=unused-parameter 2015-05-24 23:15:23 +02:00
Fabio Bas 471f6371b5 More work 
* Refactored code out of common/ into servatrice/
 * added smtp client library
 * disable registration when connected
 * validate email address
 * send activation token via email
 2015-05-24 23:02:51 +02:00
Fabio Bas 8cf4461616 fix qt4 compilation 2015-05-24 01:00:55 +02:00
Fabio Bas d6cee242e3 Another gcc warning-as error removal 2015-05-24 00:53:08 +02:00
Fabio Bas 21155ce54a Make gcc an happy puppy (-Wunused-parameter) 2015-05-24 00:47:12 +02:00