Commit graph

29 commits

Author SHA1 Message Date
Zach H
34bec90193
Fix deck loader with spaces (#3007) 2018-01-18 19:23:13 -05:00
Zach H
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
Fabio Bas
bf92e67002 Ensure the whole table gets refreshed when updating prices 2014-07-23 22:11:26 +02:00
Daenyth
e99c1bbe6d Merge remote-tracking branch 'origin/master' into editor-sorting-v5 2014-06-22 08:10:22 -04:00
Mark Morschhäuser
8708c96695 Merge remote-tracking branch 'origin/master' into win32
Conflicts:
	cockatrice/CMakeLists.txt
	oracle/CMakeLists.txt
2014-06-18 12:09:32 +02:00
sylvanbasilisk
0770626270 Merge branch 'master' into editor-redesign
Conflicts:
	cockatrice/src/carddatabasemodel.cpp
	cockatrice/src/carddatabasemodel.h
	cockatrice/src/decklistmodel.cpp
	cockatrice/src/decklistmodel.h
	cockatrice/src/tab_deck_editor.cpp
	cockatrice/src/tab_deck_editor.h
2014-03-25 02:10:52 +00: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
Mark Morschhäuser
7c606af63e Fixed warning regarding virtual function overrides. Using C++ standard.
See http://msdn.microsoft.com/en-us/library/bb384874(v=vs.90).aspx
2014-03-12 09:11:01 +01:00
Buce
b32374b453 Sort correctly when adding cards 2014-02-28 15:43:43 -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
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
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
Max-Wilhelm Bruker
ecc6f7b20f fix for deck list model crash 2009-07-17 21:27:38 +02:00
Max-Wilhelm Bruker
33cc7a8859 started implementing deck printing 2009-06-26 15:25:32 +02:00
Max-Wilhelm Bruker
21daf9db99 foo 2009-06-06 13:55:30 +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
d9e51e58a3 deck editor... 2009-05-24 01:41:25 +02:00
Max-Wilhelm Bruker
3ae865178b Deck editor 2009-05-23 20:04:14 +02:00
Max-Wilhelm Bruker
0ef00dd437 new decklist file format 2009-05-19 21:57:23 +02:00
Max-Wilhelm Bruker
e6d6162426 started implementing a simple deck editor 2009-04-04 19:51:23 +02:00
Max-Wilhelm Bruker
a11f93df4d initial commit 2009-03-13 22:50:41 +01:00