aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3476 commits 1 branch 0 tags 51 MiB
Commit graph

3476 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach H
c25eae9d23 Prevent no games from showing 2016-05-31 19:16:05 -04:00
Zach
e50c2014d1 Merge pull request #1998 from ZeldaZach/rarity_filter 
Add rarity filter to deck editor
 2016-05-31 10:10:23 -04:00
Zach H
829c96673b Add rarity filter to deck editor 2016-05-31 03:33:56 -04:00
Gavin Bisesi
4ffec331dc Merge pull request #1995 from tooomm/tx_logo 
new tx logo
 2016-05-28 12:27:38 -04:00
tooomm
dff5d89beb new tx logo 
overall redesign of the page and their logo and colors
see https://www.transifex.com/blog/2016/new-transifex/
 2016-05-28 17:28:23 +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
Gavin Bisesi
089acfd84a Use QCommandLineParser instead of by-hand parsing. 
This will be more flexible for future CLI options
 2016-05-16 22:07:29 +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
Gavin Bisesi
fffc3e7e00 Merge pull request #1982 from Cockatrice/mention-bot-config 
Update mention-bot config to remove comments
 2016-05-12 10:14:46 -04:00
Gavin Bisesi
114537445d Update mention-bot config to remove comments 
It doesn't seem to be respecting the `userBlacklist` field, judging by https://github.com/Cockatrice/Cockatrice/pull/1981#issuecomment-218639352

Ref https://github.com/facebook/mention-bot/issues/117
 2016-05-12 10:12:22 -04:00
Mark McDonald
8dd8b434b2 Make "create token" dialog's card name a filter 
* There is a circular update loop I had to cut off where the name field
  updates the filter and then the currentRowChanged signal is firing without a row.

* I chose to make a private method to show intent instead of relying on
  other QLineEdit methods (textEdited) that don't fire signals.

* Some other shenanigans may be at hand that are causing this
  workaround, but my familiarity with Qt is pretty low.
 2016-05-11 21:42:52 -04:00
Mark McDonald
7bc14b594d Include card name criteria when filtering token database model. 2016-05-11 21:42:52 -04:00
Mark McDonald
d12c86d89c Separate search's card name matching out from token filter check 
* Trying to eventually reuse card name filtering in "create token"
  dialog
 2016-05-11 21:42:52 -04:00
Fabio Bas
bb5292aa8d Drop Qt4, libgcrypt, qtmobility dependencies 2016-05-11 12:45:58 +02:00
Zach
e3fb308ea1 Merge pull request #1974 from ZeldaZach/fix_updater 
fix updater from bintray api issue
 2016-05-08 15:08:50 -04:00
Zach H
0163d7af99 fix if/else 2016-05-08 03:35:18 -04:00
Zach H
449982553a remove qt4 check, not needed 2016-05-07 21:51:37 -04:00
Zach H
d46cdd8044 fix updater from bintray api issue 2016-05-07 21:28:45 -04: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
Zach
7d0d0f4ea9 Merge pull request #1969 from tooomm/patch-3 
remove numbers from the dice roll translatable strings
 2016-05-05 02:10:20 -04:00
tooomm
a42ef63ec4 removed bracket leftovers 2016-05-04 23:41:09 +02:00
tooomm
a93bef1de5 fix #1833 
remove numbers from the dice roll translatable strings
 2016-05-04 23:21:52 +02:00
Gavin Bisesi
ff1091ac02 Merge pull request #1962 from Cockatrice/mention-bot-config 
Create .mention-bot
 2016-04-27 14:50:49 -04:00
Gavin Bisesi
a4359244bc Create .mention-bot 
Don't tag brukie for code review
 2016-04-27 14:48:40 -04: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
Lee Matos
c01d526161 make client gender neutral 2016-04-21 03:44:39 -04:00
Zach
2e3966afce Merge pull request #1949 from tooomm/patch-3 
changed issue link + new user explanation
 2016-04-16 19:59:15 -04:00
tooomm
5b4a774725 changed issue link + new user explanation 2016-04-16 10:40:57 +02:00
Zach
11dfee404d Merge pull request #1948 from ctrlaltca/deb_svg 2016-04-15 12:39:16 -04:00
Fabio Bas
a92b2ba600 CMake: add Qt-Svg to dependencies 2016-04-15 17:56:04 +02:00
Zach
d75d69400f Merge pull request #1944 from ctrlaltca/fix_1942 2016-04-14 15:10:52 -04: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
tooomm
44d34673f4 docker - tweaks and link to wiki 
added paragraphs for better readability
link to wiki on how to use docker

(also reordered the running part, call it alphabetically or most important part on top... both apply :P )
 2016-04-11 19:38:45 +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
Gavin Bisesi
b4d572158d Merge pull request #1926 from tooomm/issue_template 
Update ISSUE_TEMPLATE.md
 2016-04-09 21:56:36 -04:00
tooomm
963e5d7f33 Update ISSUE_TEMPLATE.md 
see https://github.com/Cockatrice/Cockatrice/pull/1914
 2016-04-09 20:54:51 +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