gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-30 23:50:19 -07:00
Code Issues Packages Projects Releases Wiki Activity
2,074 Commits 53 Branches 176 Tags
acb9bc20c4e45cc89af60de45616ae6e8343324f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ctrlaltca a31c15c752 Merge pull request #637 from ctrlaltca/fix_cache_size 
Refix #558, Fix #631
 2015-01-29 14:27:36 +01:00
Fabio Bas 29190708c3 Fix merge botch 2015-01-29 14:11:15 +01:00
Fabio Bas b8322ff4fb Added xdd schema for "cod" decks; fix #545 2015-01-19 16:33:44 +01:00
Fabio Bas 24c6e4a81d Limit pixmap cache size to 2047MB; fix #555 
also, fix any invalid values loaded from config
 2015-01-16 17:11:38 +01:00
Fabio Bas 2101ed7096 Merge remote-tracking branch 'upstream/master' into pixmap_memory_2nd_attempt 
Conflicts:
	cockatrice/src/dlg_settings.cpp
	cockatrice/src/dlg_settings.h
 2015-01-05 22:46:12 +01:00
Fabio Bas 2671d6abdc Merge remote-tracking branch 'upstream/master' into local_scry_and_move 2015-01-05 11:08:11 +01:00
Fabio Bas 0abd1fb299 Rework patch for "move to.." menu; fix "P/T"-related menus 2015-01-02 17:10:19 +01:00
Fabio Bas 51735613e5 force NULL as unregistered users's id 2015-01-01 16:42:20 +01:00
Fabio Bas 925b4a83b0 Fix "sender id" and "ip address" fields in game 2015-01-01 16:20:57 +01:00
Fabio Bas cd69bc8f9d Add configuration options to enable database logging 2015-01-01 15:48:53 +01:00
Fabio Bas 2896f05823 Merge remote-tracking branch 'upstream/master' into message_log 
Conflicts:
	servatrice/CMakeLists.txt
 2015-01-01 15:02:17 +01:00
ctrlaltca 16bbc5e8c0 Merge pull request #516 from mcallahan/compilation-warnings 
Clean up a small pile of compiler warnings.
 2015-01-01 14:32:53 +01:00
ctrlaltca 37dd99ea5e Merge pull request #507 from ctrlaltca/osx_plugins_debug 
Optimize qt plugins installation
 2015-01-01 13:56:31 +01:00
Fabio Bas 54ce135e0c Optimize qt plugins installation 
* Always install “release” plugins
 * install only plugins actually used
 2014-12-28 22:21:45 +01:00
Fabio Bas ea1067189d Specify the player when triggering a move on a revealed card 
Fixes #72, #493
 2014-12-27 17:12:21 +01:00
Fabio Bas dd88476796 Changed parameter name to something more meaningful 2014-12-27 15:02:20 +01:00
ctrlaltca eacd06d2b8 Merge pull request #503 from ctrlaltca/travis_osx_qt5 
Fix travis compilation with osx+qt5
 2014-12-26 17:00:15 +01:00
Fabio Bas 49310b5291 Fix travis compilation with osx+qt5 
Homebrew currently installs qt 5.4.0
 2014-12-26 16:34:42 +01:00
Fabio Bas 390a8f1985 Fix #484 
Missing tooltip
 2014-12-26 16:09:56 +01:00
Fabio Bas 15e4c852dd Fix crash on close #255 2014-12-26 16:03:59 +01:00
Fabio Bas 2d932c68de Fixed translation for "clear downloaded pictures" button 2014-12-26 14:48:58 +01:00
Fabio Bas 499f148783 Regnerate translations 2014-12-26 14:45:41 +01:00
Fabio Bas 72ba5a1683 Parse header files for translatable strings 
We previously parsed only .cpp files, but some strings are inlined in
header files.
 2014-12-26 14:45:31 +01:00
Fabio Bas f88621fd97 Use QPixmapCache for card images 
Drop CardInfo’s own pixmap caches; use QPixmapCache instead.
Use QPixmap references instead of pointers.
Being stored in QPixmapCache, all card images are now subjected to
QPixmapCache’s size limit
 2014-12-24 16:18:55 +01:00
Fabio Bas b96104bed4 Expose QPixmapCache's cache limit size as an user preference 2014-12-24 16:16:34 +01:00
Fabio Bas a5a92e0a7d Remove branch decoration 2014-12-18 17:39:07 +01:00
Fabio Bas c875054fb5 Log messages from rooms, games and chats 2014-12-13 18:43:59 +01:00
Fabio Bas 02978ce404 Implement the logging method 2014-12-13 18:43:31 +01:00
Fabio Bas ba71d3a256 Add db schema and fix sql plugins installation 2014-12-13 18:43:05 +01:00
Fabio Bas 9cc8d8b86c Misc fixes 
ucfirst(setCode): requires oracle re-run
reorder columns
rename the “short name“ column as “set code“
ensure proper casting for releaseDate and sortKey fields (refs 00a5ed0)
 2014-12-05 08:48:33 +01:00
