Commits · 133693d9ce8a4a7ad0dad27253b1d902e6fcc59d · Donald Haase / Cockatrice

23 Jan, 2016 1 commit
- Fix pixmap usage in pictureloader · 133693d9
  Fabio Bas authored Jan 23, 2016
```
fix #1765
```
  133693d9
15 Jan, 2016 2 commits
- Merge pull request #1761 from ZeldaZach/oracle_secure · f7f9827b
  ctrlaltca authored Jan 15, 2016
```
mtgjson now secure
```
  f7f9827b
- Merge pull request #1758 from ctrlaltca/replay_overflow · 0318ae80
  ctrlaltca authored Jan 15, 2016
```
fix replay progress bar
```
  0318ae80
14 Jan, 2016 3 commits
- mtgjson now secure · ad0334e7
  Zach H authored Jan 14, 2016
  
  ad0334e7
- Merge pull request #1760 from Cockatrice/proto-syntax-marker-removal · fc59a33b
  Gavin Bisesi authored Jan 14, 2016
```
Remove 'syntax = proto2' from .proto files.
```
  fc59a33b
- Remove 'syntax = proto2' from .proto files. · 0734b81e
  Gavin Bisesi authored Jan 14, 2016
```
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).
```
  0734b81e
12 Jan, 2016 1 commit
- fix replay progress bar · 3605cc55
  Fabio Bas authored Jan 13, 2016
  
  3605cc55
11 Jan, 2016 1 commit
- Merge pull request #1755 from tooomm/patch-2 · 53503029
  Gavin Bisesi authored Jan 11, 2016
```
Updated ToC with 'Downloads'
```
  53503029
10 Jan, 2016 1 commit
- Updated ToC with 'Downloads' · c415d4d7
  tooomm authored Jan 11, 2016
  
  c415d4d7
30 Dec, 2015 5 commits
- Merge pull request #1736 from ZeldaZach/token_loc · 924bbb22
  Zach authored Dec 30, 2015
```
Token coordinates
```
  924bbb22
- fix merge issues · e0a25e74
  Zach H authored Dec 30, 2015
  
  e0a25e74
- todo · f568a4e8
  Zach H authored Dec 30, 2015
  
  f568a4e8
- Merge pull request #1734 from ZeldaZach/tokenpt · 9efa9cda
  Zach authored Dec 30, 2015
```
Token PT shown in create related dialog
```
  9efa9cda
- token coordinates · 703ff790
  Zach H authored Dec 29, 2015
  
  703ff790
29 Dec, 2015 3 commits
- Token PT shown in create related dialog · da0e3292
  Zach H authored Dec 29, 2015
  
  da0e3292
- Merge pull request #1728 from Cockatrice/leematos-hidpi-support · 2bf998b7
  Gavin Bisesi authored Dec 28, 2015
```
Enable HiDpiPixmaps for Qt5
```
  2bf998b7
- Enable HiDpiPixmaps for Qt5 · 8a6d6326
  Lee Matos authored Dec 28, 2015
  
  8a6d6326
27 Dec, 2015 5 commits
- Merge pull request #1722 from ctrlaltca/rev-related · c917a6c2
  ctrlaltca authored Dec 27, 2015
```
Implement reverse-related tag for cards
```
  c917a6c2
- Merge pull request #1723 from ZeldaZach/fix_1710 · c4508cd0
  Zach authored Dec 27, 2015
```
Coin Flips
```
  c4508cd0
- coin flip · 137d7328
  Zach H authored Dec 26, 2015
```
remove male/female as it's same

male/female fixes

translate
```
  137d7328
- Merge pull request #1724 from ctrlaltca/windows_merda · 04797eaf
  ctrlaltca authored Dec 27, 2015
```
Fix win32 package creation
```
  04797eaf
- Try to fix package creation · 49b22b7d
  Fabio Bas authored Dec 27, 2015
  
  49b22b7d
26 Dec, 2015 5 commits
- Implement reverse-related tag for cards · 4b1c5942
  Fabio Bas authored Dec 26, 2015
  
  4b1c5942
- Merge pull request #1642 from ctrlaltca/dont_merge_this_yet · f03051b6
  ctrlaltca authored Dec 26, 2015
```
Split PictureLoader out of CardDatabase
```
  f03051b6
- Implemented proposed changes · e721280b
  Fabio Bas authored Oct 15, 2015
  
  e721280b
- Split pictuloader out of carddatabase · 4d7795ca
  Fabio Bas authored Sep 23, 2015
  
  4d7795ca
- Merge pull request #1717 from ctrlaltca/fix_1716 · aebc18fc
  ctrlaltca authored Dec 26, 2015
```
Possibly fix server crash #1716
```
  aebc18fc
20 Dec, 2015 2 commits
- Merge pull request #1714 from ctrlaltca/fix_1598 · 4e17014e
  ctrlaltca authored Dec 20, 2015
```
Possible fix for server crash
```
  4e17014e
- Possibly fix #1716 · 81cad7ce
  Fabio Bas authored Dec 20, 2015
  
  81cad7ce
19 Dec, 2015 2 commits
- Merge pull request #1715 from ctrlaltca/pr_1668 · 0e1c26a0
  ctrlaltca authored Dec 19, 2015
```
Add gear icon to settings menu entry
```
  0e1c26a0
- Add gear icon to settings menu entry · 696ae7e8
  Fabio Bas authored Dec 19, 2015
  
  696ae7e8
15 Dec, 2015 5 commits
- Possibly fix #1598 · 25d77fb6
  Fabio Bas authored Dec 15, 2015
  
  25d77fb6
- Merge pull request #1713 from ctrlaltca/translations · 7e6972a3
  ctrlaltca authored Dec 15, 2015
```
Small typos + reextracted strings
```
  7e6972a3
- Small typos + reextracted strings · 5093ea41
  Fabio Bas authored Dec 15, 2015
  
  5093ea41
- Merge pull request #1712 from ctrlaltca/translations · f5749886
  ctrlaltca authored Dec 15, 2015
```
Extracted new translation strings
```
  f5749886
- Extracted new translation strings · 2712dd42
  Fabio Bas authored Dec 15, 2015
  
  2712dd42
14 Dec, 2015 4 commits
- Merge pull request #1708 from ctrlaltca/appveyor_deploy · ade0a4b7
  ctrlaltca authored Dec 14, 2015
```
Deploy from Appveyor to Bintray
```
  ade0a4b7
- Test appveyor deploy · 5636b43e
  Fabio Bas authored Dec 14, 2015
  
  5636b43e
- Merge pull request #1707 from ctrlaltca/fix_1703 · db854852
  ctrlaltca authored Dec 14, 2015
```
Add correct encrypted api key to deploy to bintray
```
  db854852
- Add bintray badges · 1a6a1171
  Fabio Bas authored Dec 14, 2015
  
  1a6a1171