gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-31 08:00:25 -07:00
Code Issues Packages Projects Releases Wiki Activity
1,711 Commits 53 Branches 176 Tags
3c598531ed52f1cbdfd2c536c0cbffc6ca913223
Commit Graph
1711 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gavin Bisesi 3c598531ed Merge pull request #342 from acron0/auto-connect-fix 
[Issue 340] Changed 'value' to 'setValue' in settingsCache.cpp
 2014-10-02 10:06:47 -04:00
Gavin Bisesi 263b5a40f5 Merge pull request #341 from ctrlaltca/servatrice_install_configs 
Servatrice: install example ini and sql schema file
 2014-10-02 10:06:03 -04:00
Gavin Bisesi 283bac0b80 Merge pull request #339 from ctrlaltca/qt5_no_libgcrypt 
Drop libgcrypt dependency for qt5
 2014-10-02 10:05:17 -04:00
Antony Woods 1f58f7d848 Changed 'value' to 'setValue' on line 275 2014-10-02 08:48:04 +01:00
Fabio Bas 7afdff1b3b Servatrice: install example ini and sql schema file 
WIN: in the binary directory
OSX: in the app bundle’s Resources subdirectory
LINUX: in $PREFIX/share/servatrice
 2014-10-02 08:34:21 +02:00
Gavin Bisesi 55b20343e9 Note that libgcrypt is needed only for qt4 2014-10-01 16:30:19 -04:00
Fabio Bas 355de8fba4 Drop libgcrypt dependency for qt5 2014-10-01 20:21:22 +02:00
Gavin Bisesi b32aeb2211 Merge pull request #280 from pliu037/remove-.full-req 
Support images without .full suffix
 2014-10-01 13:50:02 -04:00
Gavin Bisesi 7eed007f14 Merge pull request #281 from ctrlaltca/fix_202 
Fix crash #202
 2014-09-30 20:35:11 -04:00
Gavin Bisesi 9752dcf495 Merge pull request #332 from ctrlaltca/sideboard-helpers 
Sideboard helpers
 2014-09-30 13:46:43 -04:00
Fabio Bas eaad8de8d0 Merge branch 'sideboard-helpers' of https://git.k6.io/nvdiao/cockatrice into sideboard-helpers 2014-09-29 18:25:10 +02:00
Gavin Bisesi b5de708756 Merge pull request #289 from acron0/auto-connect 
Added 'auto connect' checkbox to connect dialog.
 2014-09-29 10:24:06 -04:00
Gavin Bisesi ab7f354e36 Merge pull request #318 from catmanjan/master 
Change default scry to 1.
 2014-09-19 10:22:04 -04:00
Jan Martin 6f97e59c03 Change default scry to 1. 2014-09-19 21:41:57 +10:00
Yuki Izumi fefb6fc612 Add sideboard helpers. 2014-09-11 12:56:27 +10:00
Antony Woods f1b012c83d Adding modified translation files 2014-09-09 17:30:37 +01:00
Antony Woods dbe46084ac Merge branch 'master' of github.com:Daenyth/Cockatrice into auto-connect 2014-09-09 17:22:55 +01:00
Gavin Bisesi 2aeecc6063 Add note about tech support 2014-09-09 12:04:06 -04:00
Gavin Bisesi fce1d6ac3f Change Qt4 to Qt4+5 in readme 2014-09-08 14:46:27 -04:00
Gavin Bisesi 64791b45f6 Add note on updating translations. 2014-09-08 14:46:01 -04:00
Gavin Bisesi 3c7abecac6 Merge pull request #292 from ctrlaltca/cmake_translations 
Add a UPDATE_TRANSLATIONS option
 2014-09-08 09:38:55 -04:00
