Commit graph

2883 commits

Author SHA1 Message Date
Matt Lowe
5c526f6c07 Solid counters
Removed gradient to give counters a more solid look
2015-06-19 23:26:36 +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
Zach H
045da30546 fix wording 2015-06-18 00:16:09 -04:00
Zach
853342463a Merge pull request #1138 from ZeldaZach/chatview_www
Fix WWW link error
2015-06-16 20:57:46 -04:00
ctrlaltca
8cf0c3beed Merge pull request #1141 from ZeldaZach/hq_options2
Allow Custom Download URL
2015-06-16 09:02:20 +02:00
Zach H
89f1298a48 change wording 2015-06-15 16:47:02 -04: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
Zach H
45c2e6f646 Allow Custom HQ URL 2015-06-15 01:03:41 -04:00
Zach
4c8e83f789 Merge pull request #1140 from ZeldaZach/prevent_clear
Remove Autoclear Issue
2015-06-14 21:22:20 -04:00
Zach H
be4a581f7c remove autoclear 2015-06-14 20:53:20 -04:00
Zach H
5d5eb05857 fix www error 2015-06-14 20:35:17 -04: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
Zach
50b908c7c4 Merge pull request #1124 from ctrlaltca/migrations 2015-06-05 12:12:03 -04:00
Zach
1a52415b4e QT5 updated to 5.4.2 2015-06-04 17:04:52 -04:00
Fabio Bas
25a202b6fc Typo 2015-06-03 08:38:50 +02:00
Gavin Bises
1d08dc581b Notify slack for travis builds 2015-06-02 13:20:04 -04: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
Zach
dd16ea78ac Merge pull request #1115 from poixen/text_highlight
Highlight text after adding card
2015-05-30 18:51:25 -04:00
woogerboy21
28ccec711e Merge pull request #1101 from ctrlaltca/registration
[WIP] In-client Registration support
2015-05-30 13:49:04 -04:00
Matt Lowe
7d2ad9ee3b Highlight text after adding card
After adding a card to the main or side, the search text will become
selected to easily start the next search
2015-05-30 16:50:52 +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
tooomm
3767d49407 resolved typo 2015-05-25 03:27:27 +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
Fabio Bas
ff1aed717e Added token generation, user activation command and response. 2015-05-24 00:37:45 +02:00
tooomm
8f64fd4a0b text works
fixed welcome msg
added some articles
added database phrase to card updater
cosmetic changes to the description in edit sets
2015-05-23 23:13:45 +02:00
Fabio Bas
42796b0d0e More fix for -Werror=unused-parameter 2015-05-23 21:17:22 +02:00
Fabio Bas
16d9534757 fix for -Werror=unused-parameter 2015-05-23 21:09:29 +02:00
Fabio Bas
d7b6f76191 missing file from previous commit 2015-05-23 20:13:21 +02:00
Fabio Bas
5ace0dd892 Almost completed registration
* added missing bits of serverside code;
 * added fronted in client;
 * removed demo python scripts;
2015-05-23 20:13:03 +02:00