Fabio Bas 0ba351c955 Add "saved" msgbox 2014-12-04 21:09:50 +01:00
Fabio Bas 00a5ed0b79 Fix compilation with qt <= 5.2 2014-12-04 18:29:06 +01:00
Fabio Bas 2745cb2c62 Removed debug 2014-12-02 14:43:39 +01:00
Fabio Bas 36ed4480c2 Re-added save and restore buttons 2014-12-02 14:38:36 +01:00
Fabio Bas e48a815d25 Add move buttons, misc improvements 2014-11-30 21:37:06 +01:00
Fabio Bas c8aeff0b0c Port #436 to QDateTime 2014-11-26 12:34:26 +01:00
Fabio Bas 2704523c73 Merge branch 'master' into set_extinfo 2014-11-26 11:45:51 +01:00
ctrlaltca a28eb053c5 Merge pull request #450 from poixen/ghostcards 
Added fade to card drag items
 2014-11-21 08:24:14 +01:00
Fabio Bas 859adca0c7 Fixed indentation 2014-11-20 09:16:30 +01:00
Fabio Bas ee3731717c Fixed button labels 2014-11-20 09:15:58 +01:00
Fabio Bas f48f386f35 Sets window: implemented save and restore buttons 2014-11-19 22:18:41 +01:00
Fabio Bas ac43fa23b9 Better handle the TK set used for tokens 
Let oracle add a basic TK set in cards.xml
Unify all the code previously using the string literal “TK”
 2014-11-19 19:44:54 +01:00
Fabio Bas 8542d875d3 Sets dialog: new columns and sorting 
Added "order key", "set type" and "release date" columns
Use a proxy model to sort the table
made the dialog wider accordingly
 2014-11-19 18:09:37 +01:00
Fabio Bas cb37073828 Oracle: fetch release date and set type 
and save them in cards.xml
 2014-11-10 16:22:46 +01:00
Fabio Bas fc1d06e13b Add fallback urls for cards without a muId set 
We only have a good HQ source for them; any idea on a low-quality
source?
 2014-11-10 00:23:41 +01:00
Fabio Bas c0ee060af4 Fixed vendor name 2014-11-09 23:14:36 +01:00
Fabio Bas da46996294 Fix #408 
Gray out "only buddies/only reg users" in the “create game” dialog if
the user is unregistered
 2014-11-09 22:12:55 +01:00
Fabio Bas cb055055a9 Oracle: add button to restore default download url 
Should avoid the problem explained in #414
 2014-11-09 21:15:31 +01:00
Fabio Bas a716d73a42 OSX: Add proper infos to info.plist 
fixes #411
 2014-11-09 21:03:10 +01:00
Fabio Bas 4b8ac99370 Corrected spacing 2014-11-08 15:52:04 +01:00
Fabio Bas 8ca0b96d10 Rework the picture download behavior 
Should fix #412
 2014-11-08 15:08:49 +01:00
