tooomm
b032f71b22
fix transifex charts
2016-06-30 10:33:48 +02:00
ctrlaltca
9807bcb48f
Merge pull request #2025 from ctrlaltca/logui
...
Log UI
2016-06-29 13:56:46 +02:00
ctrlaltca
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
ctrlaltca
c19f225806
Merge pull request #2015 from Cockatrice/tooomm-tr_tags
...
fix hardcoded strings
2016-06-26 18:52:37 +02:00
ctrlaltca
7282aa7eea
Merge pull request #2014 from Cockatrice/tooomm-patch-1
...
properly differentiate between singular and plural
2016-06-26 18:52:17 +02:00
Gavin Bisesi
e81a6d497b
Don't mention-bot Psithief
...
per request
2016-06-21 08:49:32 -04:00
Zach H
79fc24769a
Colors to list
2016-06-21 00:48:03 -04:00
ctrlaltca
287bed7e6d
Merge pull request #2016 from Cockatrice/tooomm-fix_travis_compile
...
fix travis debug error
2016-06-17 18:12:16 +02:00
tooomm
85c6bcdfa7
fix travis debug error
...
introduced in https://github.com/Cockatrice/Cockatrice/pull/2011
2016-06-17 17:34:07 +02:00
tooomm
57f9b2c200
add tr() tags
2016-06-17 17:03:42 +02:00
tooomm
1782096805
add tr() tags
2016-06-17 16:56:08 +02:00
tooomm
bfbbedd604
pluralisation
2016-06-17 16:12:41 +02:00
ctrlaltca
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
ctrlaltca
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
Gavin Bisesi
82742bbd47
Require Qt >= 5.4 on Windows
2016-06-11 15:53:52 -04:00
Gavin Bisesi
f7d1802390
Check for x86/x86_64 update version on windows.
...
Fix #1977
2016-06-08 18:13:01 -04:00
Gavin Bisesi
0baccd3c00
Merge pull request #2000 from ZeldaZach/fix_1946
...
Add set names to dialog
2016-06-04 16:36:10 -04: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
tooomm
4e198bdf70
Merge pull request #2001 from tooomm/tooomm-patch-1
...
typo fix
2016-06-03 21:25:29 +02:00
tooomm
32f8eb308a
typo fix
...
`Toogle untap` --> `Toggle untap`
2016-06-03 20:22:03 +02:00
Zach
47de7beac1
Merge pull request #1999 from ZeldaZach/fix_1476
...
Prevent no games from showing
2016-06-01 02:25:41 -04:00
Zach H
1ff98cfcb4
Add set names to dialog
2016-05-31 20:29:00 -04:00
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
