aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2897 commits 1 branch 0 tags 51 MiB
Commit graph

1526 commits

Author SHA1 Message Date
sylvanbasilisk
c786e180c3 reverted back to original deck editor layout but including filtertree 
the original layout is actually more space efficient if using CardFrame
instead of CardInfoWidget and reducing the size of the deck editor
toolbar.

this commit also removes the old search feature by removing the search
button and the clear search button. the clear search menu item is left
in place, however it now clears the filtertree.

finally, the stretch factor for the right frame in the main layout was
reduced to zero so that the card database gets priority for extra space.
this makes more sense because the deck editor does not actually need
very much horizontal space.
 2014-01-26 23:20:35 +00:00
sylvanbasilisk
16d30fb9e1 miscellaneous code cleanup 
renamed filter list modules to filter tree to more accurately reflect
the nature of the data structure.
 2014-01-22 20:52:52 +00:00
sylvanbasilisk
083005b8a9 implemented filter list enable/disable functionality 
also refactored much of the filter list code to be much
cleaner and modular.
 2014-01-22 08:32:00 +00:00
sylvanbasilisk
3202243ed0 connect filter list functionality to the CardDatabaseDisplayModel class 
enable/disable check boxes still not functional
 2014-01-21 23:37:22 +00:00
arxanas
629668d7c0 Fix #34 
This is @mcallahan's patch — see #35. I had to apply this diff by hand,
because both `git` and `patch` refused to apply it and I didn't know
how to resolve that. Consequently, there might be an error.
 2014-01-17 20:30:06 -05:00
sylvanbasilisk
863e437d4c added filter builder widget and filter tree 
filter builder takes filter options from user, then adds
completed filters to the filter tree. the filter tree does
not currently do anything. in the future it will filter the
cards in the database view.
 2014-01-17 10:06:45 +00:00
jfreake
67c4d089be Deck Load Mods and Movable Tabs 
Changes:
Deck Load - Default to all types *.*
Decklist - Strip "|edition" from .dec formats that include a pipe and
the edition after the card name
Tab_Supervisor - Make tabs movable (able to rearrange tabs)
 2014-01-08 11:54:02 -04:00
sylvanbasilisk
0b2231639f initial experiment with editor layout 2014-01-05 09:47:50 +00:00
arxanas
b1af4237e7 Added setting to enable/disable notifications 
When something happens, the taskbar icon lights up/the dock icon
bounces. This can be annoying, so here is a setting to disable that.
 2013-12-06 21:04:00 -05:00
Daenyth
92ff503832 Merge pull request #7 from skoh-fley/play-to-stack-option 
Added a UI option to play all nonlands to the stack instead of the battlefield
 2013-07-11 10:58:55 -07:00
Daenyth
db43a0609b Merge branch 'master' of github.com:Daenyth/Cockatrice 2013-07-11 13:51:18 -04:00
Frederik Holden
c0fdbb2cca Fix two bugs in the price tag feature 
"The price tag feature currently has two bugs.
1. The final price that a card ends up with is the one in the last set
alphabetically, instead of the one from the set with the lowest price.
2. Black Lotus Project sometimes gets in prices for cards from Masters
Edition, for some reason. This set only exists in Magic the Gathering:
Online, i.e., not physically, and should not be considered. This might
be considered a BLP bug and not a Cockatrice bug.

This patch fixes those two bugs. I also changed the price value to be
based on BLP's "price" value instead of the "average" value. Seems more
logical."

Signed-off-by: Daenyth <Daenyth+git@gmail.com>
 2013-07-11 13:50:31 -04:00
Daenyth
6d69fe728a Merge pull request #19 from VanNostrand/documentation 
Documentation-Branch v2
 2013-05-15 13:13:35 -07:00
Mark Morschhäuser
562de0553f Fixed compile warnings due to missing \n at EOF. 2013-05-15 21:31:47 +02:00
Daenyth
8ba6424e0d Merge pull request #17 from VanNostrand/compilewarnings 
Compilewarnings
 2013-05-11 11:34:27 -07:00
Mark Morschhäuser
0022425687 Fixed implicit conversions from double to int warnings regarding 
QPainter.drawRect()
 2013-05-11 17:41:11 +02:00
Daenyth
a5ee926862 Merge pull request #14 from VanNostrand/smallfix 
Changed default server to woogerworks
 2013-05-08 15:53:00 -07:00
Mark Morschhäuser
f801f4f64d Changed default server to woogerworks 2013-05-08 23:56:09 +02:00
skoh-fley
03852f0409 To-be permanents on the stack now enter the battlefield when double-clicked 2013-04-17 08:23:31 -07:00
skoh-fley
2727781c0e Added a UI option to always play nonlands onto the stack 
Previously this behavior only occured for instants and sorceries

Woops, missed a file

Missed some parentheses
 2013-04-17 08:23:12 -07:00
skoh-fley
69e6c9ac69 Fixed a cursor bugo 
Click-holding on a card then immediately releasing now properly changes the
cursor from a closed hand back to an open hand
 2013-04-16 18:12:48 -07:00
Mark Morschhäuser
1bf4f74a50 Fixed duplicate case compile error 2013-04-02 12:04:37 +02:00
Daenyth
347d30a84b Merge branch 'master' of git://github.com/mbruker/Cockatrice 2013-02-27 12:36:14 -05:00
Max-Wilhelm Bruker
ce642e3000 don't use Server_Room::getInfo when updating 2013-02-15 19:31:37 +01:00
Chris Hansen
b909047a43 Added some paranthases to supress compiler warnings 2013-02-07 12:49:09 -08:00
Max-Wilhelm Bruker
f10543924d factored out duplicated code in [card] tag parsing 2013-01-19 17:29:15 +01:00
Max-Wilhelm Bruker
a4ae1bcd39 Merge pull request #64 from Daenyth/issue-64 
Allow `[[Cardname]]` as a synonym for `[card]cardname[/card]`
 2013-01-19 08:20:30 -08:00
Max-Wilhelm Bruker
7736f7b5f8 fixed #101: added option to filter password protected games 2013-01-19 17:16:04 +01:00
Max-Wilhelm Bruker
bc595bbab2 added missing confirmation dialogue for remote folder deletion 2013-01-10 00:16:52 +01:00
Max-Wilhelm Bruker
e7fc3b59a7 changed ShutdownDialog to use QDialogButtonBox 2012-10-14 11:19:04 +02:00
Daenyth
b767b72230 Fix #64: Allow [[cardname]] shortcut for card:// 2012-07-25 00:38:26 -04:00
Daenyth
af09d0d294 Reject more invalid usernames from clients. 
Specifically this should cover people connecting with a username of
"\u200C"
 2012-07-25 00:12:35 -04:00
Max-Wilhelm Bruker
28b18575f2 fixed issue #66: game creators can't kick spectators; unfortunately, this fix is client-side 2012-07-17 19:06:12 +02:00
Max-Wilhelm Bruker
a1e35ccda5 servatrice: create correct game ids when not using a database 2012-07-17 18:47:00 +02:00
Max-Wilhelm Bruker
03663edbae included 'view replay' icon 2012-06-27 21:27:41 +02:00
Max-Wilhelm Bruker
c7131e3a1d Windows client: translation path fix 2012-06-27 20:41:42 +02:00
Max-Wilhelm Bruker
5d219871ad client: disable Ok button in 'load deck from server' dialog by default 2012-06-26 20:22:50 +02:00
Max-Wilhelm Bruker
7f0b13530d client: fixed crash due to evaluation of null ServerInfo_User object when watching replay while not logged on 2012-06-25 21:33:10 +02:00
Max-Wilhelm Bruker
b1f37a18c9 client: fixed crash that happened when trying to send a game command in the replay viewer 2012-06-25 21:11:01 +02:00
Max-Wilhelm Bruker
593be45d94 added missing retranslateUi() call in TabMessage; minor Swedish fixes 2012-06-25 12:16:02 +02:00
Max-Wilhelm Bruker
7cc775cb58 added missing retranslateUi calls 2012-06-25 03:03:38 +02:00
Max-Wilhelm Bruker
87584a3a76 updated Spanish; adjusted details for release 2012-06-24 16:40:05 +02:00
Max-Wilhelm Bruker
7c1ca629df cleaned up remoteclient.cpp compiler warnings 2012-06-03 20:29:33 +02:00
Max-Wilhelm Bruker
25b97d1e56 Converted PriceUpdater from QScriptEngine to Qt-Json. I don't feel comfortable running unchecked JS code from an external source. 2012-06-03 20:16:12 +02:00
Max-Wilhelm Bruker
50f7560033 Merge branch 'NicolasMerge' into devel 2012-06-03 19:32:08 +02:00
NicolasPerrenoud
243fe25ce1 Fix priceUpdater bug. If a card is in the main and in the side, the 
price is dispay in both places.
 2012-06-03 19:27:28 +02:00
