Commit graph

  • ff8e25bb7e removed qdebug line for >= maxuser (no need to fill log) woogerboy21 2014-11-18 18:31:06 -05:00
  • 1195e4c77b corrected default ini value woogerboy21 2014-11-18 17:32:10 -05:00
  • 37e08cfbb6 added logic to only write debug if max user value is reached woogerboy21 2014-11-18 17:27:57 -05:00
  • 197ae9213c corrected invalid variable call & added log file debug information woogerboy21 2014-11-18 17:20:45 -05:00
  • 26f5110fea convert file tab to 4 space indent woogerboy21 2014-11-18 16:59:08 -05:00
  • 3c513b4bfc moved code logic to callling function & indent fix woogerboy21 2014-11-18 16:55:19 -05:00
  • 8aa7a1d6be Merge branch 'servatrice_trustedsources' of ssh://github.com/woogerboy21/Cockatrice into servatrice_trustedsources woogerboy21 2014-11-18 15:41:10 -05:00
  • 44a302a2d6 added trusted sources to servatrice woogerboy21 2014-11-18 15:25:47 -05:00
  • 74f8a82a73 corrected miss-pasting woogerboy21 2014-11-18 15:25:47 -05:00
  • 3869532722 Merge remote branch 'upstream/master' into servatrice_trustedsources woogerboy21 2014-11-18 15:16:20 -05:00
  • da98d24d8c added trusted sources to servatrice wcollins 2014-11-18 15:09:21 -05:00
  • 6d19f8e157 Merge pull request #423 from Cockatrice/travis-qt4-5-builds Gavin Bisesi 2014-11-18 14:48:19 -05:00
  • b4dc9b79d4 Don't install qt4 when building qt5 on osx Gavin Bisesi 2014-11-18 12:41:08 -05:00
  • ee2ba4abd3 Include qtmultimedia and qtsvg for travis qt5 build Gavin Bisesi 2014-11-18 12:18:30 -05:00
  • d467cc8b01 QT_VERSION check now checks for correct version Matt Lowe 2014-11-18 18:14:47 +01:00
  • 1ba6b468de Install updated cmake from ubuntu sdk ppa Gavin Bisesi 2014-11-18 07:48:55 -05:00
  • d2e706164d Install qt5tools-dev for ubuntu build Gavin Bisesi 2014-11-18 06:08:56 -05:00
  • 1640e77848 Notify gitter about build changes Gavin Bisesi 2014-11-17 11:29:20 -05:00
  • a2c4a1e537 Action: Move Bottom Card to Graveyard Matt Lowe 2014-11-15 16:35:30 +01:00
  • fbbe40fbf3 Use correct qt version path for cmake on osx Gavin Bisesi 2014-11-14 17:11:50 -05:00
  • 5f944f1d6e Actually use Qt5 for qt5-osx build Gavin Bisesi 2014-11-14 16:32:56 -05:00
  • 9599fe7b33 Merge remote-tracking branch 'origin/master' into travis-qt4-5-builds Gavin Bisesi 2014-11-14 16:07:05 -05:00
  • b351abcce4 Update gitter chat room for org change Gavin Bisesi 2014-11-14 10:54:02 -05:00
  • c93fdbefe2 Update travis build badge link for org change Gavin Bisesi 2014-11-14 10:52:39 -05:00
  • e918900d4e Refine travis config to only install qt4 or qt5 per build instead of both Gavin Bisesi 2014-11-14 10:38:54 -05:00
  • 438d4e4661 Merge pull request #417 from poixen/newsearchbar Gavin Bisesi 2014-11-14 10:19:24 -05:00
  • 6811819161 Don't remove card images from revealed decks woogerboy21 2014-11-13 20:31:55 -05:00
  • 62b7890e59 Cards Scale with mouse over action Matt Lowe 2014-11-12 23:26:24 +01:00
  • 687d441a49 Merge pull request #426 from woogerboy21/patch-2 Gavin Bisesi 2014-11-11 14:22:11 -05:00
  • 84a5117b4c Default logging to enable with no config file woogerboy21 2014-11-11 14:15:02 -05:00
  • f58cc32ef4 Added version check Matt Lowe 2014-11-10 22:14:27 +01:00
  • a91106f90e Add ppa for qt5 on travis ubuntu Gavin Bisesi 2014-11-10 15:36:31 -05:00
  • 4b478efa61 Build both Qt4 and Qt5 Gavin Bisesi 2014-11-10 15:12:45 -05:00
  • 277c050d76 Merge pull request #421 from ctrlaltca/even_more_pictures Gavin Bisesi 2014-11-10 10:27:47 -05:00
  • cb37073828 Oracle: fetch release date and set type Fabio Bas 2014-11-10 16:22:46 +01:00
  • 33a6e3c5c0 Removed hard coded CSS Matt Lowe 2014-11-10 08:49:24 +01:00
  • fc1d06e13b Add fallback urls for cards without a muId set Fabio Bas 2014-11-10 00:23:41 +01:00
  • a320af70da Merge pull request #418 from ctrlaltca/osx_info_plist Gavin Bisesi 2014-11-09 17:34:35 -05:00
  • 6b1df247d1 Merge pull request #415 from ctrlaltca/no_pictures_yet Gavin Bisesi 2014-11-09 17:16:00 -05:00
  • c0ee060af4 Fixed vendor name Fabio Bas 2014-11-09 23:14:36 +01:00
  • b3715c5da2 Merge pull request #416 from poixen/partialsearch Gavin Bisesi 2014-11-09 17:08:02 -05:00
  • e1c5f4d436 Merge pull request #419 from ctrlaltca/oracle_url Gavin Bisesi 2014-11-09 17:06:56 -05:00
  • 13f6da15ec Merge pull request #420 from ctrlaltca/unreg_create_game Gavin Bisesi 2014-11-09 17:06:12 -05:00
  • da46996294 Fix #408 Fabio Bas 2014-11-09 22:12:55 +01:00
  • cb055055a9 Oracle: add button to restore default download url Fabio Bas 2014-11-09 21:15:31 +01:00
  • a716d73a42 OSX: Add proper infos to info.plist Fabio Bas 2014-11-09 21:03:10 +01:00
  • eef4a621b3 Updated Search Bar Style Matt Lowe 2014-11-09 12:04:09 +01:00
  • 0589f02ca2 Partial Card Name Search Matt Lowe 2014-11-09 11:23:45 +01:00
  • 4b8ac99370 Corrected spacing Fabio Bas 2014-11-08 15:52:04 +01:00
  • 8ca0b96d10 Rework the picture download behavior Fabio Bas 2014-11-08 15:08:49 +01:00
  • 8d2e5d3c43 Merge pull request #306 from Mawu3n4/translation Gavin Bisesi 2014-11-07 10:11:53 -05:00
  • 8f801825a9 Merge pull request #379 from poixen/uicolors Gavin Bisesi 2014-11-05 15:45:53 -05:00
  • 5ad869c636 Merge pull request #378 from poixen/animation Gavin Bisesi 2014-11-05 15:45:24 -05:00
  • 67db347d12 Merge pull request #366 from poixen/removeoldimages Gavin Bisesi 2014-11-05 15:31:17 -05:00
  • 967e1a469e Removed comments poixen 2014-11-05 14:10:30 +01:00
  • accd3ecca1 Removed commented line poixen 2014-11-05 14:03:43 +01:00
  • 332d69a1a5 Removed comment Matt Lowe 2014-11-03 17:19:12 +01:00
  • 097090ac1c Updated static variable name Matt Lowe 2014-11-03 16:33:48 +01:00
  • a051133af9 Merge pull request #397 from woogerboy21/patch-1 Gavin Bisesi 2014-11-03 10:22:24 -05:00
  • c130ee92fa Additional comment Matt Lowe 2014-11-03 14:39:51 +01:00
  • 1d7850fff8 Merge pull request #406 from ctrlaltca/fix_405 Gavin Bisesi 2014-10-29 09:53:21 -04:00
  • 9cfb09cd5b Possible fix for #405 Fabio Bas 2014-10-28 16:30:49 +01:00
  • 950fc01363 Correct gametype primary key woogerboy21 2014-10-24 21:02:45 -04:00
  • 66aba2eec7 Merge remote-tracking branch 'upstream/master' into translation Zack 2014-10-22 11:18:54 +02:00
  • 07cccda17b Merge pull request #377 from poixen/newhandsvg Gavin Bisesi 2014-10-20 10:28:58 -04:00
  • d264191ee6 Merge pull request #381 from poixen/abstractcarddragitemcleanup Gavin Bisesi 2014-10-17 15:07:04 -04:00
  • 80fd0fbcf3 Removed inline logic Matt Lowe 2014-10-17 00:17:44 +02:00
  • 41478800ef Updated Sideboard gradient colors Matt Lowe 2014-10-16 17:10:37 +02:00
  • a1c013a893 Updated UI features Matt Lowe 2014-10-14 22:39:22 +02:00
  • 2193d247d0 Improved card animation performance Matt Lowe 2014-10-16 01:31:53 +02:00
  • dc58d1a61e Shortened animation time between phases Matt Lowe 2014-10-15 19:51:08 +02:00
  • 2a15b9c95a Merge pull request #376 from ctrlaltca/oh_my_sounds Gavin Bisesi 2014-10-16 11:32:30 -04:00
  • 03f79887c4 Updated Hand image Matt Lowe 2014-10-11 00:22:49 +02:00
  • e0d76b60d0 Change button label and made it translatable Fabio Bas 2014-10-14 22:02:42 +02:00
  • 82a3deec30 Add a button in the sounds settings to play a test sound Fabio Bas 2014-10-14 21:13:16 +02:00
  • 9ef4d79c33 Install the audio/* plugins under windows and osx Fabio Bas 2014-10-14 21:13:04 +02:00
  • 8dbb2d8e6f Merge pull request #364 from ctrlaltca/win32_openssl_cmake Gavin Bisesi 2014-10-14 14:03:32 -04:00
  • 592bb7c8f1 Merge pull request #368 from ctrlaltca/servatrice_linux_menu_entry Gavin Bisesi 2014-10-14 11:58:50 -04:00
  • ae7cdc1c23 Merge pull request #375 from Daenyth/revert-260-master Gavin Bisesi 2014-10-14 11:57:41 -04:00
  • a26d4078cc Revert "Find cards by prefix" Gavin Bisesi 2014-10-14 11:28:30 -04:00
  • 2c74524f59 fix: missing message closing tag Zack 2014-10-12 16:43:35 +02:00
  • 754b97f212 Servatrice: open in a terminal window when started from the menu Fabio Bas 2014-10-11 13:38:07 +02:00
  • c0abb347ac Servatrice: Install icons and desktop file under linux Fabio Bas 2014-10-11 13:37:52 +02:00
  • 299283aa2e Resource cleanup Matt Lowe 2014-10-10 23:00:05 +02:00
  • ea622a7302 NSIS: uninstall openssl libraries Fabio Bas 2014-10-10 17:22:39 +02:00
  • dfb8be79cf Fix installation of libeay32.dll, ssleay32.dll while compiling the PACKAGE target Fabio Bas 2014-10-10 17:22:29 +02:00
  • 9169d3a804 fix: conflicts && add: new translation Zack 2014-10-10 14:56:05 +02:00
  • ef7fc01f08 Fix typos Fabio Bas 2014-10-10 14:26:52 +02:00
  • ca60a469eb Merge pull request #363 from woogerboy21/win_servatrice_icon Gavin Bisesi 2014-10-10 08:25:51 -04:00
  • 90e90b59a3 Reverted WITH_SERVER to OFF Fabio Bas 2014-10-10 14:23:31 +02:00
  • 6f25e09132 Deploy openssl libraries under win32 Fabio Bas 2014-10-10 14:12:30 +02:00
  • 692910f9f3 Servatrice Icon For Windows woogerboy21 2014-10-09 15:25:06 -04:00
  • 6810ae46d6 Merge pull request #260 from Mawu3n4/master Gavin Bisesi 2014-10-09 11:29:02 -04:00
  • 4070ba8e26 Merge pull request #352 from poixen/image-refresh Gavin Bisesi 2014-10-09 11:27:47 -04:00
  • 0f5f82d492 Merge pull request #358 from poixen/serverlogo2 Gavin Bisesi 2014-10-09 11:27:15 -04:00
  • 359714214d Added .desktop file Matt Lowe 2014-10-08 18:46:31 +02:00
  • b131b3847d Merge ef919dda4d into 3c0a09bf5c Matthew Lowe 2014-10-08 12:55:50 +00:00
  • 3c0a09bf5c Merge pull request #361 from woogerboy21/servatrice-dbtable-fix Gavin Bisesi 2014-10-08 08:50:00 -04:00
  • 602fa25321 Merge pull request #359 from ctrlaltca/servatrice_reguser_fixes Gavin Bisesi 2014-10-08 08:41:13 -04:00
  • 9cd1a5b33f correct _room db table, add _rooms_gametypes table woogerboy21 2014-10-07 14:49:24 -04:00