Matt Lowe
f0c661a0df
Added seperator
...
Added a separator
2015-01-18 00:33:42 +01:00
Matt Lowe
54a1a28619
Added ratio scaling
...
Previously was adding pixels, rather than using ratios. this was cutting
off cards on higher res screens
2015-01-18 00:18:23 +01:00
Matt Lowe
d59e1f135d
Refactored Chat Settings tab
...
- removed heap alloc
2015-01-17 18:04:06 +01:00
Matt Lowe
d02d3ed521
Refactored Deck Editor tab
...
- removed heap allocation
2015-01-17 17:55:13 +01:00
Matt Lowe
5cf801eb94
Refactored User Interface tab
...
- removed heap allocs
2015-01-17 17:50:04 +01:00
Matt Lowe
a599fa1a63
Removed manual sizing
...
replaced the resize(x, y) to "pack" the widgets. It saves space and
makes the settings tighter.
2015-01-17 17:30:24 +01:00
Matt Lowe
98e84f0d63
Fixed some merge issues
2015-01-17 17:11:14 +01:00
Matt Lowe
4b45ba46f4
Refactored General Settings Tab
...
~ Removed some heap allocs
~ Remaining heap allocs are needed.
~ Unrolled "one line" declarations in header
~ restructured logic in GeneralSettingsPage
Refactored Appearance Tab
- removed some heap allocs
- removed setting of zone view, its not needed here, its configurable in
real time, in game.
2015-01-17 16:59:00 +01:00
Matt Lowe
ece56ff3f2
Added @ back in
...
Added the @ back to the chat, this will help if a user does not have the
newest version of the client.
2015-01-17 15:03:41 +01:00
Matt Lowe
8bc2adb70b
Set focus
...
The line edit now gets focus for faster typing.
2015-01-17 14:53:41 +01:00
Matt Lowe
45112e49b1
Click tag mentions
...
You can now click on a username in the main chat to add a "@username"
tag to the chat. Makes communication with other users using tags faster.
2015-01-17 14:47:16 +01:00
Matt Lowe
49d3ad73d5
Uername block highlighting
...
I was able to find a simple way to achive the block highlighting.
2015-01-17 13:23:30 +01:00
poixen
9b7f488bd7
Merge pull request #559 from poixen/chatnamehighlight
...
Fixed #557
2015-01-17 00:43:49 +01:00
Matt Lowe
e4afd9fa4d
Fixed #557
2015-01-17 00:08:54 +01:00
Fabio Bas
24c6e4a81d
Limit pixmap cache size to 2047MB; fix #555
...
also, fix any invalid values loaded from config
2015-01-16 17:11:38 +01:00
Matt Lowe
aad98756d1
Refactorings
...
+ added comments
+ refactored optimumRect
2015-01-15 23:52:19 +01:00
Gavin Bisesi
8e396cadc2
Merge pull request #554 from poixen/chatsettingstab
...
Updated chat setting tab
2015-01-15 08:39:30 -05:00
Matt Lowe
a794112b1d
Updated chat setting tab
...
+ Renamed "Messages" to "Chat Settings"
+ Moved the chat mentions to this tab
+ Added boarder round macro settings
2015-01-15 00:47:10 +01:00
Matt Lowe
0454f9c24b
Added title for sound settings
2015-01-15 00:01:12 +01:00
Matt Lowe
e4e3a1d2e5
Sorting views
...
+ When viewing a sorted view (like revealing hand, or looking at
library), the cards will now be sorted in columns based on the main card
type.
+ Settings are now saved.
2015-01-14 23:19:22 +01:00
Gavin Bisesi
06ac74ec6b
Merge pull request #546 from ideocl4st/master
...
Added Korean flag and newly added strings' translations
2015-01-14 14:29:39 -05:00
Gavin Bisesi
ce2520d74f
Merge pull request #538 from poixen/settingscleanup
...
Realigned Icons
2015-01-14 07:38:23 -05:00
poixen
8fee9c6c4b
Merge pull request #535 from poixen/chatnamehighlight
...
Chat highlighting when username is mentioned
2015-01-13 19:11:52 +01:00
Matt Lowe
f1a9401416
Changed color
2015-01-13 18:06:49 +01:00
Jaeic Lee
ab2aeee138
Added Korean flag and some translated strings
...
Added translation of some new strings and svg file of South Korean flag.
Flag of South Korea is from
http://commons.wikimedia.org/wiki/File:Flag_of_South_Korea.svg
2015-01-13 13:36:07 +09:00
Gavin Bisesi
2ae9cd2c37
Merge pull request #543 from poixen/clearchat
...
Clear chat
2015-01-12 21:15:55 -05:00
Matt Lowe
2e342361a5
Clear chat
...
Users can now clear the chat in the main lobby. This removes unwanted
text and clears up memory when the client has been open a long time.
2015-01-13 00:39:19 +01:00
Matt Lowe
5452d0ceae
Chat highlighting when mentioned
...
When being mentioned in a post with '@username' you will now see the entry highlighted. This
helps to see when someone is talking to you. It work across the main
chat, in game and in private chat.
2015-01-12 15:15:15 +01:00
Gavin Bisesi
69e6aa355f
Merge pull request #534 from poixen/accountage
...
Added account age to user info window
2015-01-11 21:37:07 -05:00
Matt Lowe
0445e570d7
Realigned Icons
...
+ Moved Icons to the top. You can now see all options.
+ All SVGs now have a background (GO! was missing one).
+ All SVGs now have the same background (General had one of its own)
2015-01-11 11:55:48 +01:00
Matt Lowe
02043ad4f9
Added Account Age
...
+ Added the ability to see the account age of registered users. Changes
are both in server and client. The server will now send back the
registration date along with the user data. The client will then use
this to calculate the account age and display it in the user details
window.
2015-01-11 00:45:12 +01:00
Gavin Bisesi
37a4c0d0e6
Merge pull request #531 from mcallahan/resizing2
...
Resize player names in playerlistwidget properly.
2015-01-07 15:42:03 -05:00
Michael Callahan
eac6e41de7
Resize player names in playerlistwidget properly.
2015-01-06 22:20:45 -07:00
Fabio Bas
2101ed7096
Merge remote-tracking branch 'upstream/master' into pixmap_memory_2nd_attempt
...
Conflicts:
cockatrice/src/dlg_settings.cpp
cockatrice/src/dlg_settings.h
2015-01-05 22:46:12 +01:00
Gavin Bisesi
c98a146746
Merge pull request #520 from mcallahan/always-reveal-top-master-master
...
Reset Always reveal top card when starting a new game.
2015-01-05 16:36:07 -05:00
Gavin Bisesi
fba60c20c0
Merge pull request #523 from kaiserfro/apply-filters-at-start2
...
Apply filters at start
2015-01-05 11:26:54 -05:00
Fabio Bas
2671d6abdc
Merge remote-tracking branch 'upstream/master' into local_scry_and_move
2015-01-05 11:08:11 +01:00
Jeffrey Oliver
4a2a61ef46
Replace the 99 with a const int.
2015-01-04 15:32:29 -08:00
Jeffrey Oliver
8eb0e2dbef
Remove reminder.
2015-01-04 15:31:59 -08:00
Matt Lowe
a1a021c99c
Added timestamps to in game chat
...
+ added time stamps to the in game chat
2015-01-04 18:01:46 +01:00
Jaeic Lee
0e250a7d80
Fixed a non-standard word in Korean Translation
...
Fixed a non-standard word (손패) into the word that is used in official
translation (손)
2015-01-03 11:24:10 +09:00
Jeffrey Oliver
bb317003b4
Save filters after a filter clear.
...
Remove some duplicated code.
2015-01-02 17:23:15 -08:00
Jeffrey Oliver
f01d26bf96
Enable the clear filter button by default.
2015-01-02 17:10:55 -08:00
Jeffrey Oliver
1e78596dfa
Remove unused function.
2015-01-02 17:07:30 -08:00
Jeffrey Oliver
f1803fe879
Remove some debug.
2015-01-02 17:06:30 -08:00
Jeffrey Oliver
b1e5153ea5
Should be a const ptr.
2015-01-02 17:03:17 -08:00
Jeffrey Oliver
dbfbfcc837
WIP: refactor filters to save to persistence from within model.
2015-01-02 15:19:36 -08:00
Jeffrey Oliver
6a4384f903
WIP: Refactor gamesproxymodel to own the persistence layer.
2015-01-02 15:05:33 -08:00
Fabio Bas
0abd1fb299
Rework patch for "move to.." menu; fix "P/T"-related menus
2015-01-02 17:10:19 +01:00
Jaeic Lee
7dc58355c9
Added line breaks in Korean translation
...
Added line breaks in Korean translation for better readability.
2015-01-02 11:35:50 +09:00
Michael Callahan
142b42e095
Reset Always reveal top card when starting a new game.
2015-01-01 09:53:29 -07:00
Jaeic Lee
9c0faf8a9c
Edited Korean Translation
...
Edited several sentences after a third-party review
2015-01-02 01:30:27 +09:00
Jaeic Lee
93d6bfed65
Merge branch 'master' into korean-translation
...
Updating to sync with origin
2015-01-01 23:25:29 +09:00
Jaeic Lee
be973879d0
Added Korean Translation
2015-01-01 22:58:35 +09:00
ctrlaltca
16bbc5e8c0
Merge pull request #516 from mcallahan/compilation-warnings
...
Clean up a small pile of compiler warnings.
2015-01-01 14:32:53 +01:00
Gavin Bisesi
0f1c8c59ac
Merge pull request #508 from Blitzmerker/master
...
Fixes the "Card preview window gets stuck and can't be removed" issue by...
2015-01-01 08:08:29 -05:00
Gavin Bisesi
a6c750668a
Merge pull request #496 from ctrlaltca/set_extinfo
...
Remove branch decoration
2015-01-01 08:07:19 -05:00
Gavin Bisesi
b38cd7833f
Merge pull request #500 from ctrlaltca/translation_fixes
...
Translation fixes
2015-01-01 08:07:06 -05:00
ctrlaltca
37dd99ea5e
Merge pull request #507 from ctrlaltca/osx_plugins_debug
...
Optimize qt plugins installation
2015-01-01 13:56:31 +01:00
Michael Callahan
3a0c86938c
Clean up a small pile of compiler warnings.
2014-12-30 15:54:38 -07:00
Michael Callahan
3c9ddd780e
Better icon packing in PlayerListWidget.
2014-12-30 15:27:21 -07:00
Blitzmerker
6af8a49aae
Fixes the "Card preview window gets stuck and can't be removed" issue by saving the cardname, instead of getting it back from the popup (with possible issues with case sensitivity). Also closes an old popup when a new is created.
2014-12-29 19:00:28 +01:00
Fabio Bas
54ce135e0c
Optimize qt plugins installation
...
* Always install “release” plugins
* install only plugins actually used
2014-12-28 22:21:45 +01:00
Fabio Bas
ea1067189d
Specify the player when triggering a move on a revealed card
...
Fixes #72 , #493
2014-12-27 17:12:21 +01:00
Fabio Bas
dd88476796
Changed parameter name to something more meaningful
2014-12-27 15:02:20 +01:00
Gavin Bisesi
f52935791c
Merge pull request #501 from ctrlaltca/crash_on_exit
...
Fix crash on close #255
2014-12-26 20:05:54 -05:00
Fabio Bas
390a8f1985
Fix #484
...
Missing tooltip
2014-12-26 16:09:56 +01:00
Fabio Bas
15e4c852dd
Fix crash on close #255
2014-12-26 16:03:59 +01:00
Fabio Bas
2d932c68de
Fixed translation for "clear downloaded pictures" button
2014-12-26 14:48:58 +01:00
Fabio Bas
499f148783
Regnerate translations
2014-12-26 14:45:41 +01:00
Fabio Bas
72ba5a1683
Parse header files for translatable strings
...
We previously parsed only .cpp files, but some strings are inlined in
header files.
2014-12-26 14:45:31 +01:00
Fabio Bas
f88621fd97
Use QPixmapCache for card images
...
Drop CardInfo’s own pixmap caches; use QPixmapCache instead.
Use QPixmap references instead of pointers.
Being stored in QPixmapCache, all card images are now subjected to
QPixmapCache’s size limit
2014-12-24 16:18:55 +01:00
Fabio Bas
b96104bed4
Expose QPixmapCache's cache limit size as an user preference
2014-12-24 16:16:34 +01:00
Fabio Bas
a5a92e0a7d
Remove branch decoration
2014-12-18 17:39:07 +01:00
Gavin Bisesi
776d809f2f
Merge pull request #483 from ZeldaZach/how_many_cards
...
How Many Cards
2014-12-09 11:39:40 -05:00
Zach H
b738428941
Adding a way to see how many of each type
2014-12-08 17:18:21 -05:00
Gavin Bisesi
8670bc674f
Merge pull request #471 from ctrlaltca/set_extinfo
...
More sets handling improvements
2014-12-08 10:38:54 -05:00
Zach H
a44b7367be
removing blp pricing
2014-12-05 21:26:41 -05:00
Fabio Bas
9cc8d8b86c
Misc fixes
...
ucfirst(setCode): requires oracle re-run
reorder columns
rename the “short name“ column as “set code“
ensure proper casting for releaseDate and sortKey fields (refs 00a5ed0
)
2014-12-05 08:48:33 +01:00
Fabio Bas
0ba351c955
Add "saved" msgbox
2014-12-04 21:09:50 +01:00
Fabio Bas
00a5ed0b79
Fix compilation with qt <= 5.2
2014-12-04 18:29:06 +01:00
Fabio Bas
2745cb2c62
Removed debug
2014-12-02 14:43:39 +01:00
Fabio Bas
36ed4480c2
Re-added save and restore buttons
2014-12-02 14:38:36 +01:00
Gavin Bisesi
ef8bd60a32
Merge pull request #465 from poixen/urlchat
...
Added more space between chat
2014-12-01 12:45:08 -05:00
Gavin Bisesi
0be45e3969
Merge pull request #463 from poixen/chatlinkunderline
...
Added underline to links in chat
2014-12-01 09:27:42 -05:00
Fabio Bas
e48a815d25
Add move buttons, misc improvements
2014-11-30 21:37:06 +01:00
Matt Lowe
0cb1dde8c8
Added more space between chat
...
Added a couple extra pixels in the chat. Make it look a little less
squished.
Before: http://imgur.com/7U6oe82
After: http://imgur.com/C8gGpDY
2014-11-29 02:49:22 +01:00
Matt Lowe
52cadd75f3
Added underline to links in chat
...
[REVIEW]
Links now have a blue underline to better indicate they are clickable.
Preview: http://imgur.com/gQZEv4I
2014-11-29 01:18:52 +01:00
Gavin Bisesi
9e1f8a0892
Merge pull request #449 from ctrlaltca/set_extinfo
...
Sets handling improvements
2014-11-27 06:13:29 -05:00
Matt Lowe
0f6dc6be6c
Fix for #460
2014-11-27 09:52:27 +01:00
Fabio Bas
c8aeff0b0c
Port #436 to QDateTime
2014-11-26 12:34:26 +01:00
Fabio Bas
2704523c73
Merge branch 'master' into set_extinfo
2014-11-26 11:45:51 +01:00
Gavin Bisesi
f71cfb1240
Merge pull request #436 from mitchellwrosen/master
...
Add 'Start time' column to game list
2014-11-25 09:01:24 -05:00
Gavin Bisesi
19de7cbc03
Merge pull request #428 from woogerboy21/static_reveal_library
...
Don't remove card images from revealed decks
2014-11-25 08:41:08 -05:00
Gavin Bisesi
9d62c578e6
Merge pull request #435 from poixen/bottomdeck
...
Action: Move Bottom Card to Graveyard
2014-11-25 08:40:45 -05:00
Matt Lowe
bbcfe84d08
Added double click/Enter for Server tab
...
Added the same functionality to the server tab
2014-11-23 20:01:09 +01:00
Matt Lowe
9e349d8b88
Added "ENTER" to join a room
...
Can now join a room by highlighting a room and pressing ENTER. Works
nice with arrow navigation.
2014-11-23 00:46:54 +01:00
Matt Lowe
6a44855a5c
Added double click to join a room
...
Can now double click on a room in the lobby to join
2014-11-23 00:36:50 +01:00
Mitchell Rosen
cab37b3945
Capitalize game columns
2014-11-22 00:08:47 -08:00
Mitchell Rosen
03bdbe2c7a
Added '<1m ago'
2014-11-22 00:08:00 -08:00
Mitchell Rosen
0af70883a8
0s-5m displayed as '<5m ago'
2014-11-22 00:06:13 -08:00
Mitchell Rosen
d0969c10c6
Show hours and minutes between 60 and 90 minutes
2014-11-22 00:06:13 -08:00
Mitchell Rosen
da145bdd7b
fix localization in time strings
2014-11-22 00:06:13 -08:00
Mitchell Rosen
7aff20b4ee
Fix the build
2014-11-22 00:06:13 -08:00
Mitchell Rosen
a3dc403f75
Translate, change 'Start time' to 'Game created', add debug log
2014-11-22 00:06:13 -08:00
Mitchell Rosen
93ab9f9691
Add 'Start time' column to game list
2014-11-22 00:06:13 -08:00
ctrlaltca
a28eb053c5
Merge pull request #450 from poixen/ghostcards
...
Added fade to card drag items
2014-11-21 08:24:14 +01:00
Matt Lowe
141d0c7618
Added fade to card drag items
...
[REVIEW]
Added a white mask to cards that are being dragged.
Preview: http://webmup.com/1we4W/
2014-11-21 00:09:38 +01:00
Gavin Bisesi
68bc67cde5
Merge pull request #433 from poixen/scalecards
...
Cards Scale with mouse over action
2014-11-20 16:41:04 -05:00
Fabio Bas
ee3731717c
Fixed button labels
2014-11-20 09:15:58 +01:00
Matt Lowe
916735d613
Merge branch 'master' into newsearchbar
2014-11-19 22:21:43 +01:00
Fabio Bas
f48f386f35
Sets window: implemented save and restore buttons
2014-11-19 22:18:41 +01:00
Fabio Bas
ac43fa23b9
Better handle the TK set used for tokens
...
Let oracle add a basic TK set in cards.xml
Unify all the code previously using the string literal “TK”
2014-11-19 19:44:54 +01:00
Fabio Bas
8542d875d3
Sets dialog: new columns and sorting
...
Added "order key", "set type" and "release date" columns
Use a proxy model to sort the table
made the dialog wider accordingly
2014-11-19 18:09:37 +01:00
Matt Lowe
d467cc8b01
QT_VERSION check now checks for correct version
...
Feature is only included in Qt 5.3+
2014-11-18 18:14:47 +01:00
Matt Lowe
a2c4a1e537
Action: Move Bottom Card to Graveyard
...
Created menu action to move card from the bottom of the library to the
graveyard. Qt accelerator key is "i". #125
2014-11-15 16:35:30 +01:00
Gavin Bisesi
438d4e4661
Merge pull request #417 from poixen/newsearchbar
...
Updated Search Bar Style
2014-11-14 10:19:24 -05:00
woogerboy21
6811819161
Don't remove card images from revealed decks
...
Revealed library had write access, which meant that the user would see cards being removed from the zone as the other player drew cards. The cards were not the actual ones drawn, just the ones at the same index, so no information was leaked.
Fix #297
2014-11-13 20:31:55 -05:00
Matt Lowe
62b7890e59
Cards Scale with mouse over action
...
Cards now scale up by 10% when mouse over.
2014-11-12 23:26:24 +01:00
Matt Lowe
f58cc32ef4
Added version check
...
Added version check, to only include the new Searchbar icon for Users
running Qt 5+
2014-11-10 22:14:27 +01:00
Gavin Bisesi
277c050d76
Merge pull request #421 from ctrlaltca/even_more_pictures
...
Add fallback urls for cards without a muId set
2014-11-10 10:27:47 -05:00
Fabio Bas
cb37073828
Oracle: fetch release date and set type
...
and save them in cards.xml
2014-11-10 16:22:46 +01:00
Matt Lowe
33a6e3c5c0
Removed hard coded CSS
...
Hard coded CSS might have a slight chance of not rendering the same
across all platforms. More research needs to be performed. Until then I
have removed the hard coded search bar customization.
2014-11-10 08:49:24 +01:00
Fabio Bas
fc1d06e13b
Add fallback urls for cards without a muId set
...
We only have a good HQ source for them; any idea on a low-quality
source?
2014-11-10 00:23:41 +01:00
Gavin Bisesi
a320af70da
Merge pull request #418 from ctrlaltca/osx_info_plist
...
OSX: Add proper infos to info.plist
2014-11-09 17:34:35 -05:00
Gavin Bisesi
6b1df247d1
Merge pull request #415 from ctrlaltca/no_pictures_yet
...
Rework the picture download behavior
2014-11-09 17:16:00 -05:00
Fabio Bas
c0ee060af4
Fixed vendor name
2014-11-09 23:14:36 +01:00
Gavin Bisesi
b3715c5da2
Merge pull request #416 from poixen/partialsearch
...
Partial Card Name Search
2014-11-09 17:08:02 -05:00
Fabio Bas
da46996294
Fix #408
...
Gray out "only buddies/only reg users" in the “create game” dialog if
the user is unregistered
2014-11-09 22:12:55 +01:00
Fabio Bas
a716d73a42
OSX: Add proper infos to info.plist
...
fixes #411
2014-11-09 21:03:10 +01:00
Matt Lowe
eef4a621b3
Updated Search Bar Style
...
Please note that I don't feel that the search bar needs to be skinned by
users, hence why it is not part of the large css-skinning project. I
also feel that given the PR #416 a new search bar with highlight the new
search functionality.
Updated the look of the search bar:
+ larger, curved edges
+ changes color when has focus
+ search icon built into search
- removed "Search For" text in lieu of search icon
2014-11-09 12:04:09 +01:00
Matt Lowe
0589f02ca2
Partial Card Name Search
...
+ Card searches now do partial string matches, rather than needing to
match the beginning of the string.
2014-11-09 11:23:45 +01:00
Fabio Bas
4b8ac99370
Corrected spacing
2014-11-08 15:52:04 +01:00
Fabio Bas
8ca0b96d10
Rework the picture download behavior
...
Should fix #412
2014-11-08 15:08:49 +01:00
Gavin Bisesi
8d2e5d3c43
Merge pull request #306 from Mawu3n4/translation
...
French translation
2014-11-07 10:11:53 -05:00
Gavin Bisesi
8f801825a9
Merge pull request #379 from poixen/uicolors
...
Changed UI colors
2014-11-05 15:45:53 -05:00
Gavin Bisesi
5ad869c636
Merge pull request #378 from poixen/animation
...
Card Animation performance improvement
2014-11-05 15:45:24 -05:00
Gavin Bisesi
67db347d12
Merge pull request #366 from poixen/removeoldimages
...
Resource cleanup
2014-11-05 15:31:17 -05:00
poixen
967e1a469e
Removed comments
...
- Removed comments as-per request
2014-11-05 14:10:30 +01:00
poixen
accd3ecca1
Removed commented line
...
- removed unused commented out code
2014-11-05 14:03:43 +01:00
Matt Lowe
332d69a1a5
Removed comment
...
+ removed getters and setters comment
2014-11-03 17:19:12 +01:00
Matt Lowe
097090ac1c
Updated static variable name
...
+ Updated DELTA variable to more suitable name:
ROTATION_DEGREES_PER_FRAME
2014-11-03 16:33:48 +01:00
Matt Lowe
c130ee92fa
Additional comment
...
+ Added additional comment explaining what DELTA is.
2014-11-03 14:39:51 +01:00
Zack
66aba2eec7
Merge remote-tracking branch 'upstream/master' into translation
2014-10-22 11:18:54 +02:00
Gavin Bisesi
07cccda17b
Merge pull request #377 from poixen/newhandsvg
...
Updated hand.svg
2014-10-20 10:28:58 -04:00
Matt Lowe
80fd0fbcf3
Removed inline logic
...
Removed inline logic to static variable, slight performance increase.
2014-10-17 00:17:44 +02:00
Matt Lowe
41478800ef
Updated Sideboard gradient colors
...
Wasnt happy with the first gradient, too much white. Now uses 2 shades
or purple.
2014-10-16 18:15:07 +02:00
Matt Lowe
a1c013a893
Updated UI features
...
+ Added a fade to inactive players TableZone
+ Refreshed TableZone, HandZone and DeckView default background colors
2014-10-16 18:14:51 +02:00
Matt Lowe
2193d247d0
Improved card animation performance
...
+ Cards now animate smoother and faster
+ removed redundant computations performed each frame
2014-10-16 18:06:30 +02:00
Matt Lowe
dc58d1a61e
Shortened animation time between phases
...
+ changed from 50ms to 25ms between update calls.
2014-10-16 18:05:49 +02:00
Matt Lowe
03f79887c4
Updated Hand image
...
Looking at the client I saw the cockatrice was still on the card back. I
have now removed it.
2014-10-14 22:43:14 +02:00
Fabio Bas
e0d76b60d0
Change button label and made it translatable
2014-10-14 22:02:42 +02:00
Fabio Bas
82a3deec30
Add a button in the sounds settings to play a test sound
2014-10-14 21:13:16 +02:00
Fabio Bas
9ef4d79c33
Install the audio/* plugins under windows and osx
2014-10-14 21:13:04 +02:00
Gavin Bisesi
8dbb2d8e6f
Merge pull request #364 from ctrlaltca/win32_openssl_cmake
...
Deploy openssl libraries under win32
2014-10-14 14:03:32 -04:00
Gavin Bisesi
a26d4078cc
Revert "Find cards by prefix"
2014-10-14 11:28:30 -04:00
Zack
2c74524f59
fix: missing message closing tag
2014-10-12 16:43:35 +02:00
Matt Lowe
299283aa2e
Resource cleanup
...
Removed some unused resource files.
2014-10-10 23:00:05 +02:00
Fabio Bas
dfb8be79cf
Fix installation of libeay32.dll, ssleay32.dll while compiling the PACKAGE target
2014-10-10 17:22:29 +02:00
Zack
9169d3a804
fix: conflicts && add: new translation
2014-10-10 14:56:05 +02:00
Fabio Bas
6f25e09132
Deploy openssl libraries under win32
...
They are needed to fetch prices from deckbrew and possibly, in the
future, for ssl server connections
2014-10-10 14:12:30 +02:00
Gavin Bisesi
6810ae46d6
Merge pull request #260 from Mawu3n4/master
...
Find cards by prefix
2014-10-09 11:29:02 -04:00
Gavin Bisesi
4070ba8e26
Merge pull request #352 from poixen/image-refresh
...
Image refresh
2014-10-09 11:27:47 -04:00
Gavin Bisesi
006451f402
Merge pull request #238 from arxanas/no-overwrite-tokens-xml
...
Fix #231 : tokens.xml no longer overwritten by cards.xml.
2014-10-06 11:34:58 -04:00
Matt Lowe
e240e47d2f
Fixed svg for icon
...
For some reason there was an issue with making the creature image white,
i found a workaround. Icon should now display correctly.
2014-10-03 19:02:40 +02:00
Matt Lowe
7cdd2a26f6
Icon changes
...
+ added updated mac icon that was missing
~ resized cockatrice.png
2014-10-03 19:02:27 +02:00
Matt Lowe
294edb3295
Logo and card back refresh
...
~ Updated the back of the card, cleaner lines, slightly more modern.
~ Updated game icon/logo
2014-10-03 19:02:12 +02:00
Gavin Bisesi
277aba79dc
Merge pull request #336 from poixen/master
...
Tokens use PT levels from cards.xml if available
2014-10-02 15:00:17 -04:00
Antony Woods
1f58f7d848
Changed 'value' to 'setValue' on line 275
2014-10-02 08:48:04 +01:00
Gavin Bisesi
b32aeb2211
Merge pull request #280 from pliu037/remove-.full-req
...
Support images without .full suffix
2014-10-01 13:50:02 -04:00
Matt Lowe
e3a94ecca3
Token PT is now set to DB values if not defined in event.
2014-10-01 19:20:42 +02:00
Gavin Bisesi
7eed007f14
Merge pull request #281 from ctrlaltca/fix_202
...
Fix crash #202
2014-09-30 20:35:11 -04:00
Matt Lowe
a80ccd882c
Tokens use PT levels from cards.xml if available
...
I added a check to see if the event PT is empty, if it is, we try and
use the PT from the cards.xml. In resp to issue #330 .
2014-10-01 00:57:07 +02:00
Fabio Bas
eaad8de8d0
Merge branch 'sideboard-helpers' of https://git.k6.io/nvdiao/cockatrice into sideboard-helpers
2014-09-29 18:25:10 +02:00
Gavin Bisesi
b5de708756
Merge pull request #289 from acron0/auto-connect
...
Added 'auto connect' checkbox to connect dialog.
2014-09-29 10:24:06 -04:00
Jan Martin
6f97e59c03
Change default scry to 1.
2014-09-19 21:41:57 +10:00
Zack Dibe
8928a699f9
fix: grammar in french translation
2014-09-11 23:44:52 +02:00
Mawu3n4
54e3867c72
finish fr translation
2014-09-11 15:18:40 +02:00
Mawu3n4
466f5ae5e1
add: FR translations and fix bad grammar
2014-09-11 15:17:35 +02:00
Yuki Izumi
fefb6fc612
Add sideboard helpers.
2014-09-11 12:56:27 +10:00
Antony Woods
f1b012c83d
Adding modified translation files
2014-09-09 17:30:37 +01:00
Antony Woods
dbe46084ac
Merge branch 'master' of github.com:Daenyth/Cockatrice into auto-connect
2014-09-09 17:22:55 +01:00
Fabio Bas
d6b97976f9
Refreshed all translation files
2014-09-06 10:40:23 +02:00
Fabio Bas
a0b35ee60b
Cockatrice - CMake: Include all existing translation files using a glob
2014-09-06 10:38:59 +02:00
Fabio Bas
e5eda9f172
Add a UPDATE_TRANSLATIONS options that actually updates translations!
2014-09-04 16:15:01 +02:00
Antony Woods
ab83d6185a
Used tr() function for auto-connect label. Changed formatting to adhere to coding style guidelines. 'Save Password' setting is now saved when cancelling the Connect dialog
2014-08-29 16:53:30 +01:00
Antony Woods
b381298981
Added 'auto connect' checkbox to connect dialog. When the main window becomes active for the first time and auto connect is set to true, it will call connectToServer at that point.
2014-08-27 21:25:11 +01:00
James Turner
f06d2123fc
Remove invalid character
2014-08-19 17:39:05 -04:00
Peng Liu
a83e6cdf48
Removed unused variable, bool stripped, from classes and functions.
2014-08-11 13:47:47 -04:00
Gavin Bisesi
134810b979
Merge pull request #279 from ctrlaltca/valgrind_unified
...
Fixed Valgrind warnings
2014-08-11 09:11:12 -04:00
Fabio Bas
23a3b8364c
Merge remote-tracking branch 'upstream/master' into fix_202
2014-08-11 15:07:43 +02:00
Gavin Bisesi
5c46cfc169
Merge pull request #179 from woogerboy21/registered-user-only-server
...
Registered Only Server
2014-08-11 09:03:57 -04:00
Fabio Bas
484a6e8bdc
Fix crash #202
2014-08-11 10:50:55 +02:00
Peng Liu
781460d6ac
Cockatrice can now load images both with and without .full. Will need to clean-up bool stripped (used to determine .full suffix inclusion).
2014-08-11 04:37:00 -04:00
Fabio Bas
1da2e7154c
Fixed Valgrind warnings
...
Running cockatrice in valgrind i didn't found any bad memory leak
(good!), but only a few jumps depending on uninitialized variables.
Even if the possibility of crashes are remote, it's nice to sort them
out.
2014-08-11 10:08:33 +02:00
Gavin Bisesi
8b32a1010a
Merge pull request #265 from pliu037/clear-downloaded-pics
...
Clear downloaded images from settings
2014-08-10 13:34:14 -04:00
Mawu3n4
d55f6fdec1
fix: show card only found once by prefix
2014-08-08 14:24:29 +02:00
Daenyth
765e865aa2
Continue downloading card images after failing url on one.
...
I should probably bust this out to a method.
2014-08-08 09:33:38 +02:00
Daenyth
42f1c6938f
Merged: First draft of better pic url error handling
...
Cherry-picked b9cb61abd05f83c67740aafa5e1e6939143547e4
2014-08-08 09:33:35 +02:00
Fabio Bas
bba8184d37
Fix off by one
2014-08-07 23:14:57 +02:00
Fabio Bas
88dfea8ece
Don't save card pictures if we don't have a proper set name for it
2014-08-07 23:14:50 +02:00
Fabio Bas
3bce98e3a9
Fix crashes trying to load the picture of a card with no <set>
2014-08-07 23:14:41 +02:00
Peng Liu
d3459aabf9
Moved the button from the paths section to be below the "Download high-quality card pictures" checkbox. Button now reads "Reset/Clear Downloaded Pictures". Removed "Path to"s from card/token database, hand/stack/table/player info background, and card back labels.
2014-08-07 14:35:18 -04:00
Peng Liu
ae80752497
Added notification messages informing users of the success or failure of clearing downloaded images.
2014-08-07 14:00:59 -04:00
Waleed Khan
ffc5b59fec
Fix #258 : Dashes to spaces.
2014-08-07 12:29:20 -04:00
Peng Liu
674005383b
Added a button and the functionality to clear all downloaded images (all images within subfolders at picsPath/downloadedPics) under Settings.
2014-08-07 12:09:42 -04:00
Mawu3n4
10ab53c4ac
fix: find by prefix if card not found only
2014-08-07 17:43:14 +02:00
Waleed Khan
c0d4669088
Merge remote-tracking branch 'upstream/master' into no-overwrite-tokens-xml
...
Conflicts:
cockatrice/src/carddatabase.cpp
2014-08-07 11:06:41 -04:00
Dibe Zackaria
9092f2298b
fix: remove auto
2014-08-06 20:27:04 +02:00
Dibe Zackaria
e8abd6eb63
fix: typo
2014-08-06 20:13:59 +02:00
Mawu3n4
7d190ddaf7
fix: pushed old version
2014-08-06 18:01:47 +02:00
Mawu3n4
621a47de9c
add: find token cards by prefix
2014-08-06 17:54:47 +02:00
Gavin Bisesi
ef1fbc0db9
Merge pull request #256 from pliu037/handle-PNGs-2
...
Handle PNGs (and other image formats)
2014-08-06 10:42:15 -04:00
Fabio Bas
6502a182e8
Support loading of files with wrong extension
...
Like M15’s .png that cockatrice wrongly saved as .jpg
Additionally, move the QImageReader declaration outside of the inner
loop
2014-08-06 09:31:22 +02:00
Peng Liu
4bb1d28ae7
Removed the QLists for determining image format. Instead, using QImageReader, both when downloading/saving and when loading, to determine the correct format (Cockatrice now supports all QImageReader-supported formats).
...
Image loading still uses one for loop to iterate through the QList of paths to folders in which to search for images.
2014-08-05 14:54:40 -04:00
Peng Liu
8587b8c349
Refactored the magic bytes into two QLists: one containing a list of QStrings representing the supported extensions, the other containing a list of QByteArrays representing the magic bytes in hex.
...
Refactored the image loading loop to be two nested for loops: the outer loop iterating through the QList of paths to folders in which to search for images and the inner loop iterating through the QList of supported extensions.
2014-08-05 03:48:30 -04:00
Peng Liu
75122c3c9d
Switched back to using QFile instead of QImage for saving as QImage's save function adds overhead to the file size, leaving me unsure whether the original image is affected.
2014-08-04 17:01:58 -04:00
Peng Liu
387086cb4c
Added support for PNG images (both for downloading/saving and loading).
2014-08-04 16:43:57 -04:00
Fabio Bas
3667ab504c
Fix compilation warning introduced in #246
...
/cockatrice/src/main.cpp:162:16: warning: format string is not a string
literal (potentially insecure) [-Wformat-security]
qDebug("Could not create " +
settingsCache->getPicsPath().toUtf8() + "/CUSTOM. Will fall back on
default card images.");
2014-08-04 20:09:53 +02:00
Gavin Bisesi
8d482245ff
Merge pull request #251 from arxanas/case-insensitive-tokens
...
Fix #248 : the token dialog generates cards irrespective of their case and punctuation
2014-08-04 10:50:25 -04:00
Peng Liu
a9eaf65a82
Changed .toLatin1() to .toUtf8().
2014-08-02 23:44:31 -04:00
Waleed Khan
309494111c
Fix #248 : the token dialog generates cards irrespective of their case and punctation.
2014-08-02 19:32:24 -04:00
Peng Liu
b3fa99ef36
I was too hasty and forgot a + and to toLatin1() a QString in the qDebug arg.
2014-07-31 23:24:25 -04:00
Peng Liu
077d9f2745
Checks if CUSTOM folder was successfully created. If not, prints qDebug message and proceeds as normal except uses default card images instead of custom ones.
2014-07-31 22:42:13 -04:00
Gavin Bisesi
ffed0e00fe
Merge pull request #214 from pliu037/master
...
Added better support for custom card images
2014-07-31 13:42:57 -04:00
Gavin Bisesi
ca6bd669ce
Merge pull request #233 from ctrlaltca/regression_card_picurl
...
Add back support for custom picture urls in cards.xml
2014-07-31 11:30:26 -04:00
Gavin Bisesi
7d5ce6f0ef
Merge pull request #235 from ctrlaltca/offline_users_menu
...
Disable some usercontextmenu actions if the user is offline; fix #234
2014-07-30 15:49:43 -04:00
Gavin Bisesi
1e5a00d100
Merge pull request #228 from ctrlaltca/error_suppression
...
Fix building with debug
2014-07-30 15:44:08 -04:00
Waleed Khan
9ba5d7968e
Stop clobbering tokens.xml tokens; don't let Oracle read tokens into cards.xml.
2014-07-29 23:46:04 -04:00
Waleed Khan
8df7e9f164
Fix #231 : tokens.xml no longer overwritten by cards.xml.
2014-07-27 20:55:47 -04:00
Fabio Bas
9e12c5b2d4
Use custom picUrl if picUrlHq is not defined
2014-07-27 22:06:35 +02:00
Fabio Bas
6b9daf3d15
Enable Show this user's games" for offline users
2014-07-27 21:29:27 +02:00
pliu037
c3a68fcbd3
Cleaned up some lines of code
2014-07-27 12:47:05 -04:00
Waleed Khan
689acc1e32
Fix #110 : Price column is removed when the setting is disabled.
2014-07-26 21:13:30 -04:00
Fabio Bas
fe12f71b93
Disable some usercontextmenu actions if the user is offline; fix #234
2014-07-27 00:29:23 +02:00
Fabio Bas
aa225f8df7
Add back support for custom picture urls in cards.xml
2014-07-26 23:36:51 +02:00
Waleed Khan
fe9f7a22b1
Fix issue mentioned in #152 : price updater loads all cards now.
2014-07-24 19:53:05 -04:00
Fabio Bas
3fda31073f
Declare useless virtual dtor for polymorphic classes
2014-07-24 18:54:45 +02:00
Fabio Bas
0f501762e0
Reorder items initialization to match the order in class declaration
2014-07-24 18:44:19 +02:00
Fabio Bas
bd97d7b933
Fix signed/unsigned comparision
2014-07-24 18:40:25 +02:00
Fabio Bas
d9577f0d6c
Hide unused parameters in cockatrice/ to avoid warnings
2014-07-24 18:27:02 +02:00
Fabio Bas
f32a999b4e
Remove unused variable
2014-07-24 15:38:36 +02:00
Gavin Bisesi
abdaa610ee
Merge pull request #152 from ctrlaltca/master_feature_prices
...
Add pricing from deckbrew.com (refs #147 )
2014-07-24 07:45:37 -04:00
Fabio Bas
49b3568b53
small fix: moving the url length check in the inner loop
2014-07-23 23:10:48 +02:00
Fabio Bas
b40abfa1ad
Split price retrieval on multiple request
2014-07-23 23:00:58 +02:00
Fabio Bas
bf92e67002
Ensure the whole table gets refreshed when updating prices
2014-07-23 22:11:26 +02:00
Gavin Bisesi
a8031321c6
Merge pull request #226 from arxanas/deckstats-multiple-cards
...
Fix #225 : Multiples of cards are now sent to deckstats.
2014-07-23 15:38:09 -04:00
Fabio Bas
b0ee2e6d4b
Merge branch 'master' into master_feature_prices
2014-07-23 21:37:37 +02:00
Waleed Khan
68ac8d1a33
Fix #225 : Multiples of cards are now sent to deckstats.
2014-07-23 15:21:46 -04:00
Gavin Bisesi
a50e7ba936
Merge pull request #156 from arxanas/master
...
Fix #45 : don't send tokens to deckstats.
2014-07-23 08:41:15 -04:00
Waleed Khan
40e97140d6
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
cockatrice/src/carddatabase.cpp
2014-07-23 00:49:13 -04:00
Waleed Khan
2a5aa06881
Æ now actually works with the case-insensitive tags.
2014-07-22 20:58:38 -04:00
Waleed Khan
aff32e0f56
Ignore diacritics as well.
...
So [card]jotun grunt[/card] works as well as [card]Jötun Grunt[/card].
Also I removed some debugging information I accidentally left in.
2014-07-20 21:20:50 -04:00
Waleed Khan
e5be082714
Merge remote-tracking branch 'upstream/master' into case-insensitive-card-tag
2014-07-20 15:06:51 -04:00
Waleed Khan
359882917a
Merge remote-tracking branch 'upstream/master'
...
Some tabs to spaces, and maybe fixed to work with Qt 5.
Conflicts:
cockatrice/src/deckstats_interface.cpp
common/decklist.cpp
common/decklist.h
oracle/src/oracleimporter.cpp
2014-07-20 14:40:18 -04:00
woogerboy21
021f0911c4
Merge remote-tracking branch 'upstream/master' into registered-user-only-server
...
Conflicts:
common/server.cpp
common/server_protocolhandler.cpp
servatrice/src/servatrice.cpp
2014-07-18 23:46:56 -04:00
Fabio Bas
534b223545
Merge remote-tracking branch 'upstream/master' into master_regression_180_tab
2014-07-10 19:50:38 +02:00
Fabio Bas
b5d8e7da10
Merge remote-tracking branch 'upstream/master' into master_feature_prices
2014-07-10 19:48:50 +02:00
Gavin Bisesi
f83d58309b
Merge pull request #126 from ctrlaltca/cmake_qt5
...
Qt5 support
2014-07-10 13:13:51 -04:00
Gavin Bisesi
86fa8f304d
Change client send-ping timer back to 1sec
...
9sec was causing too many timeout issues.
Timeout from both client and server perspective needs to be revisited
2014-07-09 19:06:31 -04:00
Fabio Bas
ea8c55b2c9
Merge remote-tracking branch 'upstream/master' into cmake_qt5
2014-07-09 17:44:21 +02:00
Fabio Bas
a6f299b247
fix #203
2014-07-09 17:42:35 +02:00
Fabio Bas
106e9d1538
Updated for new API
...
* Use the new, shortest API m=
* for a card, grab prices for all sets
* use the lower price for a card from all sets, but avoid prices=0
(e.g.: some M15 cards have no price yet)
2014-07-09 09:43:35 +02:00
pliu037
1a601d9509
Added better support for custom card images by prioritizing a check for card images in <Pictures path>/<CUSTOM> before all other checks.
2014-07-08 16:24:51 -04:00
Gavin Bisesi
73e5e12c24
Merge pull request #199 from arxanas/remember-game-filter-preferences
...
Fix #137 : Game filter preferences are saved.
2014-07-08 12:49:45 -04:00
arxanas
1217689ed6
Hash the game type.
2014-07-07 19:04:01 -04:00
arxanas
8141901679
Fix #137 : Game filter preferences are saved.
2014-07-07 17:41:16 -04:00
arxanas
810029ce15
Fix #117 : Card tags now match disregarding case and punctuation.
2014-07-06 20:04:09 -04:00
Fabio Bas
aead0843af
Room and Message tabs: focus input line when convenient; Fix #180
...
As suggest by Daenyth in #185
2014-07-06 14:28:48 +02:00
Fabio Bas
e9895d643f
Merge remote-tracking branch 'upstream/master' into cmake_qt5
2014-07-03 16:40:04 +02:00
Gavin Bisesi
7f77082466
Merge pull request #151 from ctrlaltca/master_input_focus
...
Focus the Input line in chat when convenient (fixes #113 )
2014-07-03 10:34:21 -04:00
Fabio Bas
6f18e3692d
Chat room: ensure the line input has focus when the window gets created
2014-07-03 15:57:40 +02:00
woogerboy21
00ec84db2a
Stale Comment Removal
...
Removed stale commented lines from about window code.
2014-07-02 23:30:12 -04:00
woogerboy21
0a1fe7f5a8
Requested Cleanup
...
Corrected tab to 4 space (per request)
Moved regonly option under authentication ini location (per request)
2014-07-02 22:27:05 -04:00
woogerboy21
d246fa39fe
Registered Only Server
...
Implemented the ability to set the server to only allow registered
users. Also updated client to reflect the log-in rejection as well as
put a check in place for the server to not start if db connection is not
available yet registration is required.
2014-07-02 20:52:22 -04:00
Fabio Bas
06def7f46a
Ensure all card prices are retrieved correctly
...
Query card database to get a multiverseis for a card.
Get card price using that id instead of card name.
Tested Aether, split cards, question elemental?, _____
2014-07-02 21:42:29 +02:00
Fabio Bas
d102733826
Added default cases to switch
2014-07-02 21:42:17 +02:00
Fabio Bas
9ca5908de5
Create an enum for price sources
...
Probably settingscache would have been the correct place for the enum,
but keeping it in the same class/file where price sources are defined
sounds cleaner to me
2014-07-02 21:42:04 +02:00
Fabio Bas
a9ffbf5d2d
use a signal instead of calling QMetaObject::invokeMethod
2014-07-02 21:41:52 +02:00
Gavin Bisesi
fb4a7b3274
Give more friendly login error message
2014-07-01 12:04:33 -04:00
arxanas
7cbe410172
Fix #45 : don't send tokens to deckstats.
2014-06-30 03:08:55 -04:00
Fabio Bas
922e98af67
Add pricing from deckbrew.com
...
* the previous PriceUpdater class has become abstract
* BLPPriceUpdater inherits the old code for blacklotusproject.com
* DBPriceUpdater is a new implementation for deckbrew.com
* add a setting to choose between the two
2014-06-29 23:33:03 +02:00
Daenyth
4d6f46b06e
Change client ping send interval to 9 sec
2014-06-29 14:46:06 -04:00
Fabio Bas
d86fa410df
Chat room: ensure focus on the input line
2014-06-29 19:32:03 +02:00
Fabio Bas
27bd00bec8
Direct chat: ensure focus is on the input line; fixes #113
2014-06-29 19:29:45 +02:00
Fabio Bas
fc24ffdec2
Cmake reorganization
...
* Move all cmake-related files in a new “cmake” folder
* move nsis files in there, too, since they are templates parsed by cake
* retrieve git version once when cmake is run, and use it for both
creating version_string.h/cpp and for package naming
2014-06-28 19:39: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
8d31fe6cbc
Clean up deck load chat message
2014-06-28 09:04:45 -04:00
Daenyth
4c2a553f03
Have servatrice inform players of sideboard size
...
Ref #142
2014-06-28 00:36:43 -04:00
Daenyth
6d3fe428e7
Fix some warnings
...
Ref #127
2014-06-27 22:19:23 -04:00
Daenyth
1d02e0d5ec
Clarify comment about typedef for OSX compiling
2014-06-27 20:00:29 -04:00
Fabio Bas
096f200eb9
Install libraries and plugins automatically under windows
...
You won’t have to copy manually all the dlls in the release directory
anymore
2014-06-27 17:40:29 +02:00
Fabio Bas
34772cccab
Compilation fix for MSVC+Qt5
2014-06-27 17:09:09 +02:00
Fabio Bas
54805fb14e
Merge remote-tracking branch 'upstream/master' into cmake_qt5
2014-06-27 15:21:01 +02:00
arxanas
080fd326ed
Fixed #131 : Compiles on OS X now.
2014-06-26 16:57:47 -04:00
Daenyth
144bb7fa89
Merge remote-tracking branch 'origin/invalid-windows-paths'
2014-06-25 20:26:46 -04:00
Gavin Bisesi
fcc62a1e1f
Use defined(Q_OS_WIN) in #elif to satisfy MSVC
...
It's always windows.
2014-06-25 17:09:17 -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
c4458b16b2
Qt5: fix plugin installation
2014-06-25 15:53:25 +02:00
Fabio Bas
809f390e2f
Merge remote-tracking branch 'upstream/master' into cmake_qt5
2014-06-25 15:46:50 +02:00
Fabio Bas
7035150351
Deckstats: move QUrl handling into its own function; better separation of qt4/qt5 code
2014-06-25 09:07:02 +02:00
Daenyth
aee86ce45a
Mark QGraphicsItem for AbstractGraphicsItem
2014-06-25 01:53:19 -04:00
Daenyth
1c9540befa
Set cmake module path to local for findqtmobility
2014-06-25 01:48:30 -04:00
Daenyth
d811fee2f3
Include missing qdebug
...
Dunno how I missed that.
Fix #128
2014-06-25 00:11:55 -04:00
Gavin Bisesi
65f59747c9
Merge pull request #116 from ctrlaltca/feature-cpack
...
Use cpack to create osx's dmg
2014-06-24 21:08:57 -04:00
Daenyth
df659e58fe
Mask set shortcodes for windows illegal filenames
...
Ref #122
2014-06-24 20:49:03 -04:00
Fabio Bas
6dbdaafb33
Ported cockatrice
2014-06-24 19:13:47 +02:00
Fabio Bas
5c13c06982
Merge remote-tracking branch 'upstream/master' into cmake_qt5
2014-06-24 18:13:26 +02:00
Daenyth
e5d9692d78
Fall back to plain text load when xml load fails
2014-06-24 00:14:59 -04:00
Daenyth
0420f4f7af
Log download failures
2014-06-23 23:44:13 -04:00
Daenyth
e925403bc5
Log cardname when downloading
2014-06-23 22:18:40 -04:00
Daenyth
ea08fe168c
Fix Q_INTERFACES warnings
...
Fix #88
2014-06-22 22:32:53 -04:00
Daenyth
e5d15e8dbc
Notify deck editor when price feature setting is changed
...
Ref #112
2014-06-22 21:20:14 -04:00
Daenyth
c54f7b9245
Log on failed path copy
2014-06-22 20:14:22 -04:00
Fabio Bas
66c87a1ee6
OSX: Handle sounds for first time installations
...
If the sounds path is unset in the settings and a “sounds” directory
doesn’t exists in the user’s data directory, install the sounds files
and set the settings value accordingly
2014-06-22 23:42:12 +02:00
Fabio Bas
0b4701c42f
OSX: Handle zonebg for first time installations
...
If none of the gameboard images is set and and the user’s data
directory doesn’t contain a “zonebg” directory, create the directory,
copy contents from cockatrice’s app bundle and sets the config
accordingly.
2014-06-22 23:42:12 +02:00
Fabio Bas
55c4c464e4
OSX: get translation path from qt.conf instead of hardcoding it
2014-06-22 23:41:15 +02:00
Fabio Bas
2eebddea9a
Port "make package" fix to oracle and servatrice
2014-06-22 23:41:15 +02:00
Fabio Bas
2a5f6181aa
Osx: removed plugins path detection and fixed translation path detection
2014-06-22 23:41:15 +02:00
Fabio Bas
b44365b73c
This finally fixes both make install and make package
2014-06-22 23:41:15 +02:00
Fabio Bas
6d1de0c617
Partially revert previous commits; ensure the bundle is fixed up correctly
2014-06-22 23:41:15 +02:00
Fabio Bas
41c7ce8022
Fix qt.conf file creation for "make package"
2014-06-22 23:41:15 +02:00
Fabio Bas
99f3519da5
Workaround permission problem in ixup_bundle
...
Without this change, make install and make package would require “sudo”
under osx
2014-06-22 23:41:15 +02:00
Gavin Bisesi
1260ccc531
Merge pull request #111 from Daenyth/better-invalid-db-ux
...
Don't be a jerk when card database isn't usable.
2014-06-22 15:28:45 -04: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
Daenyth
27847e1551
Don't be a jerk when card database isn't usable.
...
Better error message and allow the user to still connect
Ref: #102
2014-06-21 15:53:13 -04:00
Daenyth
38b83acae0
Fix #105 - remove emdash from card type when getting main type
2014-06-21 12:42:46 -04:00
Fabio Bas
d7a962c055
CMake: support fir linking against qt5
2014-06-21 14:12:55 +02:00
Daenyth
53d2b82e61
Use picUrl templates to download cards.
...
Add HQ card option
2014-06-21 01:12:47 -04:00
Daenyth
8281f63134
Add settings fields for pic urls
2014-06-20 22:10:26 -04:00
Daenyth
fa52ed00a3
Merge branch 'master' into mtgjson-importer
2014-06-20 20:43:19 -04:00
Mark Morschhäuser
6fa94dd475
Qt5: toAscii() and fromAscii() Methods are deprecated
2014-06-20 16:55:26 +02:00
Mark Morschhäuser
a903c231f2
Qt5: QDesktopServices::storageLocation deprecated
2014-06-20 16:54:46 +02:00
Mark Morschhäuser
648a6a3884
Qt5: QUrl addQueryItem moved to QUrlQuery
2014-06-20 16:53:45 +02:00
Gavin Bisesi
da4c25597e
Merge pull request #61 from VanNostrand/win32
...
Windows MSVC support
2014-06-19 22:56:18 -04:00
Daenyth
3401098e63
Revert "Merge pull request #89 from dylan/master"
...
This reverts commit 552a8e0c23
, reversing
changes made to d0f3ae6c80
.
2014-06-19 22:11:20 -04:00
Mark Morschhäuser
391e480d7a
Restored MSVC linkflags after cmake update.
2014-06-18 12:11:58 +02:00
Mark Morschhäuser
929bcb55da
Fixed bug in filtertree.cpp
2014-06-18 12:10:15 +02: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
Gavin Bisesi
552a8e0c23
Merge pull request #89 from dylan/master
...
Added new app icons, SVG icon not replaced however...
2014-06-17 19:48:12 -04:00
Fabio Bas
f3a57d5506
Import data from mtgjson's allsets.xml
...
* add multiverse id to cards.xml
* remove pictures urls from cards.xml
TBD:
* fix/clean oracle’s gui
* add support in cockatrice
2014-06-16 00:27:33 +02:00
Daenyth
b749ddbc45
Add the ability to friend/ignore an offline user
2014-06-15 14:59:54 -04:00
Fabio Bas
dd768ba7bd
OSX: Move translations inside app bundle
...
Additional: remove duplicate if(linux) and merge rules together
2014-06-12 23:42:20 +02:00
Fabio Bas
eca318c34d
Make install paths relative to prepare for CPack
2014-06-12 23:29:42 +02:00
Fabio Bas
721cf6fe4f
Re-indent CMakeLists.txt using spaces
2014-06-11 18:08:30 +02:00
Fabio Bas
62f756e698
Remove pthread detection and linking: it's unused
2014-06-11 01:20:19 +02:00
Fabio Bas
0dd6567583
cockatrice's CMakeLists.txt: major overhaul
...
* Remove cockatrice_HEADERS (obsoleted by automoc)
* Remove compilation flags definition and Qt4 finding calls
* Make use of CMAKE_INSTALL_PREFIX
* use INSTALL(TARGETS) in place of INSTALL(PROGRAM)
* Osx: create a proper application bundle
* Added comments
2014-06-10 23:32:52 +02:00
Fabio Bas
84503483eb
Added missing ifdefs around keysignals.h
2014-06-10 23:25:59 +02:00
Fabio Bas
39e2bf06f5
Merge branch 'master' into cmake-overhaul
2014-06-10 23:11:31 +02:00
Fabio Bas
20b9a538fa
Split PendingCommand 's implementation to its own cpp to permit automoc
2014-06-10 22:33:21 +02:00
Gavin Bisesi
50ac14e8ff
Merge pull request #82 from ctrlaltca/osx-compilation-fix
...
Fix compiling on OSX
2014-06-10 14:06:23 -04:00
ctrlaltca
e2d17e983f
Restored whitespaces in CMakeLists.txt
2014-06-10 20:05:24 +02:00
Gavin Bisesi
2b7d5d0ef2
Merge pull request #47 from sylvan-basilisk/editor-redesign
...
addition of advanced filtering features in deck editor
2014-06-10 10:37:35 -04:00
Fabio Bas
4fc6831784
Avoid using gcc-specific flags on not-gnu compilers
2014-06-10 11:42:41 +02:00
sylvanbasilisk
841847cda4
update to hotkey settings in deck editor tab
...
removed LEFT/RIGHT increment/decrement while
the card database/quicksearch edit have focus.
LEFT/RIGHT increment/decrement remains while the
deck view has focus.
also, now the card database delegates focus the
quicksearch editor so that any characters typed
while the card database has focus will narrow
the search down using the quicksearch filter.
`control`+`alt`+`-`/`=` now increment/decrement
the mainboard and `control`+`alt`+`[`/`]` now
increment/decrement the sideboard (alt could not
be used alone as OSX inserts special characters
using alt.
2014-04-24 20:17:21 +00:00
sylvanbasilisk
040d9d15a3
bug fix: move isEnabled test out of acceptCardAttr
...
in the case of AND'ed filter terms, returning true
from acceptCardAttr will be equivalent to ignoring the
disabled term, but in the case of OR'ed terms,
returning true will incorrectly cause all cards
to be accepted.
the fix is to test for whether the term is enabled
before calling acceptCardAttr and continue if
disabled.
2014-04-24 19:49:50 +00:00
sylvanbasilisk
cd4d04be3e
change tabs into 4 spaces in new files
2014-03-25 02:29:45 +00: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
378cc91c17
delete debug printf statements
...
this should fix the compilation issue mentioned by mattkelly
2014-03-25 00:07:58 +00:00
sylvanbasilisk
610f0b6f6f
make sure filtertree stuff translates
...
The logic types and attribute names were not previously
being translated by the tr(...) function.
2014-03-24 23:52:30 +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
d968f04b02
Improved file handling from commit e33debcb
.
2014-03-18 12:10:46 +01:00
Matt Kelly
082ab73152
Add Tab shortcut for next phase
2014-03-13 01:08:49 -04:00
Mark Morschhäuser
e2615a0ff0
Fixed warning C4018 <,> signed/unsigned mismatch
2014-03-12 09:34:25 +01: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
Mark Morschhäuser
a7c957dfca
Fixed CMake files for MSVC++ linker.
2014-03-11 17:15:51 +01:00
Mark Morschhäuser
32ad8ed24c
Fixed MSVC++ compile error due to sqrt() usage.
2014-03-11 16:57:54 +01:00
Mark Morschhäuser
80da61dcbb
Fix MSVC++ compile error caused by missing round() in math.h
2014-03-11 16:10:55 +01:00
Mark Morschhäuser
6e9f81461a
Fixed VC++ 'M_PI' : undeclared identifier error.
2014-03-11 15:19:29 +01:00
Mark Morschhäuser
49227ad44c
Fixed VC "'*/' found outside of comment" warning.
2014-03-11 15:04:26 +01:00
Mark Morschhäuser
e33debcbff
Changed C to Qt file handling. VC warns because fopen may be unsafe.
2014-03-11 15:02:15 +01: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
Matt Kelly
a171df744d
Convert to 4-space indents
2014-02-11 10:47:51 -05:00
Matt Kelly
96ec49936e
Resolve all compiler warnings
2014-02-11 01:52:06 -05:00
sylvanbasilisk
f6e9676c75
revert cardinfowidget to its original content
...
reverted cardinfowidget to its original form at commit
95c6058dc3
before i messed with
it. i didnt intend to make changes to it.
2014-01-29 07:15:44 +00:00
sylvanbasilisk
f77054f20d
refactor cardframe as a parent of a text card frame and a picture card frame
...
cardframe is now a stacked widget that prefers to show the card picture
only so that the screen can be more space efficient and the card pixel
map can be displayed as a larger size. however if the card pixel map
can not be loaded for some reason, the cardframe class will automatically
switch to the text version of the card.
a menu item was added under the database menu to allow for users to
prefer card text only.
2014-01-29 00:19:34 +00:00
sylvanbasilisk
5d223b5917
clear the filter term text edit box appropriately
...
clear the text box when the '+' button is pressed or
when the filter attribute is changed.
also changed the frame style to match the card frame style.
2014-01-28 23:51:18 +00:00
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
Max-Wilhelm Bruker
bd9221f1a5
Merge pull request #123 from bafipawi/fixMacCompile
...
Fixed cmake error on mac install
2013-02-10 11:54:04 -08:00
Chris Hansen
422f73d4cd
Fixed cmake error on mac install
2013-02-08 20:18:19 -08: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
89ae29aaf0
added Georgia to countries
2013-01-19 16:14:47 +01:00
Max-Wilhelm Bruker
bc595bbab2
added missing confirmation dialogue for remote folder deletion
2013-01-10 00:16:52 +01:00
Dylan Wreggelsworth
ef768dbe44
Added new app icons, SVG icon not replaced however...
2012-11-13 19:45:04 -08:00
Max-Wilhelm Bruker
de87bc6546
compile fixes by hasufell
2012-10-28 21:43:41 +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
ba5669652c
added Dominican Republic
2012-07-24 20:20:41 +02:00
Max-Wilhelm Bruker
1409c50fbe
Merge branch 'master' of git://github.com/mbruker/Cockatrice
2012-07-22 18:16:11 +02:00
Max-Wilhelm Bruker
03cef19783
added New Zealand
2012-07-22 18:15:49 +02: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
0abb4c84c2
Merge branch 'master' of git://github.com/mbruker/Cockatrice
2012-06-27 21:47:37 +02:00
Max-Wilhelm Bruker
7938171aca
Mac client: translation path fix
2012-06-27 21:44:49 +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
e17751ccdf
added Croatia to countries
2012-06-27 13:30:24 +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
0bd0361a27
updated Italian
2012-06-24 16:04:50 +02:00
Max-Wilhelm Bruker
fe7d42738c
translation merge
2012-06-10 13:08:47 +02:00
armyfrank
22e12db15e
Updated Japanese translation
2012-06-09 13:25:48 +09:00
armyfrank
9373106594
Merge branch 'translation' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice into translation
2012-06-09 13:18:14 +09: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
2a5050fdc4
added Chile to countries
2012-06-03 18:26:50 +02:00
Max-Wilhelm Bruker
551fdb464e
added Venezuela to countries
2012-06-03 18:22:56 +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
c2edd33e90
added stub for Chinese
2012-05-20 14:52:58 +02:00
Max-Wilhelm Bruker
b6700658d7
updated Portugese and Swedish
2012-05-18 19:11:17 +02:00
Max-Wilhelm Bruker
49befa210d
updated translation catalogues
2012-05-18 19:06:53 +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
d5a1032cf3
updated German translation
2012-05-09 23:33:43 +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
53afd65beb
merged incomplete polish translation
2012-05-01 20:13:13 +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
767d53b5a8
merged from master
2012-03-31 18:41:01 +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
0165ea61ff
Swedish translation done
2012-03-27 10:55:57 +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
0e7f7887ad
added swedish translation to qrc
2012-03-25 17:11:39 +02:00
Max-Wilhelm Bruker
ac62ce9839
removed debugging line
2012-03-25 17:07:26 +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
9dcf205d36
really added the file this time
2012-03-25 15:49:43 +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
96213fc3f3
Windows fixes
2012-02-25 14:50:06 +01:00
Max-Wilhelm Bruker
89c920479c
cmake fix
2012-02-21 01:21:32 +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
e8844deeef
added unix desktop icons and menu items to install target
2012-01-29 18:30:02 +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
mbruker
c7662999d3
Merge pull request #3 from Daenyth/master
...
Add planeswalker loyalty to CardInfoWidget
2012-01-29 07:56:36 -08:00
Max-Wilhelm Bruker
6d4510b506
merged from master
2012-01-29 16:54:22 +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
Milton Goncalves
2679e82fdc
updated portuguese translation
2012-01-26 02:43:24 +00: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
068658995d
added compiler flags
2012-01-21 22:24:20 +01:00
Max-Wilhelm Bruker
e202d659a0
moc weirdness workaround on Unix, added install target
2012-01-21 22:13:27 +01:00
Max-Wilhelm Bruker
f385917a90
Win32 compile fix
2012-01-21 20:38:16 +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
Max-Wilhelm Bruker
ca9122b9fb
added responses + events
2011-12-29 19:40:41 +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
fdded2e8c2
More Gàighlig translations
2011-12-07 20:31:43 -05:00
Daenyth
c140327c1b
More Gàidhlig translations
2011-12-07 19:35:00 -05:00
Daenyth
ab24ff44e5
Add partial Scottish Gaelic (gd) translation
2011-12-07 01:40:08 -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
7806024c2b
excluded unfinished translations from release
2011-11-13 14:00:45 +01:00
Max-Wilhelm Bruker
0d53f3f3e1
lupdate
2011-11-13 13:14:30 +01: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
Max-Wilhelm Bruker
683c57bb88
linux compile fix
2011-10-14 14:24:02 +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
Max-Wilhelm Bruker
963e8f0d90
Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice
2011-09-30 19:03:28 +02:00
Max-Wilhelm Bruker
4bdb9e1ddc
added Guatemala
2011-09-30 19:02:33 +02:00
a b
c5bde61526
Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice into experimental
2011-09-27 22:34:38 +02:00
a b
c4bd38dbdc
Mac fixes
2011-09-27 22:33:45 +02:00
Max-Wilhelm Bruker
ec743b73db
italian translation fix
2011-09-27 20:16:18 +02:00
Max-Wilhelm Bruker
b33b3778f0
italian translation nearly done
2011-09-26 18:47:15 +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
8344920fdc
minor server fix
2011-09-16 15:09:59 +02:00
Max-Wilhelm Bruker
742a10cc1f
updated resource file
2011-09-15 18:17:31 +02:00
Max-Wilhelm Bruker
47d63ad551
added some countries and zonebgs
2011-09-15 18:15:45 +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
unknown
1d2a007fba
added Slovenia
2011-08-25 17:45:27 +02:00
unknown
ebbc16ea65
updated French translation
2011-08-25 17:17:42 +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
55a9e68822
German translation fix
2011-07-20 21:43:20 +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
8c3a3150b4
initial Czech translation by Ondřej Trhoň
2011-07-10 14:29:16 +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
9090bc333c
new phase buttons by capthauq
2011-07-06 01:22:09 +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
9f098f2a6d
translation update
2011-06-28 00:15:19 +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
8d659b6c39
renamed file
2011-06-18 12:50:08 +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
87addd1267
merged translation
2011-06-18 11:46:12 +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
a4097659d3
made server threading optional
2011-05-21 23:03:00 +02:00
Max-Wilhelm Bruker
c67bc65762
preliminary sound support
2011-05-21 22:55:08 +02:00
Max-Wilhelm Bruker
19ae32f330
lupdate
2011-05-21 19:39:08 +02:00
Max-Wilhelm Bruker
731d6bc4d1
added flags for Malaysia and Romania
2011-05-16 14:28:45 +02:00
Max-Wilhelm Bruker
bd5a687816
added SG and ZA to countries
2011-05-10 04:06:54 +02:00
Max-Wilhelm Bruker
461a62e0c8
LocalServer crash fix
2011-05-08 17:56:52 +02:00
Max-Wilhelm Bruker
5fa2f019d0
added SK and CZ flags
2011-05-01 14:58:36 +02:00
Max-Wilhelm Bruker
ed719090af
added NPH to sets, added Belarus to countries
2011-04-30 03:08:45 +02:00
Max-Wilhelm Bruker
91e98aafd5
added polish translation stub
2011-04-21 13:50:16 +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
0b22f73095
added ukraine to countries
2011-04-06 15:03:21 +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
2711c0e9d0
french translation fix
2011-03-09 04:08:24 +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
05142ecd8c
lupdate
2011-03-08 23:22:58 +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
Milton Goncalves
b24cf8e7f1
Updated Portuguese translation
2011-03-05 18:45:31 +00:00
Thiago Queiroz
c94c72bdfa
Merge branch 'translation' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice into translation
2011-03-05 12:37:24 -03:00
Thiago Queiroz
d1fb0b58fc
Updated Brazilian Portuguese translation
2011-03-05 12:36:50 -03:00
unknown
546d286ef8
Merge branch 'translation' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice into translation
2011-03-04 22:10:33 +03:00
Alexander Davidov
dbd0a99aa8
Updated Russian translation
2011-03-04 22:10:04 +03:00
Gocho
e2431c02e8
Merge branch 'translation' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice into translation
2011-03-03 22:47:06 +01:00
Gocho
5ffe0779a0
Updated Spanish translation
2011-03-03 22:46:55 +01:00
armyfrank
3ee29fd4aa
Updated Japanese translation
2011-03-04 03:12:24 +09: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
88816ba8a3
translation update
2011-02-16 20:11:08 +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
Alexander Davidov
e6bac7b8af
Updated Russian Translation
2011-02-13 13:24:05 +03:00
Max-Wilhelm Bruker
f1fdee3dee
translation update
2011-02-12 21:11:52 +01:00
Max-Wilhelm Bruker
78e5068e39
converted phases toolbar to graphics item
2011-02-12 21:09:33 +01:00
Alexander Davidov
20194617bc
Updated Russian Translation
2011-02-11 23:26:04 +03: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
fd6c27a2cd
translation update
2011-01-27 19:14:24 +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
9b9c6b94c5
renamed jp to ja
2011-01-23 19:54:00 +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
49d80a9de0
Merge branch 'translation' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice
2011-01-22 17:54:02 +01:00
Max-Wilhelm Bruker
816582e811
added icons for news categories
2011-01-21 21:24:41 +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
Army Frank
cf0271b893
updated japanese translation
2011-01-19 13:06:03 +09:00
Max-Wilhelm Bruker
ff2f9dcfcc
Merge branch 'translation' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice
2011-01-19 04:02:52 +01:00
Max-Wilhelm Bruker
cbfe0e93fa
Merge branch 'translation' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice
2011-01-19 01:44:38 +01:00
brukie
dc0f21cce4
Threaded picture caching
2011-01-19 00:16:41 +01:00
Thiago Queiroz
6391fac8e9
Merge branch 'translation' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice into translation
2011-01-18 21:04:27 -02:00
Thiago Queiroz
3ea56085a4
Updated Brazilian Portuguese translation
2011-01-18 21:03:51 -02:00
Milton Goncalves
0131ebd37c
updated portuguese pt translation
2011-01-18 20:21:55 +00:00
Milton Goncalves
97a1a96bd8
Merge branch 'translation' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice into translation
2011-01-18 15:42:20 +00:00
Milton Goncalves
7324374d9b
updated portuguese translation
2011-01-18 15:38:23 +00:00
Gocho
accb388ed6
Updated Spanish translation
2011-01-18 15:31:09 +01:00
Max-Wilhelm Bruker
2013ba3460
Translation update
2011-01-15 22:46:45 +01:00
Max-Wilhelm Bruker
c1eeb31827
Merge branch 'translation' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice
2011-01-15 21:46:31 +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
Milton Goncalves
a4459847c0
Merge branch 'translation' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice into translation
2011-01-07 15:19:23 +00:00
Milton Goncalves
0f38ce2fbd
Updated Portuguese translation
2011-01-07 15:18:40 +00:00
Thiago Queiroz
101a70fd4e
Added Brazilian Portuguese translation
2011-01-05 07:09:32 -02:00
Thiago Queiroz
2d45f883a5
Merge branch 'translation' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice
2011-01-05 06:32:40 -02:00
Thiago Queiroz
9c30e09e9e
Added Brazilian Portuguese translation
2011-01-05 06:32:05 -02:00
Army Frank
6540e25d75
Updated Japanese translation
2011-01-05 11:20:38 +09:00
Army Frank
a1028e927a
Merge branch 'master' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice into translation
2011-01-05 08:42:03 +09: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
571cf91e00
translation update; made server status update optional
2011-01-03 21:50:12 +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
Thiago Queiroz
07cb65b209
Added Brazilian Portuguese translation
2011-01-03 00:17:39 -02:00
Max-Wilhelm Bruker
80277ff573
rooms work mostly
2011-01-02 16:13:07 +01:00
Max-Wilhelm Bruker
d8d4563292
initial commit for rooms
2010-12-24 02:21:00 +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
0440fb2eff
changed brazilian flag
2010-12-10 15:44:54 +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
f2473be502
added flag for philippines
2010-12-06 01:43:14 +01:00
Max-Wilhelm Bruker
9410ea133a
crash fix
2010-12-04 21:01:59 +01:00
Max-Wilhelm Bruker
2d8c58e682
added portugese flag
2010-12-01 18:24:12 +01:00
Max-Wilhelm Bruker
7bd85641f1
added norwegian flag to resources
2010-12-01 18:00:03 +01:00
Max-Wilhelm Bruker
3f1177f65f
added norwegian flag
2010-12-01 17:59:34 +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
4387f05ffa
Merge branch 'master' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice
2010-11-17 23:26:17 +01:00
Max-Wilhelm Bruker
6b241ed6cd
updated spanish translation
2010-11-17 23:26:07 +01:00
Milton Goncalves
f5c2872ef9
Portuguese translation finished
2010-11-17 14:16:30 +00:00
Max-Wilhelm Bruker
c6bba6440f
empty french translation added
2010-11-17 14:32:19 +01:00
Max-Wilhelm Bruker
754c67fd7c
initial commit for french translation
2010-11-16 19:47:55 +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
d5577e6905
german translation fix
2010-11-13 19:34:24 +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
9285a3952c
translation update
2010-10-08 15:01:57 +02:00
Max-Wilhelm Bruker
db2c2d1b15
card tap/untap animation; misc fixes
2010-10-07 17:18:15 +02:00
Max-Wilhelm Bruker
dccb352b9e
spanish translation update
2010-09-28 00:20:39 +02:00
Max-Wilhelm Bruker
d7d7caf426
translation update
2010-09-27 17:24:53 +02:00
Max-Wilhelm Bruker
ed62cee0cc
spanish translation fix
2010-09-26 16:50:37 +02:00
Max-Wilhelm Bruker
968d765270
Spanish translation by Gocho
2010-09-26 14:57:23 +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
unknown
a0cac4f464
Included uninstaller for Windows version
2010-09-17 15:26:07 +02:00
Max-Wilhelm Bruker
8e9bbf3581
Merge branch 'master' of ssh://cockatrice.de/home/cockgit/cockatrice
2010-09-15 21:49:26 +02:00
Max-Wilhelm Bruker
7e9879c0ea
Included SFMT RNG
2010-09-15 21:48:52 +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
Alexander Davidov
d0fa9d92a7
Updated Russian translation
2010-07-20 00:26:38 +04:00
Max-Wilhelm Bruker
cbfbc542e7
disallow dropping a card onto another
2010-07-17 23:37:22 +02:00
Alexander Davidov
5408563adf
Updated Russian translation
2010-07-18 01:19:32 +04:00
Victor Martinez
240d9b8ffd
Merge branch 'translation' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice into translation
2011-07-16 11:39:11 +02:00
Victor Martinez
efadad6212
Updated Spanish translation
2011-07-16 11:38:57 +02:00
armyfrank
bbd9cc9ea6
Updated Japanese translation
2011-07-14 16:29:48 +09:00
Milton Goncalves
f1773a213a
updated portugese translation
2011-07-12 23:20:32 +01: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
df4af668a5
translation
2010-06-18 21:11:36 +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
7c5d18e219
translation update
2010-06-03 17:49:57 +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
0d63bb7316
changed some phase button icons
2010-05-10 18:05:04 +02:00
Max-Wilhelm Bruker
93e31aeab8
translation update; windows installer code
2010-05-08 23:50:58 +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
1232136730
Merge branch 'testing' of ssh://cockatrice.de/home/cockgit/cockatrice into testing
2010-03-04 19:16:04 +01:00
Max-Wilhelm Bruker
aab16cbd96
added icon
2010-03-04 19:15:45 +01:00
Max-Wilhelm Bruker
0db3ff6819
updated icon; small bugfix
2010-03-04 17:39:38 +01:00
Max-Wilhelm Bruker
5fa63e553d
added icons
2010-03-04 16:55:48 +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
5d6652f5de
translation fix
2010-02-04 17:35:19 +01:00
Max-Wilhelm Bruker
c6596aab19
translation fix
2010-02-04 16:33:36 +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
b4f80a80ef
added icons
2009-12-20 16:44:10 +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
3776b24006
updated icon
2009-12-19 20:51:22 +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
63f9206eb4
fixed icon
2009-11-20 21:15:50 +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
d3114fafbf
decklist transfer code
2009-11-18 19:59:03 +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
af3b951faf
translation
2009-10-18 00:03:48 +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
381bd4dfce
icons bla...
2009-10-13 22:39:19 +02:00
marcus
6e5c859b3b
Deckeditor icon colorfix
2009-10-13 22:32:07 +02:00
marcus
0c16a90fa2
new Icons for Deckeditor
2009-10-13 21:47:44 +02:00
marcus
8a9726482f
qrc file updated
2009-10-13 21:24:23 +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