Fabio Bas d6b97976f9 Refreshed all translation files 2014-09-06 10:40:23 +02:00
Fabio Bas a0b35ee60b Cockatrice - CMake: Include all existing translation files using a glob 2014-09-06 10:38:59 +02:00
Fabio Bas e5eda9f172 Add a UPDATE_TRANSLATIONS options that actually updates translations! 2014-09-04 16:15:01 +02:00
Gavin Bisesi 8c072224c8 Move travis ci badge to Building section 2014-09-03 17:53:32 -04:00
Gavin Bisesi d93cb0a637 Add link to Gitter chat 2014-09-03 17:52:31 -04:00
Antony Woods ab83d6185a Used tr() function for auto-connect label. Changed formatting to adhere to coding style guidelines. 'Save Password' setting is now saved when cancelling the Connect dialog 2014-08-29 16:53:30 +01:00
Antony Woods b381298981 Added 'auto connect' checkbox to connect dialog. When the main window becomes active for the first time and auto connect is set to true, it will call connectToServer at that point. 2014-08-27 21:25:11 +01:00
Gavin Bisesi 6f319c8b63 Merge pull request #286 from jturner/fix-build 
Remove invalid character
 2014-08-19 20:31:41 -04:00
James Turner f06d2123fc Remove invalid character 2014-08-19 17:39:05 -04:00
Gavin Bisesi 59b8d7044a Merge pull request #285 from pliu037/fix-oracle-save 
Fixed Oracle save bug
 2014-08-15 09:24:22 -04:00
Peng Liu 9a934f3a43 Fixed a bug that caused Oracle to be stuck in an infinite loop if the default path checkbox was checked but failed to write. 2014-08-15 01:09:21 -04:00
Peng Liu a83e6cdf48 Removed unused variable, bool stripped, from classes and functions. 2014-08-11 13:47:47 -04:00
Gavin Bisesi 0bb0530a31 Merge pull request #245 from pliu037/oracle-cards-path 
Oracle cards.xml path
 2014-08-11 10:13:38 -04:00
Gavin Bisesi 134810b979 Merge pull request #279 from ctrlaltca/valgrind_unified 
Fixed Valgrind warnings
 2014-08-11 09:11:12 -04:00
Fabio Bas 23a3b8364c Merge remote-tracking branch 'upstream/master' into fix_202 2014-08-11 15:07:43 +02:00
Gavin Bisesi 5c46cfc169 Merge pull request #179 from woogerboy21/registered-user-only-server 
Registered Only Server
 2014-08-11 09:03:57 -04:00
Fabio Bas 484a6e8bdc Fix crash #202 2014-08-11 10:50:55 +02:00
Peng Liu 781460d6ac Cockatrice can now load images both with and without .full. Will need to clean-up bool stripped (used to determine .full suffix inclusion). 2014-08-11 04:37:00 -04:00
Fabio Bas 1da2e7154c Fixed Valgrind warnings 
Running cockatrice in valgrind i didn't found any bad memory leak
(good!), but only a few jumps depending on uninitialized variables.
Even if the possibility of crashes are remote, it's nice to sort them
out.
 2014-08-11 10:08:33 +02:00
woogerboy21 6b8ca1e8a2 Cleaned up potential memory leak 2014-08-10 15:48:15 -04:00
Gavin Bisesi 8b32a1010a Merge pull request #265 from pliu037/clear-downloaded-pics 
Clear downloaded images from settings
 2014-08-10 13:34:14 -04:00
Gavin Bisesi 4e3d6a141c Merge pull request #274 from ctrlaltca/serva_memleaks 
Removed a servatrice memleak
 2014-08-08 12:22:44 -04:00
Gavin Bisesi 57efffcd2e Merge pull request #273 from ctrlaltca/picurl_handling 
Fix #259
 2014-08-08 08:59:41 -04:00
Fabio Bas 6e3c7d33da Make protobuf cleanup its resourced when servatrice ends 
Should help make valgrind’s log a bit cleaner
 2014-08-08 13:43:50 +02:00
Fabio Bas 0a5106b8ef Don't leak a QSettings object at every logged message 2014-08-08 09:57:07 +02:00
DaenythandFabio Bas 765e865aa2 Continue downloading card images after failing url on one. 
I should probably bust this out to a method.
 2014-08-08 09:33:38 +02:00
DaenythandFabio Bas 42f1c6938f Merged: First draft of better pic url error handling 
Cherry-picked b9cb61abd0
 2014-08-08 09:33:35 +02:00
Gavin Bisesi e12d66df4f Merge pull request #271 from ctrlaltca/picurl_handling 
Picurl handling
 2014-08-07 17:25:38 -04:00
Fabio Bas bba8184d37 Fix off by one 2014-08-07 23:14:57 +02:00