Fabio Bas
d79d65797f
Remove unneeded debug
2016-01-24 23:02:25 +01:00
ctrlaltca
7ec3968c02
Merge pull request #1770 from ctrlaltca/fix_pixmaps
...
Fix pixmap usage in pictureloader
2016-01-23 18:23:55 +01:00
Fabio Bas
133693d9ce
Fix pixmap usage in pictureloader
...
fix #1765
2016-01-23 11:00:10 +01:00
Gavin Bisesi
d2e731bb2b
Merge pull request #1766 from tooomm/patch-2
...
new description (match io page)
2016-01-20 21:05:28 -05:00
tooomm
f0be9f7f9b
Update README.md
...
match new description wording from io page
2016-01-19 17:01:42 +01:00
Zach
36c3536e0c
Merge pull request #1721 from ctrlaltca/speedup
...
Misc speedups in card database
2016-01-15 18:43:01 -05:00
ctrlaltca
2789e0df19
Merge pull request #1756 from tooomm/patch-2
...
reworked parts of readme
2016-01-16 00:11:49 +01:00
Zach
5146db7a17
Merge pull request #1763 from ctrlaltca/oracle_redirects
...
Oracle: follow redirects
2016-01-15 17:10:25 -05:00
Fabio Bas
bacb289eff
Oracle: follow redirects
2016-01-15 16:07:26 +01:00
ctrlaltca
f7f9827b91
Merge pull request #1761 from ZeldaZach/oracle_secure
...
mtgjson now secure
2016-01-15 09:27:57 +01:00
ctrlaltca
0318ae8087
Merge pull request #1758 from ctrlaltca/replay_overflow
...
fix replay progress bar
2016-01-15 09:01:32 +01:00
Zach H
ad0334e734
mtgjson now secure
2016-01-14 17:32:25 -05:00
Gavin Bisesi
fc59a33b84
Merge pull request #1760 from Cockatrice/proto-syntax-marker-removal
...
Remove 'syntax = proto2' from .proto files.
2016-01-14 15:20:00 -05:00
tooomm
e337775d72
Update README.md
...
- added small 'new user guide' at top
- reworked 'downloads' part
- changed layout of 'translation' part
- removed server list in favor of gh pages link (server list can be found there)
- switched to https everywhere (zlib not supported yet --> added hint)
2016-01-14 16:59:43 +01:00
Gavin Bisesi
0734b81e6e
Remove 'syntax = proto2' from .proto files.
...
That marker is only recognized by pb3-compatible compilers, meaning that
tools which are otherwise compatible with our files break on them.
Notably, this includes hprotoc (for haskell).
2016-01-14 08:09:40 -05:00
Fabio Bas
3605cc55b7
fix replay progress bar
2016-01-13 00:17:02 +01:00
Gavin Bisesi
5350302969
Merge pull request #1755 from tooomm/patch-2
...
Updated ToC with 'Downloads'
2016-01-11 08:27:57 -05:00
tooomm
c415d4d70e
Updated ToC with 'Downloads'
2016-01-11 00:17:08 +01:00
Zach
924bbb2245
Merge pull request #1736 from ZeldaZach/token_loc
...
Token coordinates
2015-12-30 11:54:59 -05:00
Zach H
e0a25e74ac
fix merge issues
2015-12-30 11:54:30 -05:00
Zach H
f568a4e865
todo
2015-12-30 11:51:53 -05:00
Zach
9efa9cda71
Merge pull request #1734 from ZeldaZach/tokenpt
...
Token PT shown in create related dialog
2015-12-30 11:44:10 -05:00
Zach H
703ff7905c
token coordinates
2015-12-29 23:43:03 -05:00
Zach H
da0e3292d3
Token PT shown in create related dialog
2015-12-29 18:28:41 -05:00
Gavin Bisesi
2bf998b7d3
Merge pull request #1728 from Cockatrice/leematos-hidpi-support
...
Enable HiDpiPixmaps for Qt5
2015-12-28 22:12:12 -05:00
Lee Matos
8a6d63265f
Enable HiDpiPixmaps for Qt5
2015-12-28 22:03:38 -05:00
Fabio Bas
fddcbb8296
Lazy loading of card database view => faster startup times
2015-12-28 15:26:10 +01:00
ctrlaltca
c917a6c272
Merge pull request #1722 from ctrlaltca/rev-related
...
Implement reverse-related tag for cards
2015-12-27 18:44:05 +01:00
Zach
c4508cd055
Merge pull request #1723 from ZeldaZach/fix_1710
...
Coin Flips
2015-12-27 12:38:06 -05:00
Zach H
137d7328b5
coin flip
...
remove male/female as it's same
male/female fixes
translate
2015-12-27 12:34:11 -05:00
ctrlaltca
04797eaf48
Merge pull request #1724 from ctrlaltca/windows_merda
...
Fix win32 package creation
2015-12-27 18:04:10 +01:00
Fabio Bas
49b22b7d2f
Try to fix package creation
2015-12-27 16:03:32 +01:00
Fabio Bas
4b1c59424e
Implement reverse-related tag for cards
2015-12-26 19:57:20 +01:00
ctrlaltca
f03051b6cf
Merge pull request #1642 from ctrlaltca/dont_merge_this_yet
...
Split PictureLoader out of CardDatabase
2015-12-26 17:13:21 +01:00
Fabio Bas
e721280bc0
Implemented proposed changes
2015-12-26 16:40:17 +01:00
Fabio Bas
4d7795ca3a
Split pictuloader out of carddatabase
2015-12-26 16:40:17 +01:00
ctrlaltca
aebc18fc3f
Merge pull request #1717 from ctrlaltca/fix_1716
...
Possibly fix server crash #1716
2015-12-26 16:24:10 +01:00
ctrlaltca
4e17014ebf
Merge pull request #1714 from ctrlaltca/fix_1598
...
Possible fix for server crash
2015-12-20 14:45:06 +01:00
Fabio Bas
81cad7cefd
Possibly fix #1716
2015-12-20 14:38:27 +01:00
ctrlaltca
0e1c26a071
Merge pull request #1715 from ctrlaltca/pr_1668
...
Add gear icon to settings menu entry
2015-12-19 14:21:32 +01:00
Fabio Bas
696ae7e85f
Add gear icon to settings menu entry
2015-12-19 11:48:54 +01:00
Fabio Bas
25d77fb64a
Possibly fix #1598
2015-12-15 16:58:44 +01:00
ctrlaltca
7e6972a358
Merge pull request #1713 from ctrlaltca/translations
...
Small typos + reextracted strings
2015-12-15 16:32:16 +01:00
Fabio Bas
5093ea4170
Small typos + reextracted strings
2015-12-15 16:31:58 +01:00
ctrlaltca
f5749886ee
Merge pull request #1712 from ctrlaltca/translations
...
Extracted new translation strings
2015-12-15 15:59:39 +01:00
Fabio Bas
2712dd4248
Extracted new translation strings
2015-12-15 15:59:20 +01:00
ctrlaltca
ade0a4b7e2
Merge pull request #1708 from ctrlaltca/appveyor_deploy
...
Deploy from Appveyor to Bintray
2015-12-14 16:29:36 +01:00
Fabio Bas
5636b43e67
Test appveyor deploy
2015-12-14 15:06:16 +01:00
ctrlaltca
db8548521c
Merge pull request #1707 from ctrlaltca/fix_1703
...
Add correct encrypted api key to deploy to bintray
2015-12-14 09:53:21 +01:00
Fabio Bas
1a6a1171e6
Add bintray badges
2015-12-14 09:47:03 +01:00