Max-Wilhelm Bruker
17c8bdb1cd Merge branch 'NicolasMerge' into devel 2012-06-03 19:23:48 +02:00
Max-Wilhelm Bruker
31967cab44 fixed CIW not disappearing after being opened by ChatView 2012-06-02 20:15:55 +02:00
NicolasPerrenoud
805f3e8fe5 merged from NicolasPerrenoud 2012-06-02 20:13:21 +02:00
Max-Wilhelm Bruker
60f99818e1 fixed DlgEditTokens crash when removing a token 2012-06-02 18:09:19 +02:00
Max-Wilhelm Bruker
089c937167 use proper anchors in MessageLogWidget, effectively fixing issue #54 2012-06-02 17:22:19 +02:00
Max-Wilhelm Bruker
d7e7606104 fixed 'open deck in deck editor' option in game, fixed freeze when closing local game 2012-05-28 19:34:07 +02:00
Max-Wilhelm Bruker
b328c1ed4d database interface separated from server, multiple concurrent database connections are now possible 2012-05-28 16:32:45 +02:00
Max-Wilhelm Bruker
44d688b1d5 added deckstats.net interface in deck editor, fixing issue #39 2012-05-17 20:11:46 +02:00
Max-Wilhelm Bruker
3ba3952604 fixed issue #37: add option to manually add token cards to the database 2012-05-17 18:29:35 +02:00
Max-Wilhelm Bruker
8b3a3c285a additional minor fix wrt issue #42 2012-05-09 23:28:13 +02:00
Max-Wilhelm Bruker
295cc65dce minor fix wrt issue #42 2012-05-09 23:25:29 +02:00
Max-Wilhelm Bruker
b9087715bf fixed issue #42: make 'client deprecated' message work for v13 client <-> v14 server 2012-05-09 23:13:23 +02:00
Max-Wilhelm Bruker
f7975d8ace fixed issue #50: ensure that tcp_nodelay is set 2012-05-09 21:57:06 +02:00
Max-Wilhelm Bruker
b106f76294 Merge branch 'devel' of git://github.com/mbruker/Cockatrice into devel 2012-05-09 21:52:27 +02: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
c043fe3c5a client local game crash fix 2012-05-08 12:48:24 +02:00
Max-Wilhelm Bruker
e76502cf0e handle dead commands when the connection is lost before the reply gets processed 2012-05-01 21:16:16 +02:00
Max-Wilhelm Bruker
f6f8ad82b2 server code cleanup 2012-05-01 12:48:59 +02:00
Max-Wilhelm Bruker
e5a0a08569 fixed #43: add delete button to local dir view in deck storage tab and in remote dir view in replays tab 2012-05-01 12:08:09 +02:00
Max-Wilhelm Bruker
875610e1b3 mac fixes 2012-04-27 00:39:34 +02:00
Max-Wilhelm Bruker
61f5cd478d Qt 4.8 crash fix 2012-04-27 00:03:08 +02:00
Max-Wilhelm Bruker
c7fa2fe985 fixed clone function, updated servatrice.ini.example to reflect changes in room creation syntax 2012-04-26 16:22:48 +02:00
Max-Wilhelm Bruker
13d3de5c1c don't show card p/t and loyalty in CardInfoWidget when showing only the picture 2012-04-22 18:35:32 +02:00
Max-Wilhelm Bruker
089d082cf4 moved translations out of resources file 2012-04-22 18:14:17 +02:00
Max-Wilhelm Bruker
b26444435c introduced more general grammatical cases 2012-04-22 17:23:10 +02:00
Max-Wilhelm Bruker
8f6de6637f don't call QAudioOutput constructor unless sound is enabled 2012-04-22 12:51:33 +02:00
Max-Wilhelm Bruker
81d7c08f08 use player menu as default menu for table zone, fixing issue #38 2012-04-22 12:28:23 +02:00
Max-Wilhelm Bruker
cc516823d7 deck editor is tab, replay viewer is tab, deck editor shown by default, cache window geometry between sessions, 'open this deck in deck editor' open in game 2012-04-22 12:23:33 +02:00
Max-Wilhelm Bruker
3edecf98c3 if cards in multiple zones are selected, don't create drag items for the ones you're not supposed to move 2012-04-22 11:19:37 +02:00
Max-Wilhelm Bruker
38cf2621b4 preliminary changes to make deck editor a tab 2012-04-22 05:06:51 -04:00
Max-Wilhelm Bruker
eb927d77c3 updated German translation; added some missing retranslateUi() calls 2012-04-08 23:58:25 +02:00
Max-Wilhelm Bruker
95cd293b9c context menu for a message sender's name in chat; also display the user level icon next to the name; minor consistency and type-safety changes 2012-04-08 23:48:02 +02:00
Max-Wilhelm Bruker
f9e0b6fe9e moved the user list context menu to a separate class to avoid redundant code 2012-04-07 23:05:45 +02:00
Max-Wilhelm Bruker
ae19d3dc4b fixed game list update bug, minor optimizations, restrict client protocol output to QT_DEBUG mode 2012-04-06 17:52:23 +02:00
Max-Wilhelm Bruker
118b575e58 updated German translation, minor token fix 2012-04-06 15:34:00 +02:00
Max-Wilhelm Bruker
12b5e39440 improved token dialog w/ storage inside the deck list - now we need a reliable online source for token data (preferably with pictures) 2012-04-06 15:16:52 +02:00
Max-Wilhelm Bruker
f553fd7456 some token code 2012-04-05 11:48:13 +02:00
Max-Wilhelm Bruker
1cd63375ba ignore unregistered users fix 2012-04-02 00:14:43 +02:00
Max-Wilhelm Bruker
a319ce3afb fix for rare condition when the game screen would remain white when the game starts 2012-04-01 21:15:13 +02:00
Max-Wilhelm Bruker
40fbbc5982 added size contraints for zone view & scroll bars, fixing issue #34 2012-04-01 14:01:20 +02:00
Max-Wilhelm Bruker
c835a827b0 AlwaysRevealTopCard done, issue #31 fixed 2012-04-01 11:45:01 +02:00
Max-Wilhelm Bruker
840b577f42 complete server-side AlwaysRevealTopCard support, related to issue #31 2012-03-31 22:47:42 +02:00
Max-Wilhelm Bruker
7417236c3a preliminary AlwaysRevealTopCard support related to issue #31, server code cleanup (finally removed getGameState) 2012-03-31 21:47:30 +02:00
Max-Wilhelm Bruker
75bac4a5b9 fixed gameStateKnown bug 2012-03-31 19:07:45 +02:00
Max-Wilhelm Bruker
cdda3f15a0 added option to ignore unregistered users in chat; switched UserList data storage to QMap to speed up lookups; issue #28 fixed 2012-03-31 15:06:47 +02:00
Max-Wilhelm Bruker
ff632911f2 don't use QSortFilterProxyModel in TabDeckStorage and TabReplays unnecessarily 2012-03-31 13:28:04 +02:00
Max-Wilhelm Bruker
13b992cf12 show ban duration in client 2012-03-31 12:07:25 +02:00
Max-Wilhelm Bruker
78d188c462 minor visual improvements, German translation update 2012-03-30 21:44:28 +02:00
Max-Wilhelm Bruker
212c58f99a check 'show unavailable games' by default in ShowGamesOfUser dialog 2012-03-30 21:22:47 +02:00
Max-Wilhelm Bruker
6b14b4e543 added game filter dialog in GameSelector; switched all dialogs to QDialogButtonBox; issue #32 fixed 2012-03-30 21:09:35 +02:00
Max-Wilhelm Bruker
facfc3cc52 added more filter options to GamesProxyModel, user interface still missing (related to issue #32) 2012-03-28 23:52:21 +02:00
Max-Wilhelm Bruker
deaebddb0b don't show 'no password for spectators' when spectating is disallowed, fixing issue #26 2012-03-28 21:09:01 +02:00
Max-Wilhelm Bruker
b2b7242802 changed lock icon, added sideboard locking, issue #15 fixed 2012-03-27 20:32:24 +02:00
Max-Wilhelm Bruker
0b51af888c Don't close the game tab immediately when kicked out of a game. Fixes bug #25 2012-03-26 19:32:27 +02:00
Max-Wilhelm Bruker
d251078feb fixed user list bug in threaded client, fixed buddy list crash in server 2012-03-26 00:54:44 +02:00
Max-Wilhelm Bruker
fd5be3d525 added option --debug-output to redirect client output to file 2012-03-25 19:48:50 +02:00
Max-Wilhelm Bruker
40d2b57de9 crash fix 2012-03-25 17:16:42 +02:00
Max-Wilhelm Bruker
eced4e2340 merge 2012-03-25 17:06:48 +02:00
Max-Wilhelm Bruker
1224eae1c0 added button to test custom translation file 2012-03-25 17:02:52 +02:00
Max-Wilhelm Bruker
95dd3fc04c added credits for Swedish translation 2012-03-25 16:40:54 +02:00
Max-Wilhelm Bruker
7833363501 Merge branch 'master' of github.com:mbruker/Cockatrice 2012-03-25 15:48:57 +02:00
Max-Wilhelm Bruker
9a34d7b929 translation update, included stub for Swedish 2012-03-25 15:48:29 +02:00
Max-Wilhelm Bruker
3b70ad8c66 minor fixes wrt commit 4e4a7563db 2012-03-25 14:41:52 +02:00
Max-Wilhelm Bruker
4e4a7563db The remote client now runs in an extra thread, fixing issue #29 2012-03-25 13:19:40 +02:00
Max-Wilhelm Bruker
542fd2c5c8 added menu item: game->game information, issue #1 fixed 2012-03-24 22:09:06 +01:00
Max-Wilhelm Bruker
5ff1fd8ec6 added peeking at facedown cards, fixing issue #7 2012-03-24 18:52:08 +01:00
Max-Wilhelm Bruker
662df6d972 Merge branch 'devel' of git://github.com/mbruker/Cockatrice into devel 2012-03-24 17:50:29 +01:00
Max-Wilhelm Bruker
adbb607700 Revealing a library to a player now grants that player permission to drag cards out of that library onto his own table. This permission is revoked by shuffling the library. The zone view window tracks content changes of the zone for as long as the permission lasts so that card ID changes are kept track of. This hopefully fixes issues #5 and #12. 2012-03-24 17:48:25 +01:00
Max-Wilhelm Bruker
10d958c4ce Merge branch 'master' into devel 2012-03-23 12:18:16 +01:00
Max-Wilhelm Bruker
c92f3e4239 fix for issue #17: oracle: convert smart quotes to normal quotes in card names 2012-03-23 12:17:59 +01:00
Max-Wilhelm Bruker
c9a8429044 always get next game/replay id from database to avoid id collisions in multi-server mode 2012-03-17 23:01:56 +01:00
Max-Wilhelm Bruker
671214c60e mutex fixes, server shutdown works again 2012-03-17 19:05:22 +01:00
Max-Wilhelm Bruker
9e1ee50081 Merge branch 'devel' of git://github.com/mbruker/Cockatrice into devel 2012-03-17 17:08:19 +01:00
Max-Wilhelm Bruker
2259204890 cleaned up PictureLoader thread 2012-03-17 17:07:48 +01:00
Max-Wilhelm Bruker
61b351aa9f fixed client crash that occurred when the game ended with a card tap/untap animation running 2012-03-11 11:26:07 +01:00
Max-Wilhelm Bruker
76c7d96310 CardInfoWidget as popup now has a card size related to the screen size 2012-03-10 23:26:35 +01:00
Max-Wilhelm Bruker
b0378544c4 added icon for expiration lock button, added close button to replay tab, minor GUI fixes 2012-03-04 12:05:28 +01:00
Max-Wilhelm Bruker
acb03c2bf2 replays expire after two weeks, lock can be toggled to prevent that 2012-03-04 11:35:56 +01:00
Max-Wilhelm Bruker
a876a0bf5f tell logged in clients about new replays 2012-03-03 18:10:16 +01:00
Max-Wilhelm Bruker
2487476fcc added checkbox to disable password storage 2012-03-03 15:54:50 +01:00
Max-Wilhelm Bruker
8481e61e8f Replays split up, one for each subgame 2012-03-02 20:45:04 +01:00
Max-Wilhelm Bruker
4dc712286f preliminary client-side replay watching code 2012-02-26 16:35:34 +01:00
Max-Wilhelm Bruker
c6c6a970c6 interface & client tab for replay transfer 2012-02-25 19:33:44 +01:00
Max-Wilhelm Bruker
89bb8e72ee use 'git describe' to generate version info for the about box and servatrice. fixes issue #20 2012-02-21 01:08:16 +01:00
Max-Wilhelm Bruker
a1bcd9854f preliminary client-side replay support, works in principle 2012-02-21 00:09:03 +01:00
Max-Wilhelm Bruker
d50d179b2f server-side replay support 2012-02-20 22:13:48 +01:00
Max-Wilhelm Bruker
7cec442694 setDoesntUntap fixed, card menu moved to player to avoid unnecessary allocation of QActions 2012-02-20 17:26:46 +01:00
Max-Wilhelm Bruker
8af0f01db8 CardInfoWidget fix 2012-02-20 12:53:33 +01:00
Max-Wilhelm Bruker
a0655e083f hq picture fix 2012-02-16 21:13:01 +01:00
Max-Wilhelm Bruker
5692addf54 don't send useless information in getGameState; fixed bug that caused an attached card to have undefined coordinates when its parent card was destroyed by conceding or leaving 2012-01-30 00:21:47 +01:00
a b
7faa033855 Mac fixes 2012-01-29 21:17:32 +01:00
Max-Wilhelm Bruker
8824cd7e84 Merge ../cockmerge 2012-01-29 17:15:05 +01:00
Max-Wilhelm Bruker
5182820964 merged from master 2012-01-29 17:14:59 +01:00
mbruker
332ca29d62 Merge pull request #4 from Daenyth/show-unjoinable-checkbox 
Change "Show full" "Show running" checkboxes to a single box
 2012-01-29 08:02:06 -08:00
Max-Wilhelm Bruker
f622a41e7a cleaner implementation of loyalty display criterium 2012-01-29 17:00:57 +01:00
Max-Wilhelm Bruker
ccfdc0a084 Merge branch 'master' of git://github.com/mbruker/Cockatrice 2012-01-29 16:56:50 +01:00
Max-Wilhelm Bruker
4895f2b4fd server code cleanup, changed in-game ping event to not use any bandwidth as long as nothing changes 2012-01-29 13:36:43 +01:00
Max-Wilhelm Bruker
a64df4a0f5 Use QDesktopServices::StandardLocation for platform independent default paths that don't touch the application's own folder 2012-01-22 14:18:28 +01:00
Max-Wilhelm Bruker
3c24899de6 switched from qmake to cmake 2012-01-21 19:21:57 +01:00
Max-Wilhelm Bruker
16541141bd Cleaned up decklist code 2012-01-21 16:41:46 +01:00
Max-Wilhelm Bruker
ab11a40863 ARM compile fix, reported by Jeff Hoogland 2012-01-15 12:15:20 +01:00
Max-Wilhelm Bruker
7c2c6eac14 changed creation_time to time_t to get around Qt4.7 dependency 2012-01-03 01:13:15 +01:00
Max-Wilhelm Bruker
609e3fc41d converted SetCardAttr attr_name to enum 2012-01-02 20:20:31 +01:00
Max-Wilhelm Bruker
4634787b00 converted some Player commands to command lists; added db type checks in server 2012-01-02 19:41:37 +01:00
Max-Wilhelm Bruker
0c9a2b061c deck storage is fully working again, cleaned up some unnecessarily large messages 2012-01-02 15:46:14 +01:00
Max-Wilhelm Bruker
d4aaf9fff5 minor cleanups, server-side deck storage code is working again 2012-01-02 00:11:33 +01:00
Max-Wilhelm Bruker
eabe3511cb compile fix 2012-01-01 20:07:54 +01:00
Max-Wilhelm Bruker
ff3eb9b5f4 display reason for ban to banned user 2012-01-01 19:38:52 +01:00
Max-Wilhelm Bruker
6344b987de fixed pw loyalty in oracle, PB code working 2012-01-01 18:15:32 +01:00
Max-Wilhelm Bruker
d5c628966f PB: everything compiles except for deck storage 2012-01-01 02:48:24 +01:00
Max-Wilhelm Bruker
695fde7541 PB: enough for today 2011-12-31 00:12:46 +01:00
Max-Wilhelm Bruker
c4eb7ba6cf PB: more client files compile 2011-12-30 22:29:57 +01:00
Max-Wilhelm Bruker
d3b96b1a88 PB: server compiles again, standalone RemoteClient is able to log in 2011-12-30 21:50:25 +01:00
Daenyth
1dd7695e9a Make games created reg-only by default. 2011-12-28 23:47:30 -05:00
Daenyth
edde8bec07 Add Planeswalker loyalty to CardInfoWidget 
CIW will also dynamically hide/show power/toughness as well as loyalty.
 2011-12-28 23:47:29 -05:00
Daenyth
0c1b6dd9c3 Merge remote-tracking branch 'upstream/master' into show-unjoinable-checkbox 2011-12-20 21:48:30 -05:00
Max-Wilhelm Bruker
c5509db251 reasonable defaults 2011-12-19 00:03:05 +01:00
Max-Wilhelm Bruker
f115342e47 local mode is working again 2011-12-18 23:30:53 +01:00
Max-Wilhelm Bruker
38e4781624 fixed packet length calculation bug, re-enabled deck selection 2011-12-18 19:10:47 +01:00
Max-Wilhelm Bruker
314f17091d protobuf client->server communication almost working 2011-12-18 18:35:14 +01:00
Daenyth
6b7da3223a Fix NPE in GameSelector::GameSelector when called from UserList::gamesOfUserReceived 2011-12-07 23:37:04 -05:00
Daenyth
86ae8a47a8 Rename 'unjoinable' games to 'unavailable' 2011-12-04 12:25:51 -05:00
Daenyth
edd429d874 Filter registered-only games as unavailable when user isn't regged 2011-12-04 12:16:19 -05:00
Max-Wilhelm Bruker
ca3a7e69a1 stop card tap/untap animation in CardItem::resetState() to avoid unfinished animation during zone change 2011-12-04 14:51:24 +01:00
Max-Wilhelm Bruker
1455c093cc store sessions in database 2011-12-04 13:36:53 +01:00
Daenyth
eebc615c1c Change "Show full" "Show running" checkboxes to a single box 
IMO these should not have been split
 2011-12-03 23:13:27 -05:00
Daenyth
a7f3ce4050 Add code support for planeswalker loyalty. 
Added to CardInfo object and to the oracle importer. Next step is the
card info widget.
 2011-12-03 17:15:33 -05:00
Max-Wilhelm Bruker
e3c1ad2da6 Qt 4.6 compile fix 2011-11-26 15:45:29 +01:00
Max-Wilhelm Bruker
cef4fb11f3 maximize card pics in card info 2011-11-26 14:57:31 +01:00
Max-Wilhelm Bruker
7611bdd7cb Merge branch 'master' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-11-17 21:44:24 +01:00
Max-Wilhelm Bruker
7efee472ed face down dragging fixed, minor french translation fix 2011-11-17 21:43:32 +01:00
brukie
fb3d74c139 mac fixes 2011-11-17 11:09:44 -09:00
Max-Wilhelm Bruker
c7ef61f750 moderators can override game restrictions and kick players when spectating; game host privileges shift when host leaves 2011-11-13 13:13:41 +01:00
Max-Wilhelm Bruker
bca7b6414b hide messages from ignored users in room chat 2011-11-13 11:06:28 +01:00
Max-Wilhelm Bruker
7dc2563390 sets.xml updated; don't try to retrieve empty picture urls 2011-11-12 00:52:04 +01:00
Max-Wilhelm Bruker
632e9bbff3 improved banning and deck hashing 2011-11-01 22:44:51 +01:00
a b
9fe8f6fc03 mac fix 2011-10-27 22:06:52 +02:00
Max-Wilhelm Bruker
1bfa355974 German translation fix, take bottom card via Ctrl+Drag 2011-10-16 12:10:28 +02:00
Max-Wilhelm Bruker
3211801e39 show hand context menu when hand counter is rightclicked 2011-10-16 11:51:06 +02:00
a b
50e85496fa Mac weirdness workaround 2011-10-12 18:53:02 +02:00
unknown
8877bfe71c translation fix 2011-10-10 15:57:22 +02:00
Max-Wilhelm Bruker
5c13b50cf0 zoneView weirdness fix 2011-10-04 20:05:47 +02:00
unknown
0bb4ef8bb8 added deck hashing 2011-10-04 16:55:18 +02:00
a b
c4bd38dbdc Mac fixes 2011-09-27 22:33:45 +02:00
unknown
c316ddb59e crash fix 2011-09-26 16:08:28 +02:00
Max-Wilhelm Bruker
7f06471d36 Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-09-21 21:06:27 +02:00
Max-Wilhelm Bruker
a61558117f qtmultimedia related compile fix (hopefully), adjusted maximum ban duration 2011-09-21 21:06:19 +02:00
unknown
bd4319d8bc client version bump 2011-09-21 15:41:42 +02:00
unknown
da467468d5 improved facedown moving 2011-09-15 14:19:29 +02:00
unknown
1047ab08e8 added facedown to ServerInfo_Card 2011-09-15 12:24:33 +02:00
unknown
972d8e0c9d fixed minor memory leak along with double leave/join messages 2011-09-13 16:45:06 +02:00
unknown
4744cf7d0b hopefully fixed yesterday's fix 2011-09-13 15:34:46 +02:00
unknown
3ed26e11ae fix: don't show conceded players, fix: compute multicolumn layout correctly when dealing with odd number of players 2011-09-12 16:32:55 +02:00
unknown
b001421cfe french translation update 2011-08-25 19:19:08 +02:00
Max-Wilhelm Bruker
b50530dca1 added italian translation stub, sort in-game player list by spectator/player 2011-08-23 20:23:40 +02:00
Max-Wilhelm Bruker
a569a1b8b1 changed chat indentation, allow leftclick for CardInfoWidget in ChatView, changed GameSelector indentation 2011-08-03 01:19:57 +02:00
Max-Wilhelm Bruker
c90b1b6a8e don't hash passwords in the client 2011-08-02 21:57:30 +02:00
Max-Wilhelm Bruker
b2ba83acb1 chat view scrollbar locking fix 2011-08-02 21:49:12 +02:00
Max-Wilhelm Bruker
4f4049fccf ZoneViewZone fix 2011-07-22 22:04:13 +02:00
Max-Wilhelm Bruker
46fdae43cd visual improvements: card hover effect, independent scaling of ZoneViewWidget 2011-07-20 21:25:43 +02:00
Max-Wilhelm Bruker
6b7c5eefd3 Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-07-20 16:18:57 +02:00
Max-Wilhelm Bruker
58ace2fac8 deck editor autoselection 2011-07-20 16:14:56 +02:00
Max-Wilhelm Bruker
c09b0fcba7 CardDragItem fix 2011-07-18 16:29:06 +02:00
Max-Wilhelm Bruker
d2c03496e7 Merge branch 'translation' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-07-18 14:52:27 +02:00
Max-Wilhelm Bruker
7d23569952 locale aware user sorting 2011-07-12 00:51:33 +02:00
Max-Wilhelm Bruker
f10d9c9bec strip newlines from msg in cmdRoomSay; improved i18n in MessageLogWidget 2011-07-06 18:45:56 +02:00
Max-Wilhelm Bruker
b8dca803e7 Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-07-06 01:20:47 +02:00
Max-Wilhelm Bruker
09d0e65d1d more visual improvements 2011-07-05 22:40:03 +02:00
Max-Wilhelm Bruker
fccc91818d chatview improvement 2011-07-05 21:33:03 +02:00
Max-Wilhelm Bruker
add47315d5 added drawArrow context menu item 2011-07-05 21:02:24 +02:00
Max-Wilhelm Bruker
ef42c7518a added argentina to countries 2011-07-05 12:44:39 +02:00
Max-Wilhelm Bruker
898623f1ba filter running games; minor server code cleanup 2011-07-03 16:45:52 +02:00
Max-Wilhelm Bruker
9727a38956 added missing files 2011-07-02 16:44:12 +02:00
Max-Wilhelm Bruker
abd5425796 finished getGamesOfUser function 2011-07-02 16:43:19 +02:00
Max-Wilhelm Bruker
d5de76ec4a Merge branch 'master' of ssh://129.217.164.162/home/brukie/cockatrice 2011-07-02 14:36:36 +02:00
Max-Wilhelm Bruker
be12a0b3a9 preliminary showGamesOfUser support 2011-07-02 14:36:10 +02:00
Max-Wilhelm Bruker
438c26e0c1 DlgCreateGame: max length for description edit 2011-07-02 02:31:05 +02:00
Max-Wilhelm Bruker
a86f6ba5b8 minor change 2011-07-02 02:14:08 +02:00
Max-Wilhelm Bruker
0120d2a019 cardInfoPopup fix; chatView fix 2011-06-28 02:37:49 +02:00
Max-Wilhelm Bruker
d2d06b853f edit field for minimum number of players to allow multi-column layout for 2011-06-27 15:29:17 +02:00
Max-Wilhelm Bruker
7bfa3e6d3a cuckoo 2011-06-25 23:42:16 +02:00
Max-Wilhelm Bruker
05ebb83ba4 improved banning; added [url] and [card] tags for chat 2011-06-25 21:21:19 +02:00
Max-Wilhelm Bruker
4b84168bda client/server version bump; eventConnectionStateChanged 2011-06-25 17:50:28 +02:00
Max-Wilhelm Bruker
d892d320ea dynamic compression support 2011-06-25 15:58:38 +02:00
Max-Wilhelm Bruker
cc795a2dd7 don't call alert() when a message in a public chat is received 2011-06-25 01:26:20 +02:00
Max-Wilhelm Bruker
a4c3d48389 server shutdown function 2011-06-24 18:45:39 +02:00
Max-Wilhelm Bruker
5e3db65846 added deck editor icon 2011-06-22 18:55:03 +02:00
Max-Wilhelm Bruker
b7ab2d97bd support for women 2011-06-22 17:39:25 +02:00
Max-Wilhelm Bruker
009000d130 fixed cz -> cs language code, added slovak translation stub 2011-06-18 12:47:24 +02:00
unknown
31cf3b20be Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-06-18 11:53:33 +02:00
Max-Wilhelm Bruker
f6f5abccca added Czech translation stub 2011-06-18 11:42:32 +02:00
Max-Wilhelm Bruker
4444a0c16c extra files 2011-06-16 16:43:26 +02:00
Max-Wilhelm Bruker
6226e381de price tag feature by Marcio Ribeiro 2011-06-16 16:43:01 +02:00
Max-Wilhelm Bruker
9f85074ca3 colon after sender name in chat view 2011-06-13 22:47:14 +02:00
Max-Wilhelm Bruker
a3b7ed719f QSplitter in TabRoom 2011-06-13 20:04:10 +02:00
Max-Wilhelm Bruker
9cfe4bea59 CardInfoWidget improvement by Absinthe and Hellkeepa 2011-06-13 19:15:12 +02:00
unknown
1bc05562cc Mulligan crash fix, multi-column screen alignment for multiplayer, Server Win32 compile fix 2011-06-05 19:45:37 +02:00
Max-Wilhelm Bruker
caf39bc7d3 fixed CardInfoWidget weirdness 2011-05-30 23:33:21 +02:00
Max-Wilhelm Bruker
7cd4cef9d3 banning bug fixed 2011-05-30 16:15:01 +02:00
Max-Wilhelm Bruker
15ca28bf37 hopefully fixed CardInfoPopup freeze 2011-05-30 15:54:33 +02:00
Max-Wilhelm Bruker
04a96be84a fixed doesntUntap bug (with protocol change) 2011-05-27 21:56:16 +02:00
Max-Wilhelm Bruker
808d2a3c01 Event context for mulligans, German translation 2011-05-21 23:48:46 +02:00
Max-Wilhelm Bruker
0c1c0fcb56 added sound engine files 2011-05-21 23:03:51 +02:00
Max-Wilhelm Bruker
c67bc65762 preliminary sound support 2011-05-21 22:55:08 +02:00
Max-Wilhelm Bruker
461a62e0c8 LocalServer crash fix 2011-05-08 17:56:52 +02:00
Max-Wilhelm Bruker
38b31681e2 changed leave game shortcut, server cleanups, added max_games_per_user 2011-04-21 01:52:09 +02:00
Max-Wilhelm Bruker
e978624e3f added esc as leave game shortcut 2011-04-18 19:16:18 +02:00
Max-Wilhelm Bruker
e6fc20114e deck editor and picture file name fixes 2011-04-18 02:00:48 +02:00
Max-Wilhelm Bruker
0ea8375a2f close buttons for tabs 2011-04-17 17:23:44 +02:00
Max-Wilhelm Bruker
2d8b12a576 reduced game selector minimum height; server race conditions fixed 2011-04-17 15:46:47 +02:00
Max-Wilhelm Bruker
091a2ed6b2 server version bump; hashed password transmission; updated servatrice.sql 2011-04-06 17:37:33 +02:00
Max-Wilhelm Bruker
42ad959220 Merge branch 'master' into experimental 2011-04-06 15:49:20 +02:00
Max-Wilhelm Bruker
5f46b5cd41 game tab: added splitter for manual size control of text boxes 2011-04-06 15:49:03 +02:00
Max-Wilhelm Bruker
45c65c59dc selectzone fix 2011-04-05 18:05:26 +02:00
Max-Wilhelm Bruker
eca941201d more mutexes 2011-03-22 22:46:15 +01:00
Max-Wilhelm Bruker
a947cac585 case insensitive game sorting 2011-03-19 21:19:16 +01:00
Max-Wilhelm Bruker
c4efa8f1aa performance improvement 2011-03-09 19:51:49 +01:00
Max-Wilhelm Bruker
349a60fb58 concede fix 2011-03-09 15:46:33 +01:00
Max-Wilhelm Bruker
ac46edd790 geometry update fix 2011-03-09 15:32:56 +01:00
Max-Wilhelm Bruker
bfce7509c1 added Arnaud Faes to translators, updated french translation 2011-03-09 03:35:26 +01:00
Max-Wilhelm Bruker
dda5429618 updated french translation; set counter dialog allows negative values 2011-03-08 23:22:40 +01:00
Max-Wilhelm Bruker
af8e498ab2 readjusted position of 'move to' menu in card context menu; fixed logMoveCard 2011-03-07 19:11:06 +01:00
Max-Wilhelm Bruker
64c3c0984e minor performance improvements, removed explicit font size setting 2011-03-07 18:50:06 +01:00
Max-Wilhelm Bruker
7038166d8f Changed name of jp translator; fixed game scene rearrange bug 2011-03-06 17:44:59 +01:00
Max-Wilhelm Bruker
87933ba82d fix 2011-03-03 18:03:54 +01:00
Max-Wilhelm Bruker
50de655261 german translation updated; no buddy/ignore list for unregistered users 2011-03-03 17:36:11 +01:00
Max-Wilhelm Bruker
731dfcad5c kick users out of games 2011-03-03 17:05:44 +01:00
Max-Wilhelm Bruker
d6083a85c7 improved packet loss handling 2011-03-03 02:09:29 +01:00
Max-Wilhelm Bruker
57f9e2c3b4 user banning 2011-03-03 01:16:13 +01:00
Max-Wilhelm Bruker
3bb1d9a1de force users to log out their unregistered session after logging in with a new registered account 2011-03-02 17:18:44 +01:00
Max-Wilhelm Bruker
1bee788210 don't pm people ignoring you 2011-03-02 16:34:36 +01:00
Max-Wilhelm Bruker
0afdbc7222 more work on buddy&ignore 2011-03-01 21:04:45 +01:00
Max-Wilhelm Bruker
4149f78001 more buddy&ignore code, added missing file 2011-03-01 20:49:36 +01:00
Max-Wilhelm Bruker
9e34c9c985 more buddy list & ignore list code 2011-02-28 20:44:03 +01:00
Max-Wilhelm Bruker
7a7b686e67 fixed crash that occurs when reloading the card database while deck editor or game is running 2011-02-28 18:20:27 +01:00
Max-Wilhelm Bruker
102e246c6d login consistency fix; limit length of user names to 35 2011-02-23 23:46:18 +01:00
Max-Wilhelm Bruker
06fe9eec26 gcc < 4.4 compile fix by Trilkk 2011-02-21 22:25:22 +01:00
Max-Wilhelm Bruker
1151077c1e carddb thread fix; added VG, AE, PCH to sets 2011-02-21 18:18:08 +01:00
Max-Wilhelm Bruker
acac5addd6 initial commit: buddy list, ignore list 2011-02-20 16:47:13 +01:00
Max-Wilhelm Bruker
5e99950e1f also copy deck to selection buffer when saving to clipboard 2011-02-18 19:31:44 +01:00
Max-Wilhelm Bruker
ce80d29f50 improved cipt handling, initial p/t for cards 2011-02-16 20:05:03 +01:00
Max-Wilhelm Bruker
d05603f83b p/t changes 2011-02-16 18:34:46 +01:00
Max-Wilhelm Bruker
713ebece78 server version bump, minor chat view fix 2011-02-15 23:01:24 +01:00
Max-Wilhelm Bruker
d4f600393f minor visual change, server crash fix, multiplayer leave/concede fixes 2011-02-15 22:50:16 +01:00
Max-Wilhelm Bruker
6bdc8914a9 minor bug fix 2011-02-15 19:10:31 +01:00
Max-Wilhelm Bruker
78e5068e39 converted phases toolbar to graphics item 2011-02-12 21:09:33 +01:00
Max-Wilhelm Bruker
4a34c52c8c optionally display card names on cards even if they have a picture 2011-02-11 18:54:55 +01:00
Max-Wilhelm Bruker
8ccde61492 new picture downloader finished 2011-02-11 18:20:17 +01:00
Max-Wilhelm Bruker
3a5fce9613 new autodownloader partially done 2011-02-11 16:05:43 +01:00
Max-Wilhelm Bruker
c20ca2d1e6 added russian to about box, added russian translation by Alexander Davidov 2011-02-09 13:54:51 +01:00
Max-Wilhelm Bruker
fe1c1c2efb Merge branch 'master' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-02-09 13:47:36 +01:00
Max-Wilhelm Bruker
abc5c024b7 translation improvement 2011-02-08 14:50:14 +01:00
Max-Wilhelm Bruker
22e7a1b2ea Merge branch 'master' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-01-31 03:35:23 +01:00
Max-Wilhelm Bruker
4246ab695b improved sideboarding view 2011-01-30 00:22:24 +01:00
Max-Wilhelm Bruker
a1b6f31b17 Merge branch 'master' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-01-28 03:29:41 +01:00
Max-Wilhelm Bruker
b3f96f9490 changed picture download to multiverse id 2011-01-28 03:29:21 +01:00
Max-Wilhelm Bruker
04742f6fb9 implemented game types 2011-01-27 19:13:22 +01:00
Max-Wilhelm Bruker
7116382a96 added 'undo last draw' feature. protocol version bump (12) 2011-01-27 17:49:31 +01:00
Max-Wilhelm Bruker
c203d51f43 chat view performance regression fixed; minor user list fix; added russian translation stub 2011-01-27 16:24:55 +01:00
Max-Wilhelm Bruker
7200b5be0e Merge branch 'master' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-01-26 14:34:34 +01:00
Max-Wilhelm Bruker
970559290b shortcut for viewing sideboard 2011-01-26 14:34:20 +01:00
Max-Wilhelm Bruker
dcf54ae2de fixed card hover event in sideboard screen 2011-01-26 02:43:29 +01:00
Max-Wilhelm Bruker
92e842bb74 fixed direct chat, fixed in-game attachment bugs 2011-01-25 00:12:35 +01:00
Max-Wilhelm Bruker
c39539b73a sort user list in rooms; open links in the news widget in an external browser 2011-01-24 16:36:02 +01:00
Max-Wilhelm Bruker
4d3ec3fc41 french translation updated; version bump 2011-01-23 19:37:46 +01:00
Max-Wilhelm Bruker
f8bd3f8fd3 added server sponsor banner as resource (temporary); adjusted counter padding 2011-01-23 15:58:58 +01:00
Max-Wilhelm Bruker
2e90a85999 nicer looking counters 2011-01-21 21:20:24 +01:00
Max-Wilhelm Bruker
f6849ff02b sideboarding bug fix 2011-01-21 19:20:47 +01:00
Max-Wilhelm Bruker
6cebad2513 Merge branch 'master' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2011-01-21 18:03:28 +01:00
Max-Wilhelm Bruker
6b370ce16b allow controller change even from a different zone 2011-01-21 18:00:01 +01:00
brukie
dc0f21cce4 Threaded picture caching 2011-01-19 00:16:41 +01:00
Max-Wilhelm Bruker
2013ba3460 Translation update 2011-01-15 22:46:45 +01:00
Max-Wilhelm Bruker
72ee0d7bdf code merge 2011-01-15 21:41:16 +01:00
Max-Wilhelm Bruker
9c527fb5aa Click to hide revealed cards; MultiMove function 2011-01-15 21:39:24 +01:00
Max-Wilhelm Bruker
bd9e142d1d added admin tab; server status message update 2011-01-14 16:55:16 +01:00
Max-Wilhelm Bruker
714a0eee50 don't waste bandwidth with spaces or default-value items 2011-01-13 15:02:13 +01:00
Max-Wilhelm Bruker
f07bb38e4a minor fix 2011-01-10 20:39:00 +01:00
Max-Wilhelm Bruker
7f7398de6a user details box 2011-01-10 20:37:34 +01:00
Max-Wilhelm Bruker
09595cc691 phase toolbar visual changes 2011-01-10 03:03:12 +01:00
Max-Wilhelm Bruker
5544de3213 minor fixes; added round clock 2011-01-08 14:22:41 +01:00
Max-Wilhelm Bruker
02f2fb9764 reworked in-game avatar display 2011-01-04 23:16:02 +01:00
Max-Wilhelm Bruker
72223b3229 minor reveal fix 2011-01-04 17:40:18 +01:00
Max-Wilhelm Bruker
509d540167 personal message fix 2011-01-03 22:39:53 +01:00
Max-Wilhelm Bruker
62ccd51f11 minor fix 2011-01-03 21:11:51 +01:00
Max-Wilhelm Bruker
55d493e7ef single player works again, version bump 2011-01-03 20:46:15 +01:00
Max-Wilhelm Bruker
d4222b25c5 about box 2011-01-03 19:12:59 +01:00
Max-Wilhelm Bruker
78d81ae65a room stuff and minor fixes 2011-01-03 19:01:49 +01:00
Max-Wilhelm Bruker
80277ff573 rooms work mostly 2011-01-02 16:13:07 +01:00
Max-Wilhelm Bruker
76a13be3c3 always set DestroyOnZoneChange to true for cloned cards 2010-12-23 23:18:29 +01:00
Max-Wilhelm Bruker
231887367c card menu improvement, change controller support (bug #3) 2010-12-23 19:21:47 +01:00
Max-Wilhelm Bruker
4f9252c65c added error message when deck can't be saved 2010-12-23 00:50:25 +01:00
Max-Wilhelm Bruker
a77dc1ff8c abolished economical layout, improved stacking 2010-12-16 02:07:35 +01:00
Max-Wilhelm Bruker
feb1dac1e1 attach arrow bug fix, improved stacking 2010-12-16 00:42:46 +01:00
Max-Wilhelm Bruker
f94fac80c1 Merge branch 'master' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2010-12-15 20:16:01 +01:00
Max-Wilhelm Bruker
04a3f95173 merge 2010-12-14 20:18:06 +01:00
Max-Wilhelm Bruker
f4962d021e experimental card stacking 2010-12-14 19:26:40 +01:00
Max-Wilhelm Bruker
d23315182a minor attach bug fix 2010-12-14 16:19:39 +01:00
Max-Wilhelm Bruker
99c0a41d18 improved rubber band drag 2010-12-14 04:37:13 +01:00
Max-Wilhelm Bruker
99387861cd client crash fix 2010-12-10 23:32:08 +01:00
Max-Wilhelm Bruker
5cdc3c68b7 Added 'move top card to bottom' 2010-12-10 13:08:38 +01:00
Max-Wilhelm Bruker
21cc0ed8d6 added user level description, fixing bug #36 2010-12-06 16:13:21 +01:00
Max-Wilhelm Bruker
9410ea133a crash fix 2010-12-04 21:01:59 +01:00
Max-Wilhelm Bruker
6e567d5b2f crash fix 2010-12-01 14:56:50 +01:00
Max-Wilhelm Bruker
8bd8b6218e settings dialog bug fix 2010-11-30 23:01:01 +01:00
Max-Wilhelm Bruker
3573f74313 different color scheme for in-game and personal chat 2010-11-16 00:05:10 +01:00
Max-Wilhelm Bruker
0b0bd73db5 Merge branch 'master' of ssh://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2010-11-15 19:23:29 +01:00
Max-Wilhelm Bruker
811e943c00 compile fix 2010-11-15 19:22:48 +01:00
Max-Wilhelm Bruker
46bd5138a7 initial commit for portugese translation 2010-11-15 16:30:35 +01:00
Max-Wilhelm Bruker
bcf92fc510 changed some config defaults, added about box 2010-11-15 16:02:51 +01:00
Max-Wilhelm Bruker
0fdc01f6dd GameScene::event() optimization 2010-11-10 18:27:07 +01:00
Max-Wilhelm Bruker
f7963e713b hide horizontal hand of non-local players 2010-11-10 16:21:27 +01:00
Max-Wilhelm Bruker
a67883ca64 stack arrow bug fix; minor spanish translation fix 2010-11-10 16:08:32 +01:00
Max-Wilhelm Bruker
c8779032c8 minor hover bug fix 2010-11-10 02:04:40 +01:00
Max-Wilhelm Bruker
c4cb0f6354 minor bug fix 2010-11-10 01:31:43 +01:00
Max-Wilhelm Bruker
27d954267c card drag item bug fix + minor visual change 2010-11-09 21:13:39 +01:00
Max-Wilhelm Bruker
179f1fe14b added yellow border to cards being moused over 2010-11-09 19:14:32 +01:00
Max-Wilhelm Bruker
55e7feeebe fix 2010-11-09 17:11:13 +01:00
Max-Wilhelm Bruker
2cf57ad95d Merge branch 'master' of ssh://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2010-11-09 16:19:41 +01:00
Max-Wilhelm Bruker
92d40515f2 changed card hover handling 2010-11-09 16:19:13 +01:00
Max-Wilhelm Bruker
78247ac4b6 lowered default table width 2010-11-05 22:20:20 +01:00
Max-Wilhelm Bruker
f158408747 Merge branch 'master' of ssh://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2010-11-05 21:54:06 +01:00
Max-Wilhelm Bruker
196dd3fed6 changed stack bg color 2010-11-05 21:53:42 +01:00
Max-Wilhelm Bruker
2451c39ef2 fixed player area layout 2010-11-05 16:46:59 +01:00
Max-Wilhelm Bruker
7bff204461 card selection fix 2010-11-05 14:55:29 +01:00
Max-Wilhelm Bruker
315564f567 width calculation bug fix 2010-11-04 00:24:25 +01:00
Max-Wilhelm Bruker
9645d097b4 changed default server hostname 2010-11-03 22:03:34 +01:00
Max-Wilhelm Bruker
b7e97103e2 added zone bg setting for stack 2010-11-03 21:42:08 +01:00
Max-Wilhelm Bruker
82bc4274ae merge fix 2010-11-03 21:35:30 +01:00
Max-Wilhelm Bruker
df5791d318 Introduced stack zone, shrunk table to have higher zoom factor 2010-11-03 21:28:43 +01:00
Max-Wilhelm Bruker
e1380f199e full reveal card support 2010-10-28 18:44:32 +02:00
Max-Wilhelm Bruker
1cd76c2641 preliminary reveal_card support 2010-10-27 22:44:33 +02:00
Max-Wilhelm Bruker
a029994437 removed unnecessary repaint when destroying token 2010-10-27 19:54:48 +02:00
Max-Wilhelm Bruker
51f9f34e8b Change mouse cursor when hovering over card name 2010-10-16 17:33:27 +02:00
Max-Wilhelm Bruker
cf95e5f328 Added card hover + card info widget popup to MessageLogWidget 2010-10-15 19:47:30 +02:00
Max-Wilhelm Bruker
e1ad152f65 now it's really fixed 2010-10-15 18:17:41 +02:00
Max-Wilhelm Bruker
b667e1f60b Merge branch 'master' of ssh://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice 2010-10-15 18:15:50 +02:00
Max-Wilhelm Bruker
b4436f2451 minor oracle improvement 2010-10-15 18:10:58 +02:00
unknown
76512a0870 Text rendering fix 2010-10-15 18:08:59 +02:00
Max-Wilhelm Bruker
dd7f87242a CardItem::setCursor() crash on OSX fixed 2010-10-15 17:07:36 +02:00
Max-Wilhelm Bruker
bc7b48a7aa new table layout with inverted y coordinate 2010-10-14 17:51:36 +02:00
Max-Wilhelm Bruker
2543a5b241 card info widget fix 2010-10-14 16:49:18 +02:00
Max-Wilhelm Bruker
10a92c3e85 foo 2010-10-14 15:51:23 +02:00
Max-Wilhelm Bruker
c2d1f151c4 Minor fixes 2010-10-14 15:50:19 +02:00
Max-Wilhelm Bruker
970da7d214 save minimized state of card info widget in settings 2010-10-13 15:57:49 +02:00
Max-Wilhelm Bruker
a215b3503a Added MTGO-like card info widget, made original info widget hideable 2010-10-13 15:38:32 +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
fbcb34db61 Merge branch 'master' of ssh://cockatrice.de/home/cockgit/cockatrice 2010-10-11 17:46:00 +02:00
Max-Wilhelm Bruker
2f422f5a20 avatar changes 2010-10-11 17:45:52 +02:00
Max-Wilhelm Bruker
8d6a4f4f90 preliminary avatar support 2010-10-10 00:06:05 +02:00
Max-Wilhelm Bruker
b1d8c7bda0 Made QColor wrapper class so that Servatrice will compile without QtGui 2010-10-09 18:50:06 +02:00
Max-Wilhelm Bruker
ee0a010add fixed bug #35 2010-10-09 14:09:36 +02:00
Max-Wilhelm Bruker
5486843605 adjusted angle increment for tap animation 2010-10-09 00:44:11 +02:00
Max-Wilhelm Bruker
db2c2d1b15 card tap/untap animation; misc fixes 2010-10-07 17:18:15 +02:00
Max-Wilhelm Bruker
2928eead39 spectator arrow drag item fix 2010-09-24 13:14:29 +02:00
Max-Wilhelm Bruker
e92840c849 moved call to rng constructor to main() 2010-09-23 15:43:39 +02:00
Max-Wilhelm Bruker
a5d73a9a60 User list sorting fix 2010-09-23 15:11:28 +02:00
Max-Wilhelm Bruker
235d591778 sideboarding crash fix 2010-09-22 16:12:43 +02:00
Max-Wilhelm Bruker
79a3a1a0b4 economic layout bug fix 2010-09-22 14:27:14 +02:00
Max-Wilhelm Bruker
42363840be better user level icons 2010-09-20 19:14:57 +02:00
Max-Wilhelm Bruker
23a0080c45 user level display 2010-09-20 18:52:36 +02:00
Max-Wilhelm Bruker
6642b332f0 extra files 2010-09-18 23:50:07 +02:00
Max-Wilhelm Bruker
e597325ec3 implemented direct chat 2010-09-18 23:47:39 +02:00
Max-Wilhelm Bruker
f9446f9822 generalized user information 2010-09-18 21:05:28 +02:00
Max-Wilhelm Bruker
adaa1d5323 fixed flipCard code 2010-09-17 22:59:13 +02:00
Max-Wilhelm Bruker
04d92048ff crash fix 2010-09-17 17:41:37 +02:00
Max-Wilhelm Bruker
65354fc6e1 removed debug message 2010-09-15 18:52:05 +02:00
Max-Wilhelm Bruker
42e806c57f attach bug fix 2010-09-15 18:51:18 +02:00
Max-Wilhelm Bruker
eff0c0cc24 arrow crash bug fix 2010-09-15 18:45:43 +02:00
Max-Wilhelm Bruker
d7b3764bba added feature: move top cards of library to grave/exile 2010-09-13 20:52:49 +02:00
Max-Wilhelm Bruker
fe9798bf46 Fixed crash when leaving game as spectator 2010-09-13 20:07:47 +02:00
Max-Wilhelm Bruker
3152097084 Qt 4.5 compile fix 2010-09-13 16:35:16 +02:00
Max-Wilhelm Bruker
11e1202dcc Added option to customize the card back picture 2010-09-10 19:30:14 +02:00
Max-Wilhelm Bruker
5ee6bdd338 Translation code fix; updated German translation 2010-09-10 19:12:01 +02:00
Max-Wilhelm Bruker
e09060faca Fixed automatic table resize. This fixes bug #0000023. 2010-09-09 09:54:35 +02:00
Max-Wilhelm Bruker
daf1fa18aa server shouldn't update client ping in local games 2010-09-09 03:41:01 +02:00
Max-Wilhelm Bruker
62bf2572a9 Crash fixes (bug #0000006). Also cleaned up some includes to speed up compilation. 2010-09-08 22:52:04 +02:00
Max-Wilhelm Bruker
8fea71782d arrow crash fix. this fixes bug #0000001 2010-09-08 21:11:30 +02:00
Max-Wilhelm Bruker
a5f678bc3d single player fix 2010-09-08 20:15:34 +02:00
Max-Wilhelm Bruker
c4c1723205 single player improvements 2010-09-07 03:51:48 +02:00
Max-Wilhelm Bruker
82e4f9e19d removed debug command 2010-09-07 02:47:09 +02:00
Max-Wilhelm Bruker
90ffc76730 single player fixes 2010-09-07 02:46:54 +02:00
Max-Wilhelm Bruker
4d0c9962f4 phase toolbar fixed 2010-09-07 02:03:54 +02:00
Max-Wilhelm Bruker
0b98d90337 search function couldn't find colorless cards: fixed 2010-08-27 22:48:35 +02:00
Max-Wilhelm Bruker
5ff099f4bc more code for local playing 2010-08-14 17:01:14 +02:00
Max-Wilhelm Bruker
168d184e8f local playing bugfixes 2010-08-11 04:23:12 +02:00
Max-Wilhelm Bruker
00077565ab minor table layout bugfix 2010-08-11 01:32:52 +02:00
Max-Wilhelm Bruker
58e803c3e7 new files 2010-08-04 13:57:13 +02:00
Max-Wilhelm Bruker
7921b5f82d initial commit of local server code 2010-08-04 13:56:51 +02:00
Max-Wilhelm Bruker
cbfbc542e7 disallow dropping a card onto another 2010-07-17 23:37:22 +02:00
Milton Goncalves
b38f5b6bb9 Merge branch 'translation' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice into translation 2011-07-12 00:27:45 +01:00
Max-Wilhelm Bruker
abd2b4bdf8 use deck name as default file name for saving 2011-05-05 18:00:19 +02:00
Max-Wilhelm Bruker
f727b74739 uploaded decks use filename by default 2011-05-05 17:42:33 +02:00
Max-Wilhelm Bruker
1b286973dd crash fix; weird behaviour fix 2010-07-17 19:22:50 +02:00
Max-Wilhelm Bruker
614f106304 arrows can target players; card attachment works 2010-07-17 18:24:14 +02:00
Max-Wilhelm Bruker
61b82bd6f9 arrows can target players now 2010-06-27 17:56:09 +02:00
Max-Wilhelm Bruker
cbf201ed9b optionally destroy tokens on zone change; added multi arrows; card menu changes; arrow fixes; initial commit for attachCard code 2010-06-27 14:50:51 +02:00
Max-Wilhelm Bruker
9a44413e16 Merge branch 'foo' 2010-06-19 18:20:16 +02:00
Max-Wilhelm Bruker
4f13c01e12 mac patches 2010-06-19 18:18:04 +02:00
Max-Wilhelm Bruker
50ae101fd7 crash fix 2010-06-19 14:34:25 +02:00
Max-Wilhelm Bruker
ae41194e4b forgot to add some files :) 2010-06-18 21:15:19 +02:00
Max-Wilhelm Bruker
49e3563386 improved token dialog 2010-06-18 21:04:28 +02:00
Max-Wilhelm Bruker
62a9003d3e server has to assign free table space for a new card so that there is no race condition 2010-06-18 19:57:06 +02:00
Max-Wilhelm Bruker
9f79bd2c8e nicer looking counters on cards 2010-06-17 21:54:05 +02:00
Max-Wilhelm Bruker
f33abf14ca proper pixmap caching for hand counter 2010-06-17 20:24:11 +02:00
Max-Wilhelm Bruker
df7bcf179d set p/t, set annotation, multiple counters per card 2010-06-17 20:13:27 +02:00
Max-Wilhelm Bruker
7553251baf table width bugfix 2010-06-08 16:39:35 +02:00
Max-Wilhelm Bruker
579628b4c4 save deck to clipboard 2010-06-06 16:06:38 +02:00
Max-Wilhelm Bruker
37de620e93 deck view lock bug fix 2010-06-05 15:26:26 +02:00
Max-Wilhelm Bruker
0d16b3fa95 start game bugfix 2010-06-05 01:37:14 +02:00
Max-Wilhelm Bruker
e0c1932373 close feature request 0000018 2010-06-03 17:46:27 +02:00
Max-Wilhelm Bruker
41c4603fe9 This closes feature request 0000020. Attention, this breaks protocol compatibility. 2010-06-03 02:29:48 +02:00
Max-Wilhelm Bruker
cfd715cce9 nicer looking active player display 2010-05-29 18:36:59 +02:00
Max-Wilhelm Bruker
f2092b89e9 correct mirroring of players when spectating 2010-05-29 17:31:16 +02:00
Max-Wilhelm Bruker
e1a728328e Merge branch 'master' of ssh://cockatrice.de/home/cockgit/cockatrice 
Conflicts:
	cockatrice/cockatrice.pro
	cockatrice/src/player.cpp
 2010-05-29 16:42:14 +02:00
Max-Wilhelm Bruker
aaf236d0b4 hand counter 2010-05-29 16:37:41 +02:00
Max-Wilhelm Bruker
ac15d1b5e8 spectator leave bugfix 2010-05-28 16:47:08 +02:00
Max-Wilhelm Bruker
ca12aeb5a7 load deck from clipboard; closing feature request 0000019 2010-05-28 16:41:59 +02:00
Max-Wilhelm Bruker
e6e20cb048 optional setting for horizonal hand display 2010-05-27 17:22:18 +02:00
Max-Wilhelm Bruker
befafa28ae Fixed elevation of spectator rights; added some spectator options; closes bug 0000005 2010-05-26 21:36:54 +02:00
Max-Wilhelm Bruker
40fc77c646 oracle importer changes 2010-05-08 23:24:35 +02:00
Max-Wilhelm Bruker
03132e2edd app icons for mac and windows 2010-05-08 17:15:40 +02:00
Max-Wilhelm Bruker
bda9768b1d qt 4.5 compile fix 2010-04-21 22:41:52 +02:00
Max-Wilhelm Bruker
cb045907cb minor fixes; ROE set added 2010-04-16 16:15:27 +02:00
Max-Wilhelm Bruker
57aa30ffb5 Merge branch 'master' of ssh://cockatrice.de/home/cockgit/cockatrice 2010-04-08 17:18:24 +02:00
Max-Wilhelm Bruker
91a74abca8 rewrote picture downloader 2010-04-08 17:18:13 +02:00
Max-Wilhelm Bruker
e3021d2c5c minor qt 4.5 fix 2010-04-04 13:25:19 +02:00
Max-Wilhelm Bruker
7afb866961 confirmation dialog when closing main window with open games 2010-04-01 15:54:51 +02:00
Max-Wilhelm Bruker
266e7376db minor arrow fix 2010-03-10 16:42:49 +01:00
Max-Wilhelm Bruker
cb74c734f2 cleanup 2010-03-09 17:53:34 +01:00
Max-Wilhelm Bruker
929f4f9b4d cleanup 2010-03-09 14:43:06 +01:00
Max-Wilhelm Bruker
15aa6a600a crash fix 2010-03-09 14:12:15 +01:00
Max-Wilhelm Bruker
f06af8be43 new icon 2010-03-08 21:24:41 +01:00
Max-Wilhelm Bruker
4bf4bbea6a some fixes 2010-03-08 20:17:48 +01:00
Max-Wilhelm Bruker
d1a8b6602b arrow fix 2010-03-08 16:36:00 +01:00
Max-Wilhelm Bruker
26a77d9e40 new zone view code 2010-03-08 15:55:35 +01:00
Max-Wilhelm Bruker
8295b49634 trying to get rid of ZoneViewLayout 2010-03-06 23:37:49 +01:00
Max-Wilhelm Bruker
e9a0203880 make more use of SettingsCache 2010-03-06 23:02:45 +01:00
Max-Wilhelm Bruker
2c9a8c2b57 minor cleanups and optimizations 2010-03-06 22:10:50 +01:00
Max-Wilhelm Bruker
b2f83541e7 Initial commit for sideboarding. It's supposed to be fully functional. 2010-03-06 17:17:54 +01:00
Max-Wilhelm Bruker
2ee4bb834d minor translation fix; new shortcut 2010-03-05 17:54:21 +01:00
Max-Wilhelm Bruker
30df81c518 bla 2010-03-05 17:48:36 +01:00
Max-Wilhelm Bruker
0db3ff6819 updated icon; small bugfix 2010-03-04 17:39:38 +01:00
Max-Wilhelm Bruker
0c508f63ec removed some useless game events in favor of event context classes; added some preliminary icons 2010-03-03 18:20:46 +01:00
Max-Wilhelm Bruker
388e9255c7 cipt code 2010-03-01 21:19:20 +01:00
Max-Wilhelm Bruker
888a64b0fd new protocol code 2010-02-26 17:28:02 +01:00
Max-Wilhelm Bruker
ba8d40211c Almost full Qt 4.6 compatibility. Sorry it took so long. 2010-02-24 18:21:48 +01:00
Max-Wilhelm Bruker
89fe7d2d69 more beautiful arrows; fixed server bug regarding facedown cards 2010-02-24 14:43:18 +01:00
Max-Wilhelm Bruker
2d57715a6e minor improvement 2010-02-05 16:33:12 +01:00
Max-Wilhelm Bruker
70594387de tab modified indicator 2010-02-05 13:36:00 +01:00
Max-Wilhelm Bruker
3d5ba34aaf translation fix; minor improvement 2010-02-04 16:25:38 +01:00
Max-Wilhelm Bruker
9c4264b491 fixed server crash bug 2010-01-18 13:11:18 +01:00
Max-Wilhelm Bruker
ddd58d6736 crash fix 2009-12-21 15:23:22 +01:00
Max-Wilhelm Bruker
405a247c2c updated german translation 2009-12-20 16:55:19 +01:00
Max-Wilhelm Bruker
42531d90e9 initial commit for card search dialog 2009-12-20 16:39:26 +01:00
Max-Wilhelm Bruker
324be6b40c reverted card search to initial behaviour 2009-12-20 15:17:45 +01:00
Max-Wilhelm Bruker
ffe85962b8 reverted deck editor column resizing 2009-12-20 14:24:52 +01:00
Max-Wilhelm Bruker
06de6b1a6c some minor bug fixes; disallow deck storage commands to unauthenticated users 2009-12-19 22:40:34 +01: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
d23ece59ea crash fixes; move_card fixes 2009-12-18 19:03:02 +01:00
Max-Wilhelm Bruker
2aa5c7eb3c bugfix 2009-12-15 17:19:49 +01:00
Max-Wilhelm Bruker
564ae4db84 some cleanups and fixes 2009-12-15 16:48:14 +01:00
Max-Wilhelm Bruker
6ba2e98315 game view should not get keyboard focus 2009-12-09 16:17:53 +01:00
Max-Wilhelm Bruker
86cd3ec5be eventMoveCard related bug fix 2009-12-08 01:03:10 +01:00
Max-Wilhelm Bruker
0603b3dafd sanity checks; server crash fix 2009-12-08 00:46:38 +01:00
Max-Wilhelm Bruker
a8e9501dad bug fix 2009-12-07 23:09:52 +01:00
Max-Wilhelm Bruker
bda7ec2186 card menu re-added 2009-12-06 17:23:41 +01:00
Max-Wilhelm Bruker
bf92ef87da new server deck folder display 2009-12-03 18:43:43 +01:00
Max-Wilhelm Bruker
fb61b442ca some (but not all) compatibility changes for qt 4.6 2009-12-02 22:48:19 +01:00
Max-Wilhelm Bruker
78c1851c52 implemented conceding 2009-12-01 17:26:42 +01:00
Max-Wilhelm Bruker
207d10d3e2 XML fix 2009-12-01 10:43:46 +01:00
Max-Wilhelm Bruker
59e9416f57 blah 2009-11-30 19:33:45 +01:00
Max-Wilhelm Bruker
55482246dd zone view works 2009-11-29 03:35:55 +01:00
Max-Wilhelm Bruker
694070724c restructured protocol code 2009-11-29 03:07:28 +01:00
Max-Wilhelm Bruker
122f8ea916 game menu 2009-11-28 18:35:48 +01:00
Max-Wilhelm Bruker
77015c9ebf event handling 2009-11-28 00:02:11 +01:00
Max-Wilhelm Bruker
e796af2b89 game is almost playable again 2009-11-26 18:52:53 +01:00
Max-Wilhelm Bruker
0d4717f40b new code 2009-11-25 22:58:20 +01:00
Max-Wilhelm Bruker
6c93b1e9b7 ping time display is working again 2009-11-22 14:41:02 +01:00
Max-Wilhelm Bruker
4fac0e5b5a remote deck loading finished 2009-11-22 14:24:01 +01:00
Max-Wilhelm Bruker
cf21528a69 almost finished pre-game deck loading 2009-11-22 01:30:16 +01:00
Max-Wilhelm Bruker
8dcf81654e decklist transfer code 2009-11-22 00:34:31 +01:00
Max-Wilhelm Bruker
c1d295a98b visual improvements 2009-11-20 15:53:56 +01:00
Max-Wilhelm Bruker
ef46d6e863 deck list storage completed 2009-11-20 15:22:56 +01:00
Max-Wilhelm Bruker
f31405743e initial commit for deck repository tab 2009-11-19 17:12:44 +01:00
Max-Wilhelm Bruker
c5bf72b1bf decklist moved to common 2009-11-18 18:15:16 +01:00
Max-Wilhelm Bruker
fdf921e718 initial commit for improved deck list submission 2009-11-17 17:11:50 +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
77f5ec29eb some gui code 2009-11-16 17:18:13 +01:00
Max-Wilhelm Bruker
ace4c37726 removed some old code 2009-11-13 18:31:27 +01:00
Max-Wilhelm Bruker
64aa68cd26 Chat works! 2009-11-13 18:27:06 +01:00
Max-Wilhelm Bruker
1baa188067 more 2009-11-12 17:32:20 +01:00
Max-Wilhelm Bruker
c46ef255a1 some client code 2009-11-12 17:04:06 +01:00
Max-Wilhelm Bruker
cb0e4d07e4 everything compiles again; enough for today 2009-11-12 00:09:24 +01:00
Max-Wilhelm Bruker
1d6923f2a2 game events 2009-10-26 18:13:30 +01:00
Max-Wilhelm Bruker
3d1052f54c path fix 2009-10-22 18:25:07 +02:00
Max-Wilhelm Bruker
8a919e572f ctrl+r: remove all local arrows 2009-10-21 11:10:21 +02:00
Max-Wilhelm Bruker
897dca2386 arrows: clean all arrows when changing phase; arrow color dependent on modifier keys; remove a single arrow by rightclicking 2009-10-21 11:02:02 +02:00
Max-Wilhelm Bruker
c57e138a78 prepareGeometryChange bugfix; more arrows code 2009-10-20 23:20:07 +02:00
Max-Wilhelm Bruker
4bc76600e8 addCounter bugfix 2009-10-20 01:43:53 +02:00
Max-Wilhelm Bruker
ae39dc7fa1 improved mulligans 2009-10-20 01:33:44 +02:00
Max-Wilhelm Bruker
43d516672a fix typo; don't point from an item to itself 2009-10-19 21:30:58 +02:00
marcus
c86a1ed4f6 fixed bug with mulligan and restart of game 2009-10-19 18:52:53 +02:00
marcus
6049a601fb bug fixed 2009-10-19 17:59:19 +02:00
marcus
5cf970f0f3 Mulligan added to Client 2009-10-19 17:52:42 +02:00
Max-Wilhelm Bruker
30079a71ff card picture fix 2009-10-18 00:57:51 +02:00
Max-Wilhelm Bruker
867a27ecd4 Arrows 2009-10-17 23:55:31 +02:00
Max-Wilhelm Bruker
fd4b388975 prettier ping widget 2009-10-17 20:59:34 +02:00
Max-Wilhelm Bruker
b8690627c8 raised server timeout, added ping widget 2009-10-17 18:29:30 +02:00
Max-Wilhelm Bruker
3c8f2b878b improved importer 2009-10-17 17:13:55 +02:00
Max-Wilhelm Bruker
aae2c437d6 better keyboard editing in deck editor 2009-10-14 11:16:39 +02:00
Max-Wilhelm Bruker
603555af4a prettier tool buttons 2009-10-14 10:56:13 +02:00
marcus
84fc11f69a Deckeditor Icons added 2009-10-13 20:58:56 +02:00
Max-Wilhelm Bruker
df8c01992b fixed card picture download 2009-10-13 14:31:32 +02:00
Max-Wilhelm Bruker
ae6803f9f2 rewrote oracle importer 2009-10-13 01:06:48 +02:00
Max-Wilhelm Bruker
841b91bc89 deck editor improvement 2009-10-12 15:46:45 +02:00
Max-Wilhelm Bruker
9f35340188 bugfix 2009-10-03 02:47:17 +02:00
marcus
ebca375755 ZoneView now floats above cardfield 2009-10-02 12:27:02 +02:00
Max-Wilhelm Bruker
d54d9f0d85 changed counter menu 2009-09-29 17:28:21 +02:00
Max-Wilhelm Bruker
72324f355d fixed moving an entire zone to another 2009-09-29 17:26:30 +02:00
Max-Wilhelm Bruker
adb4edc256 counter fix 2009-09-28 11:09:36 +02:00
Max-Wilhelm Bruker
4186d73c88 crash fix 2009-09-28 11:06:15 +02:00
Max-Wilhelm Bruker
50ae90c148 small bugfix 2009-09-25 22:05:59 +02:00
Max-Wilhelm Bruker
33ccbe3c00 phases toolbar fix; face down fix 2009-09-25 17:17:15 +02:00
Max-Wilhelm Bruker
85319ecc28 counters menu 2009-09-25 16:50:20 +02:00
Max-Wilhelm Bruker
29699418d2 removed some unneeded code, counter appearance changed 2009-09-25 12:56:11 +02:00
Max-Wilhelm Bruker
a543c9b90c final (?) spectator code, small bugfix 2009-09-24 20:12:44 +02:00
Max-Wilhelm Bruker
fa16d86283 small cleanups 2009-09-23 16:00:44 +02:00
Max-Wilhelm Bruker
890740bcc9 protocol changes, menu cleanups, phase button speed improvement 2009-09-21 20:21:11 +02:00
Max-Wilhelm Bruker
ab3858239f more spectator code 2009-09-16 01:40:49 +02:00
Max-Wilhelm Bruker
fcb4316de4 fixed alphabetical sorting 2009-09-14 15:11:32 +02:00
Max-Wilhelm Bruker
224a4969bd some zone view changes going on 2009-09-10 18:28:19 +02:00
Max-Wilhelm Bruker
117a77655b fixed compiler warnings 2009-09-09 17:23:41 +02:00
Max-Wilhelm Bruker
33e47c2653 foo 2009-09-09 16:47:55 +02:00
Max-Wilhelm Bruker
5fa009714b fixed multi-card dragging 2009-09-09 16:46:09 +02:00
Max-Wilhelm Bruker
aa9ebd3179 fixed dynamic table resizing 2009-09-09 15:48:56 +02:00
Max-Wilhelm Bruker
cd13583619 fixed arithmetic error 2009-09-09 12:47:34 +02:00
Max-Wilhelm Bruker
00a2f49c94 some fixes 2009-09-08 22:45:48 +02:00
Max-Wilhelm Bruker
ca07cce5ed debug stuff 2009-09-08 19:41:39 +02:00
Max-Wilhelm Bruker
e75c8370eb GameScene 2009-09-08 17:56:39 +02:00
Max-Wilhelm Bruker
0d774b5d48 table grid improvement, unfinished 2009-09-08 17:56:20 +02:00
Max-Wilhelm Bruker
914261df11 fixed 'toggle tapped' function 2009-09-07 21:37:25 +02:00
Max-Wilhelm Bruker
5fca096252 check if directories exist 2009-09-07 20:45:13 +02:00
Max-Wilhelm Bruker
bd434437ad settings fix, added some zone backgrounds 2009-09-02 14:20:39 +02:00
Max-Wilhelm Bruker
7c06d6d84f zone background textures 2009-09-01 17:22:47 +02:00
marcus
6b2dfd545a added forgotten alert 2009-08-30 20:42:09 +02:00
marcus
f5193edead Window Alerts for messagelogwidget and chatwidget 2009-08-30 20:40:38 +02:00
Max-Wilhelm Bruker
4beb990f38 dynamic pixmap cache update 2009-08-29 20:17:02 +02:00
Max-Wilhelm Bruker
98a04668a0 crash fix, translation fix 2009-08-29 18:53:30 +02:00
Max-Wilhelm Bruker
41807574e9 initial window size 2009-08-29 14:49:49 +02:00
Max-Wilhelm Bruker
0dbc580b8a phases toolbar improvement 2009-08-28 15:28:25 +02:00
Max-Wilhelm Bruker
a5280946c2 language fix 2009-08-27 15:28:19 +02:00
marcus
5b1bf7a1a2 Merge branch 'master' of ssh://marcus@cockatrice.de/home/cockgit/cockatrice 2009-08-24 11:40:11 +02:00
Max-Wilhelm Bruker
74ae1c41fc chat improvements 2009-08-23 17:06:12 +02:00
Max-Wilhelm Bruker
b113b78e7c chat fix 2009-08-23 16:53:51 +02:00
Max-Wilhelm Bruker
5d32bb8bc4 chat code 2009-08-23 16:25:10 +02:00
Max-Wilhelm Bruker
8daa81e462 translation 2009-08-23 14:27:44 +02:00
Max-Wilhelm Bruker
e6a419aa3d chat code 2009-08-23 03:43:09 +02:00
Max-Wilhelm Bruker
120193fb0b fixed shuffling, more chat widget code 2009-08-22 21:57:03 +02:00
Max-Wilhelm Bruker
947cd1736c initial commit for chat channels 2009-08-22 19:34:48 +02:00
marcus
74180b6bc9 hr bug fixed 2009-08-22 17:22:36 +02:00
Max-Wilhelm Bruker
0d84de2384 moved carddraw from game to player; qt 4.4 compilation fix; minor behaviour change 2009-08-22 01:26:35 +02:00
marcus
557aed2ed7 Card colors and P/T 2009-08-22 00:17:19 +02:00
Max-Wilhelm Bruker
6b465540e1 translation fix, shuffle fix 2009-08-20 17:59:15 +02:00
Max-Wilhelm Bruker
cc8de80db8 zoneview improvement 2009-08-19 18:55:21 +02:00
Max-Wilhelm Bruker
ff4b451e55 shortcut fix 2009-08-19 15:00:57 +02:00
Max-Wilhelm Bruker
6f77f7ab3c shortcut fix 2009-08-19 14:48:13 +02:00
Max-Wilhelm Bruker
05f63bb631 phases + small message log fix 2009-08-19 14:26:09 +02:00
Max-Wilhelm Bruker
5f110af562 active player is highlighted 2009-08-18 16:43:39 +02:00
Max-Wilhelm Bruker
1d400e195d phases 2009-08-18 16:16:27 +02:00
Max-Wilhelm Bruker
cb90463530 phase toolbar 2009-08-18 14:51:26 +02:00
marcus
0e4517bf63 Phasestoolbar now uses PhaseButton 2009-08-18 12:23:01 +02:00
marcus
08a5338e9b PhaseButton added 2009-08-18 12:21:37 +02:00
marcus
f238b59935 Added QButtonGroup to Phasetoolbar 2009-08-18 10:36:33 +02:00
Max-Wilhelm Bruker
ef60ed292e automatic picture download is now optional 2009-08-14 15:42:22 +02:00
marcus
d653152bdc changed size of settings dialog 2009-08-14 01:39:20 +02:00
marcus
12a151a0c3 added automatic download of card pictures 2009-08-14 01:21:45 +02:00
Max-Wilhelm Bruker
5bb08be2a4 new icons 2009-08-13 16:48:17 +02:00
Max-Wilhelm Bruker
6a5cb8dd07 phase toolbar 2009-08-13 16:41:41 +02:00
Max-Wilhelm Bruker
534a0b633f added icons 2009-08-13 13:22:00 +02:00
Max-Wilhelm Bruker
17c7dfda41 added files 2009-08-13 12:58:36 +02:00
Max-Wilhelm Bruker
cd6c5108af small changes and initial commit for phases toolbar 2009-08-12 19:27:41 +02:00
Max-Wilhelm Bruker
938825f27b small client bug fix 2009-08-12 16:50:18 +02:00
Max-Wilhelm Bruker
536c77f760 move_card improvement, unfinished 2009-08-11 17:56:09 +02:00
Max-Wilhelm Bruker
565384d083 fix compiler warning 2009-08-11 15:46:39 +02:00
marcus
aaa56acfd1 picURL added to oracleimporter and carddatabase 2009-08-10 23:47:27 +02:00
Max-Wilhelm Bruker
e79b19413a small bugfixes 2009-08-10 16:26:10 +02:00
Max-Wilhelm Bruker
33546c6b74 client and server related crash fixes 2009-08-06 16:51:11 +02:00
Max-Wilhelm Bruker
a2b30dc86f resource fix 2009-08-05 18:25:05 +02:00
Max-Wilhelm Bruker
9ddaf98bcd translation fixes 2009-08-05 17:51:15 +02:00
Max-Wilhelm Bruker
00acf60098 font fix 2009-08-05 17:10:07 +02:00
Max-Wilhelm Bruker
2148005bd1 minor cleanups and log improvements 2009-08-05 16:50:16 +02:00
Max-Wilhelm Bruker
e460ec5d69 Merge branch 'marcus' of ssh://brukie@cockatrice.git.sourceforge.net/gitroot/cockatrice 2009-08-03 16:24:27 +02:00
Max-Wilhelm Bruker
27d25d41ac new carddb generator 2009-08-02 14:55:00 +02:00
Max-Wilhelm Bruker
f33d790822 small changes 2009-08-01 19:10:10 +02:00
Max-Wilhelm Bruker
d6ec869c23 update pixmap cache 2009-08-01 15:48:30 +02:00
marcus
926f1560a6 Icons for Settingsdialog 2009-07-31 02:54:29 +02:00
brukie
dfaa6b1d95 settings dialog 2009-07-28 19:52:15 +02:00
brukie
f703004b6c initial commit for settings dialog, unfinished 2009-07-27 17:55:50 +02:00
Max-Wilhelm Bruker
84f06503c6 Fix for floating point conversion 2009-07-17 21:32:04 +02:00
Max-Wilhelm Bruker
ecc6f7b20f fix for deck list model crash 2009-07-17 21:27:38 +02:00
Max-Wilhelm Bruker
ec73ffc82b flip bugfix 2009-07-12 00:11:45 +02:00
Max-Wilhelm Bruker
3043157a1d bugfix and nicer decklist font 2009-07-11 21:29:47 +02:00
Max-Wilhelm Bruker
2e50822d48 bugfix 2009-07-11 20:18:34 +02:00
Max-Wilhelm Bruker
b12155f59c added tablerow to cardinfo 2009-07-11 18:53:26 +02:00
Max-Wilhelm Bruker
b8bf18801f XML card database 2009-07-11 18:25:19 +02:00
Max-Wilhelm Bruker
a3f6adddc9 improved last commit 2009-07-11 16:22:09 +02:00
Max-Wilhelm Bruker
44c64322d3 doubleclick on cards in hand 2009-07-10 23:06:20 +02:00
Max-Wilhelm Bruker
9749423d62 improved card drag, still unfinished 2009-07-07 16:32:32 +02:00
Max-Wilhelm Bruker
2e0b16e90b small protocol change 2009-07-07 14:49:35 +02:00
Max-Wilhelm Bruker
40d292c4ac really fixed zone view bug 2009-07-02 18:03:23 +02:00
Max-Wilhelm Bruker
f308e9edef fixed svg renderer bug 2009-07-02 17:45:16 +02:00
Max-Wilhelm Bruker
bfa0d9bfa2 fixed zone view bug 2009-07-02 17:42:23 +02:00
Max-Wilhelm Bruker
bf868d5abc fixed deck editor bug 2009-07-02 15:40:44 +02:00
Max-Wilhelm Bruker
7023b95db0 Merge ssh://cockatrice.git.sourceforge.net/gitroot/cockatrice 2009-07-01 16:27:40 +02:00
brukie
be3bd4ae6c enlarged table 2009-07-01 15:37:21 +02:00
Max-Wilhelm Bruker
c3fb56581d small changes 2009-07-01 01:05:52 +02:00
Max-Wilhelm Bruker
9e044ffad0 more intuitive tapping behaviour 2009-06-30 20:50:16 +02:00
Max-Wilhelm Bruker
ae82996c0e made counters look nicer 2009-06-30 01:53:49 +02:00
Max-Wilhelm Bruker
5d40996c0b nice decklist printing 2009-06-27 20:53:24 +02:00
Max-Wilhelm Bruker
c9f680f25f new card back 2009-06-27 00:23:24 +02:00
Max-Wilhelm Bruker
3be0eb916d Merge branch 'master' of ssh://brukie@cockatrice.git.sourceforge.net/gitroot/cockatrice 2009-06-26 23:26:55 +02:00
Max-Wilhelm Bruker
8efe15a201 card back svg 2009-06-26 23:25:51 +02:00
Max-Wilhelm Bruker
64185e1772 Merge branch 'master' of ssh://brukie@cockatrice.git.sourceforge.net/gitroot/cockatrice 2009-06-26 15:25:56 +02:00
Max-Wilhelm Bruker
33cc7a8859 started implementing deck printing 2009-06-26 15:25:32 +02:00
brukie
7f0f6c6212 changed some hotkeys 2009-06-25 13:25:20 +02:00
brukie
6a537979d0 added message shortcuts 2009-06-25 13:12:54 +02:00
Max-Wilhelm Bruker
fb03c5cdbb configurable set priority for card pictures 2009-06-20 20:09:19 +02:00
Max-Wilhelm Bruker
e0d773e4e5 forgot some files 2009-06-20 13:36:07 +02:00
Max-Wilhelm Bruker
c8a2ed9415 some changes 2009-06-20 13:26:36 +02:00
Max-Wilhelm Bruker
9b1adf2dc1 reworked card database 2009-06-20 00:22:50 +02:00
Max-Wilhelm Bruker
be9ac2e061 save/restore login information 2009-06-19 21:19:02 +02:00
brukie
a246a8d561 double click on zones opens zone view 2009-06-17 18:05:17 +02:00
Max-Wilhelm Bruker
04a3d311be improved gameview resizing 2009-06-16 21:42:13 +02:00
brukie
0f272a2f51 improved card dragging 2009-06-16 18:20:29 +02:00
Max-Wilhelm Bruker
dc14a1ef17 foo 2009-06-11 19:13:04 +02:00
Max-Wilhelm Bruker
611544b8cc bounds checking for card movement 2009-06-11 18:51:06 +02:00
Max-Wilhelm Bruker
c00027f988 removed the need to refresh the game list 2009-06-11 17:51:52 +02:00
Max-Wilhelm Bruker
197bf0dc64 bla 2009-06-10 21:39:30 +02:00
Max-Wilhelm Bruker
7f659573bc unimportant changes 2009-06-10 21:17:24 +02:00
Max-Wilhelm Bruker
4054afc759 Merge branch 'master' of ssh://brukie@cockatrice.git.sourceforge.net/gitroot/cockatrice 2009-06-10 20:14:03 +02:00
Max-Wilhelm Bruker
4586f2e1da bla 2009-06-10 20:13:45 +02:00
brukie
05e12636ea cleaned up log widget 2009-06-10 13:11:12 +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
brukie
86097d29b6 foo 2009-06-03 16:39:50 +02:00
brukie
04072b02d1 scaled pixmap cache. major speed improvement 2009-06-03 15:38:21 +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
Max-Wilhelm Bruker
13b6a360d2 minor fixes 2009-05-27 02:33:43 +02:00
Max-Wilhelm Bruker
748d9bb603 cosmetic improvements 2009-05-24 16:07:55 +02:00
Max-Wilhelm Bruker
1e702642a4 deck editor 2009-05-24 02:36:39 +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
bb30012fbb foo 2009-05-23 02:43:28 +02:00
Max-Wilhelm Bruker
175512a2ad nice ellipses :) 2009-05-23 01:58:11 +02:00
brukie
7e13352a95 minor cleanups 2009-05-22 22:32:05 +02:00
Max-Wilhelm Bruker
0ef00dd437 new decklist file format 2009-05-19 21:57:23 +02:00
Max-Wilhelm Bruker
08df264556 servatrice: stub for reveal_card, database changes 2009-04-26 00:03:11 +02:00
Max-Wilhelm Bruker
03847a9b36 fixed socket bug and simplified readClient() 2009-04-21 23:17:01 +02:00
Max-Wilhelm Bruker
16cc20a603 removed thread 2009-04-16 18:27:10 +02:00
Max-Wilhelm Bruker
8680bce5fc ping added 2009-04-15 21:43:12 +02:00
Max-Wilhelm Bruker
99ff7fd15f minor improvements 2009-04-14 19:18:46 +02:00
Max-Wilhelm Bruker
3388804e8f improved counters 2009-04-13 17:54:18 +02:00
Max-Wilhelm Bruker
939ab62273 ZoneView improvements 2009-04-10 16:07:27 +02:00
Max-Wilhelm Bruker
792a400a3d minor improvements 2009-04-08 21:49:16 +02:00
Max-Wilhelm Bruker
a429a4a004 minor changes, implemented 'doesn't untap' and facedown cards 2009-04-07 21:37:57 +02:00
Max-Wilhelm Bruker
e6d6162426 started implementing a simple deck editor 2009-04-04 19:51:23 +02:00
Max-Wilhelm Bruker
46a43aade4 foo 2009-04-04 01:54:36 +02:00
Max-Wilhelm Bruker
46f91f69c4 foo 2009-04-04 01:54:20 +02:00
Max-Wilhelm Bruker
16631712c7 Drag from grave/rfg implemented 2009-04-03 14:50:06 +02:00
Max-Wilhelm Bruker
05e7b42193 foo 2009-03-31 21:59:00 +02:00
Max-Wilhelm Bruker
e3039642ab fixed geometry 2009-03-25 19:08:02 +01:00
Max-Wilhelm Bruker
c70eaedfc5 fixed blurry tapped cards 2009-03-25 19:06:52 +01:00
Max-Wilhelm Bruker
9d6ecbbfdf fixed blurry tapped cards 2009-03-25 18:58:25 +01:00
Max-Wilhelm Bruker
6e94221112 improved appearance 2009-03-25 17:02:44 +01:00
Max-Wilhelm Bruker
8782438fcc renamed playerzone to cardzone 2009-03-25 15:08:36 +01:00
Max-Wilhelm Bruker
141b116528 foo 2009-03-14 00:07:59 +01:00
Max-Wilhelm Bruker
e31cfd32b1 Minor bugfixes 2009-03-14 00:02:22 +01:00
Max-Wilhelm Bruker
a11f93df4d initial commit 2009-03-13 22:50:41 +01:00