Commit Graph
56 Commits
Author SHA1 Message Date
David SzaboandZach H 2fcb02cadd untranslated string comparison fixed (#3164) 2018-04-02 23:04:52 -04:00
ctrlaltcaandZach H 517420cccb Replace CardInfo* and Carset* with smart pointers (#3053)
* Replace CardInfo* and Carset* with smart pointers

* fixes to help memory & c++11 stuff
2018-02-02 12:52:47 -05:00
ctrlaltcaandGitHub b29bd9e070 Clang-format (#3028)
* 1/3 Add .clang-format file and travis compilation check

* 2/3 Run clang-format

* 3/3 Fix compilation problems due to include reordering

* 3bis/3 AfterControlStatement: false
2018-01-27 10:41:32 +01:00
Zach HandGitHub 34bec90193 Fix deck loader with spaces (#3007) 2018-01-18 19:23:13 -05:00
Zach HandGitHub b75882b6b9 Allow non-db cards to be moved around (#2960) 2017-12-18 14:17:54 -05:00
Zach H 16bc8b764b remove all of pricing 2017-05-04 23:29:43 -04:00
Zach HandGitHub 87ebea7b0f fix memory leak (#2549) 2017-03-28 13:13:42 -04:00
Zach HandGitHub 212a7d00db better null checking decklist (#2510) 2017-03-18 20:56:49 -04:00
Mitchell Rosenandctrlaltca 9ba3f21730 Fix indentation (and Debug build) (#2418)
* Fix indentation (and Debug build)

* More indentation fixes
2017-02-20 08:48:12 +01:00
Fabio Bas 1e3fb6c6e1 Rework "paths" settings loading and card database loading
* main.cpp: removed path checking and db loading
 * card database: merge card loading methods into a single one
 * settings cache: take care of returning safe paths for decks,
replays, etc..
 * main window: if db loading fails (eg. first run), propose to run
oracle

NSIS: propose to run cockatrice instead of oracle

Rework card database loading

 * Move carddatabase-related method out of deckeditor tab
 * Load cards in another thread and render them progressively
 * Optimize database reload after enabled sets change

Fix deck editor column width

 * removed the noCard hack.
 * getCard() no more creates cards instead of just returning existing
ones
 * Fix the “edit tokens” dialog.
 * PictureLoader: avoid trying to download twice the same card
 * PictureLoader: correct return of card background
 * AbstractCardItem: avoid recalculating card color at every paint

Use a different file to save custom tokens

Misc required improvements

 * Use nullptr;
 * Refactor CardInfoWidget to use CardInfoPicture and CardInfoText
instead of duplicating code;
 * Added CardInfo::getColorChar()
 * Fixed some potential crashes
 * removed dead code related to CardInfoWidget
 * Don't require a restart after adding a new custom sets file
 * Bump CMake requirements to 3.1
2016-03-15 22:27:55 +01:00
Fabio Bas 5cfb034452 merged with master 2015-08-31 22:48:14 +02:00
Fabio Bas 800a17e483 Force black text color on deck list; fix #1289 2015-07-24 19:35:31 +02:00
Fabio Bas 6b8ebe54e9 Theme manager
This is the first implementation of a theme manager. It’s a rebased and
revisited version of #792.
2015-06-15 14:35:58 +02:00
Fabio Bas 8f3421204e Optimize loop; refers #910 2015-04-08 12:52:02 +02:00
Fabio Bas cab1e096df Fix #118
Fix selection problem when sorting the deck list
2015-04-04 12:49:28 +02:00
Fabio Bas bf92e67002 Ensure the whole table gets refreshed when updating prices 2014-07-23 22:11:26 +02:00
Daenyth 09d6d26fb2 Merge branch 'master' into cmake_qt5
Conflicts:
	cockatrice/src/main.cpp
2014-06-28 09:13:10 -04:00
Daenyth 6d3fe428e7 Fix some warnings
Ref #127
2014-06-27 22:19:23 -04:00
Fabio Bas 2354ed6909 Require Qt4 >=4.8.0; remove some ifdefs on qt version 2014-06-25 16:00:48 +02:00
Fabio Bas 6dbdaafb33 Ported cockatrice 2014-06-24 19:13:47 +02:00
Daenyth 68c0932a2f Don't have decklist sort behavior rely on column order 2014-06-22 08:36:35 -04:00
Daenyth e99c1bbe6d Merge remote-tracking branch 'origin/master' into editor-sorting-v5 2014-06-22 08:10:22 -04:00
sylvanbasilisk 748aac7ee8 whitespace modifications in preparation for merge 2014-03-25 01:13:41 +00:00
sylvanbasilisk 2b7ea0c983 refactored deck editor UI key shortcuts
The global shortcuts were removed in favor of key events
which are only triggered when a widget has focus. This is
necessary to allow different widgets to react differently
to the 'enter' key. The current key configuration is:
search edit focused:
  * left/right: decrease/increase card count for selected database card
  * enter: add selected card to deck
  * ctrl-enter: add selected card to deck sideboard
  * ctrl-left/right: decrease/increase card count in sideboard for selected card

database focused: the same as with search edit.

deckview focused:
  * left/right: decrease/increase card count for selected deckview card
  * enter: increase count for selected deckview card
  * delete/backspace: delete selected card from deck
2014-03-24 21:03:26 +00:00
Buce 401b34d22c Clean up DecklistModel::addCard()
Split common functionality out of the if-else block.
2014-02-28 15:45:29 -06:00
Buce 875df01424 Fix GUI glitches when adding cards to a deck
Since we no longer sort on just card names, we need to emit updates
for the parent of the card we add.
2014-02-28 15:44:46 -06:00
Buce b32374b453 Sort correctly when adding cards 2014-02-28 15:43:43 -06:00
Buce 6a5f2d2476 Allow sorting on different columns 2014-02-28 15:41:29 -06:00
Matt Kelly 1bc48a7849 Convert rest of source to 4-space indent 2014-02-11 11:14:19 -05:00
Max-Wilhelm Bruker 0eee6d7ab9 fixed issue #49: when editing a remote deck, be able to directly save it there 2012-05-09 21:52:09 +02:00
Max-Wilhelm Bruker 632e9bbff3 improved banning and deck hashing 2011-11-01 22:44:51 +01:00
unknown 0bb4ef8bb8 added deck hashing 2011-10-04 16:55:18 +02:00
Max-Wilhelm Bruker 6226e381de price tag feature by Marcio Ribeiro 2011-06-16 16:43:01 +02:00
Max-Wilhelm Bruker bd06cd5796 removed some debugging warnings; fixed card name and player name display; display avatar in game 2010-10-11 19:01:46 +02:00
Max-Wilhelm Bruker e0c7df1694 deck list editing in deck storage tab; mouse hover event for deck view 2009-12-19 20:34:33 +01:00
Max-Wilhelm Bruker 694070724c restructured protocol code 2009-11-29 03:07:28 +01:00
Max-Wilhelm Bruker cf21528a69 almost finished pre-game deck loading 2009-11-22 01:30:16 +01:00
Max-Wilhelm Bruker 34d2649f65 prepared deck list code to be moved out to common 2009-11-16 23:58:07 +01:00
marcus 74180b6bc9 hr bug fixed 2009-08-22 17:22:36 +02:00
Max-Wilhelm Bruker ecc6f7b20f fix for deck list model crash 2009-07-17 21:27:38 +02:00
Max-Wilhelm Bruker 3043157a1d bugfix and nicer decklist font 2009-07-11 21:29:47 +02:00
Max-Wilhelm Bruker bf868d5abc fixed deck editor bug 2009-07-02 15:40:44 +02:00
Max-Wilhelm Bruker 5d40996c0b nice decklist printing 2009-06-27 20:53:24 +02:00
Max-Wilhelm Bruker 33cc7a8859 started implementing deck printing 2009-06-26 15:25:32 +02:00
Max-Wilhelm Bruker fb03c5cdbb configurable set priority for card pictures 2009-06-20 20:09:19 +02:00
Max-Wilhelm Bruker 21daf9db99 foo 2009-06-06 13:55:30 +02:00
brukie e7e51f5f9d sanity checks 2009-06-04 14:57:20 +02:00
Max-Wilhelm Bruker 1da5c63726 deck editor 2009-06-03 00:15:06 +02:00
Max-Wilhelm Bruker 3502ec80e4 deck editor 2009-06-01 21:55:41 +02:00
Max-Wilhelm Bruker 9a277ccccf confirmation message box 2009-05-27 20:37:28 +02:00