Fabio Bas 9cfb09cd5b Possible fix for #405 2014-10-28 16:30:49 +01:00
Fabio Bas e0d76b60d0 Change button label and made it translatable 2014-10-14 22:02:42 +02:00
Fabio Bas 82a3deec30 Add a button in the sounds settings to play a test sound 2014-10-14 21:13:16 +02:00
Fabio Bas 9ef4d79c33 Install the audio/* plugins under windows and osx 2014-10-14 21:13:04 +02:00
Fabio Bas 754b97f212 Servatrice: open in a terminal window when started from the menu 2014-10-11 13:38:07 +02:00
Fabio Bas c0abb347ac Servatrice: Install icons and desktop file under linux 2014-10-11 13:37:52 +02:00
Fabio Bas ea622a7302 NSIS: uninstall openssl libraries 2014-10-10 17:22:39 +02:00
Fabio Bas dfb8be79cf Fix installation of libeay32.dll, ssleay32.dll while compiling the PACKAGE target 2014-10-10 17:22:29 +02:00
Fabio Bas ef7fc01f08 Fix typos 2014-10-10 14:26:52 +02:00
Fabio Bas 90e90b59a3 Reverted WITH_SERVER to OFF 2014-10-10 14:23:31 +02:00
Fabio Bas 6f25e09132 Deploy openssl libraries under win32 
They are needed to fetch prices from deckbrew and possibly, in the
future, for ssl server connections
 2014-10-10 14:12:30 +02:00
Fabio Bas 22af789c9e Servatrice: log to console authentication method on startup 2014-10-07 17:04:22 +02:00
Fabio Bas 15555c16fd Fix servatrice's regonly mode 2014-10-06 22:56:09 +02:00
Fabio Bas 0d35488c21 Added schema for _rooms table 2014-10-06 21:49:38 +02:00
Fabio Bas 01bd26d228 Misc typos fixing 2014-10-06 21:44:20 +02:00
Fabio Bas 91dafdb3e8 Move server network settings to the bottom and add a disclaimer 2014-10-04 18:21:07 +02:00
Fabio Bas 29cf353913 Give servatrice example configuration some love 
added "password" settings
commented all settings
 2014-10-04 17:51:27 +02:00
Fabio Bas 0d9eec4b64 Servatrice: added authentication type "password" 2014-10-04 17:50:01 +02:00
Fabio Bas 0261862b1b Fix configuration loading 2014-10-04 10:33:55 +02:00
Fabio Bas 871f5f7c94 use qWarning instead of std::err 2014-10-02 23:45:42 +02:00
Fabio Bas 8d8ccaad7f use 4 spaces instead of tabs 2014-10-02 23:42:51 +02:00
Fabio Bas 37eaeaae13 servatrice: as a third choice, check for a config in /etc/servatrice/ 2014-10-02 23:41:24 +02:00
Fabio Bas 85a4a94ba3 win32: Avoid wiping server.log on upgrade 2014-10-02 23:26:25 +02:00
Fabio Bas b348068369 Servatrice: Add a default option for every config value 
add an empty room swell, if none had been defined in the config (or we
are running with no config at all)
 2014-10-02 23:11:49 +02:00
Fabio Bas 4b38187d20 Fix logfile option in servatrice.ini 
servatrice was using hardcocded filename “server.log” even if a custom
value was specified
 2014-10-02 23:00:17 +02:00
Fabio Bas 8b32e51cab win32 NSIS installer: uninstall servatrice* 
just avoid deleting servatrice.ini, if the user manually made one from
the servatrice.ini.example
 2014-10-02 22:46:46 +02:00
Fabio Bas a1b6600fe1 Servatrice: group all the use of QSettings in a single file 
and add a method to guess the path of servatrice.ini
 2014-10-02 22:37:50 +02: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
Fabio Bas 355de8fba4 Drop libgcrypt dependency for qt5 2014-10-01 20:21:22 +02: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
Fabio Bas 98e5211ad5 Fix oracle under windows 2014-09-15 16:15:27 +02: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
Fabio Bas 23a3b8364c Merge remote-tracking branch 'upstream/master' into fix_202 2014-08-11 15:07:43 +02:00
Fabio Bas 484a6e8bdc Fix crash #202 2014-08-11 10:50:55 +02: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
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
Fabio Bas bba8184d37 Fix off by one 2014-08-07 23:14:57 +02:00
Fabio Bas 88dfea8ece Don't save card pictures if we don't have a proper set name for it 2014-08-07 23:14:50 +02:00
Fabio Bas 3bce98e3a9 Fix crashes trying to load the picture of a card with no <set> 2014-08-07 23:14:41 +02:00
Fabio Bas 40e9735678 Add icon to oracle 2014-08-07 17:27:15 +02:00
Fabio Bas 2e051c3fd7 add success notification to oracle 2014-08-07 16:10:57 +02:00
Fabio Bas 6502a182e8 Support loading of files with wrong extension 
Like M15’s .png that cockatrice wrongly saved as .jpg
Additionally, move the QImageReader declaration outside of the inner
loop
 2014-08-06 09:31:22 +02:00
Fabio Bas 3667ab504c Fix compilation warning introduced in #246 
/cockatrice/src/main.cpp:162:16: warning: format string is not a string
literal (potentially insecure) [-Wformat-security]
        qDebug("Could not create " +
settingsCache->getPicsPath().toUtf8() + "/CUSTOM. Will fall back on
default card images.");
 2014-08-04 20:09:53 +02:00
Fabio Bas b2e1855af7 Fix: <color> can appear more than once 2014-07-31 18:40:10 +02:00
Fabio Bas c1b7d71dca Added schema for cards.xml 2014-07-31 17:53:39 +02:00
Fabio Bas 9e12c5b2d4 Use custom picUrl if picUrlHq is not defined 2014-07-27 22:06:35 +02:00