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

1626 commits

Author SHA1 Message Date
Zach
059a62a00d Merge pull request #689 from Cockatrice/fix-688 
Fix #688. Reuse chat tabs when user opens more chat with same user
 2015-02-04 20:54:26 -05:00
Gavin Bises
f22e42428c Fix #688. Reuse chat tabs when user opens more chat with same user 2015-02-04 20:34:11 -05:00
Gavin Bises
6e5f4d1f06 Merge remote-tracking branch 'origin/master' into jo-remove-name-filters-from-settings 2015-02-04 20:15:41 -05:00
Gavin Bisesi
78aa291734 Merge pull request #687 from poixen/base_mention_color 
Changed default mention/username color
 2015-02-04 19:10:10 -05:00
Matt Lowe
cf26127dc4 Changed default mention/username color 
#A6120D
Dark blood red, less "pink" that the current.
 2015-02-05 00:28:22 +01:00
Gavin Bisesi
6d499bdad2 Merge pull request #685 from poixen/mentions_in_om 
Added click mentions to PMs
 2015-02-04 18:18:08 -05:00
Matt Lowe
ef607eeb4c Added mentions to PMs 
+ adds client wide continuity
+ one day we might have multiuser pms
+ I use it when greeting users who pm me: "hello @username!"
 2015-02-04 17:13:52 +01:00
Gavin Bisesi
37a05eb731 Merge pull request #671 from kaiserfro/jo-reduce-whitespace-from-game-description 
Reduce the game descriptions whitespace.
 2015-02-04 10:18:23 -05:00
Matt Lowe
f7f651338b Updated deck editor buttons 2015-02-03 23:35:18 +01:00
Gavin Bisesi
25cc695190 Merge pull request #672 from ctrlaltca/deckstats 
Fixed "analyze on deckstats"; Fix #662
 2015-02-03 10:30:28 -05:00
Matt Lowe
787773e949 Chat has focus when starting game 
When the game starts the line edit now has focus immediately.
 2015-02-03 13:53:18 +01:00
Fabio Bas
7ce9d3749e Fixed "analyze on deckstats"; Fix #662 
Plus: added support for deck name
 2015-02-03 08:48:20 +01:00
Jeffrey Oliver
bd39d60388 Reduce the game descriptions whitespace. 2015-02-02 20:59:46 -08:00
Gavin Bises
975c5e0db3 Show password protected games by default 2015-02-02 19:14:23 -05:00
poixen
b7521bad8b Merge pull request #620 from poixen/mention_punctuation 
Check for non-characters
 2015-02-02 21:45:02 +01:00
poixen
4c418bc9b4 Merge pull request #654 from poixen/chat_buddy_stars 
Buddy stars
 2015-02-02 17:55:14 +01:00
Gavin Bises
82ca261ec8 Merge remote-tracking branch 'origin/master' into mention_color 
Conflicts:
	cockatrice/src/dlg_settings.cpp
	cockatrice/src/dlg_settings.h
 2015-02-01 13:29:50 -05:00
Zach
a08fc0461f Merge pull request #660 from Cockatrice/ignore-unreg-pm 
Ignore unreg pm
 2015-02-01 13:17:03 -05:00
Gavin Bises
26fa936347 Add settings page option to ignore unreg user pm 2015-02-01 12:14:25 -05:00
Gavin Bises
5222183ff3 Don't open new PM windows from unreg when ignoring unreg pm 2015-02-01 12:05:29 -05:00
Gavin Bises
32c6635137 Add settings interface for ignoring unreg pm 2015-02-01 12:05:04 -05:00
Matt Lowe
42c4f4a08c Fixed pile view bug 
When sorting a view which has the last column the longest an error
happens where the view is squashed.
 2015-02-01 00:31:25 +01:00
Matt Lowe
d57a6111aa Buddy stars 
Buddies will now be seen as stars in the chat
 2015-01-31 17:11:17 +01:00
Matt Lowe
3f2c570075 fixed conflict 2015-01-30 19:23:04 +01:00
Matt Lowe
d065236ce9 Added separator 
Its been annoying me for a long time.
 2015-01-30 13:57:16 +01:00
Matt Lowe
75f8ecd6e9 Added label 2015-01-30 13:06:09 +01:00
Zach H
b608d81037 Merge branch 'fix-deck-shuffle-check' 2015-01-29 21:10:34 -05:00
Gavin Bisesi
a8fcd9ec26 Merge pull request #623 from Cockatrice/country-code 
Add country code to user info box.
 2015-01-29 20:27:19 -05:00
Gavin Bises
d0f4d96d17 Don't store shuffle zone check - always check it 
It doesn't make any sense to store that particular setting
 2015-01-29 20:06:15 -05:00
Gavin Bises
6f50266931 Uppercase country code for text display, not flag filename generation 2015-01-29 20:01:48 -05:00
Matt Lowe
de38a294b5 Updated color setting 
+ live preview added
+ will now only store the color if valid
 2015-01-30 01:54:57 +01:00
Matt Lowe
ec8a2de2eb Chat mention color 
+Chat mention / username color can now be set via hex in the settings
+ Users can invert the color of the mention text black/white
+ if an invalid color is provided, the default will be used
 2015-01-30 00:48:50 +01:00
Gavin Bises
6fa34c6c04 Add cmc to card db filter model 2015-01-29 13:33:06 -05:00
Gavin Bises
7893ab086f Fix broken cmc parsing from cards.xml 
I don't know why this even compiled
 2015-01-29 13:32:17 -05:00
ctrlaltca
a31c15c752 Merge pull request #637 from ctrlaltca/fix_cache_size 
Refix #558, Fix #631
 2015-01-29 14:27:36 +01:00
Fabio Bas
29190708c3 Fix merge botch 2015-01-29 14:11:15 +01:00
Gavin Bisesi
dd426cbac9 Merge pull request #634 from Cockatrice/oracle-cmc 
Parse cmc from json and store in cards.xml
 2015-01-29 05:48:32 -05:00
Matt Lowe
2a78d15792 Taskbar attention when mentioned 2015-01-29 10:27:16 +01:00
Jeffrey Oliver
763d8a7919 Merge branch 'master' into jo-remove-name-filters-from-settings 2015-01-28 20:28:36 -08:00
Gavin Bises
e2fe25735b Parse cmc from json and store in cards.xml 2015-01-28 20:28:38 -05:00
Gavin Bises
1af6486d74 Capitalize country code in user info box 2015-01-28 19:03:08 -05:00
Gavin Bises
b5fbebc883 Add country code to user info box. 
People might not know all the flags
 2015-01-28 11:57:17 -05:00
Matt Lowe
78edb8c661 Check for non-characters 
now checks for non characters, so a mention s like "@username!" will now
work.
Requires some testing though, there are a lot of scenarios to check for.
 2015-01-28 13:27:45 +01:00
Gavin Bisesi
739ca6a02e Merge pull request #607 from poixen/osx_fix 
Refactor pileview sorting code
 2015-01-27 20:10:54 -05:00
Jeffrey Oliver
223b38c27b Add a bool to the gameselector constructor to choose whether or not we should 
load settings from saved values or use defaults.
 2015-01-27 12:40:13 -08:00
Gavin Bisesi
8be659ba47 Merge pull request #616 from ideocl4st/korean-translation-150128 
Updated Korean Translation
 2015-01-27 13:17:04 -05:00
Gavin Bisesi
c20b1747bd Merge pull request #615 from ideocl4st/249-country-flags-svg 
New flag images for 249 countries with ISO 3166 codes
 2015-01-27 12:24:04 -05:00
Jaeic Lee
a94cc1c77c Updated Korean Translation 
Added new strings
Changed all instances of ‘zone’ based on oracle text of Torrent
Elemental
Changed all instances of ‘registered users’ into more commonly used term
 2015-01-28 01:57:10 +09:00
Jaeic Lee
b7dd64d333 Flag images for 249 countries with ISO 3166 codes 
From https://github.com/joielechong/iso-country-flags-svg-collection.
(States that flag images are public domain)
 2015-01-28 00:08:14 +09:00
Gavin Bisesi
93cf7dbaaf Merge pull request #609 from poixen/chat_mention_fixes 
Chat mention fixes
 2015-01-27 06:30:20 -05:00
Matt Lowe
3c0aca70e0 Updated method name 
+ updated method name
+ added some doc
 2015-01-27 10:55:52 +01:00
Gavin Bisesi
62c4c0f4eb Merge pull request #597 from ideocl4st/tweak-hand-context-menu 
Submenus for moving all cards in a zone to another
 2015-01-26 20:33:17 -05:00
Jaeic Lee
bfc1bd04b5 Added separators 
Looks better imo.
 2015-01-27 09:54:11 +09:00
Matt Lowe
639cbefee0 Chat mention fixes 
+ fixed some issues with highlighting entire line
+ added case insensative mentions
 2015-01-27 00:43:11 +01:00
Matt Lowe
b89535f7ff Refactored code 2015-01-26 22:19:00 +01:00
Jaeic Lee
c6800c48d2 More ellipsis 
Should be the last of them
 2015-01-27 03:32:58 +09:00
Jaeic Lee
46fb5f820e Tweaked some texts 
Per Daenyth’s request
 2015-01-27 03:14:52 +09:00
Zach H
627624a9c9 adding more flags 2015-01-26 11:57:28 -05:00
Zach
613f7717ab Merge pull request #595 from poixen/shufflefix 
Fixed shuffle issue
 2015-01-26 10:24:55 -05:00
Gavin Bisesi
ceead6b9e3 Merge pull request #593 from poixen/other_user_mention_option 
Removed other user mention BG
 2015-01-26 07:18:24 -05:00
Gavin Bisesi
ffb5ac6b9a Merge pull request #599 from poixen/removed_unused_connect 
Removed a connection
 2015-01-25 15:31:26 -05:00
Matt Lowe
c0aafec907 Removed a connection 
This isnt being used anymore
 2015-01-25 12:15:53 +01:00
Matt Lowe
02277b2442 Removed other user mention BG 
Due to feedback, I have removed the background color for other user
mentions. I think this looks cleaner, and doesnt require an additional
option.
 2015-01-25 09:44:07 +01:00
Jaeic Lee
cc14e3cfc6 Submenus for moving all cards in a zone to another 2015-01-25 11:34:51 +09:00
Gavin Bisesi
2a6291dcde Merge pull request #592 from poixen/tap_animation 
Faster tapping speed
 2015-01-24 21:21:31 -05:00
Matt Lowe
ec198c33ca Fixed shuffle issue 
when closing a view we save the current settings. I added a check to
only update the shuffle settings if the zone we are closing can be
shuffled.
 2015-01-25 00:34:41 +01:00
Matt Lowe
359391acba Fix for #557 2015-01-24 23:59:53 +01:00
Matt Lowe
e409d96bb9 Faster tapping speed 
+ Feels better with a little more speed
 2015-01-24 23:01:10 +01:00
Jeffrey Oliver
d96e566411 Add back in the games description filter storage. 2015-01-23 20:53:21 -08:00
Zach
712f12a7a6 Merge pull request #587 from ZeldaZach/return_align_fix 
adding return
 2015-01-23 12:08:18 -05:00
Zach H
22a1bcdf60 adding return 2015-01-23 12:07:53 -05:00
Zach
dac5726dab Merge pull request #504 from ctrlaltca/local_scry_and_move 
Specify the player when triggering a move on a revealed card
 2015-01-23 10:14:05 -05:00
Jeffrey Oliver
cc75210ac6 Removed the loading and saving of the user name and game description 
from the persistent filter settings.
 2015-01-22 20:39:28 -08:00
poixen
b06b81895b Merge pull request #580 from poixen/room_user_level 
Updated game view
 2015-01-22 23:26:14 +01:00
Matt Lowe
8fdaadf462 refactorings #3 
removed const from enum
 2015-01-22 22:37:49 +01:00
Matt Lowe
86bbf75ddd refactorings #2 
+ removed static from enum
+ removed condition check for user level
 2015-01-22 22:23:21 +01:00
Matt Lowe
8ac58259b4 Refactorings 2015-01-22 22:05:08 +01:00
Matt Lowe
1406a27775 Updated game view 
+ removed password column
+ added a lock svg to restrictions if pw is needed
+ added "password" to restrictions if pw is needed
+ added user pawn to creator tab
+ reformatted code for easy adaptation later
 2015-01-22 21:35:52 +01:00
poixen
71a067030d Merge pull request #578 from poixen/user_chat_mentions 
User chat mentions
 2015-01-22 21:04:30 +01:00
Matt Lowe
497fed6b15 Updated colors 2015-01-22 12:39:24 +01:00
Matt Lowe
0334fe3c8f Other mentions -- DRAFT -- 
Mentions about other players currently in the room will be highlighted.
They are also clickable for mentions and right clickable for context
options.
 2015-01-22 09:32:56 +01:00
Jaeic Lee
7128f481b9 Small tweak due to fixing spelling mistake 
cleaned up vanished transitions in the mean time.
 2015-01-21 16:50:59 +09:00
Jaeic Lee
5c7ce8ffb7 Merge remote-tracking branch 'upstream/master' into korean-translation 2015-01-21 16:46:32 +09:00
Matt Lowe
fd2b34278f Fixed spelling mistake 2015-01-21 07:50:20 +01:00
Jaeic Lee
31ad9b779a Updated Korean Translation 2015-01-21 12:38:51 +09:00
Matt Lowe
b9c537bf47 Moved "Ignore messages from unregistered users" 
Relocated to the chat settings tab.
 2015-01-20 20:02:36 +01:00
Gavin Bisesi
6dfaa81a53 Merge pull request #561 from poixen/chatnamehighlight 
Username block highlighting
 2015-01-20 12:35:41 -05:00
Gavin Bisesi
fa8bcccaaa Merge pull request #549 from poixen/cardviewlist 
Sortable card views can now be split into pile types
 2015-01-20 12:15:19 -05:00
Gavin Bisesi
931b420323 Merge pull request #556 from poixen/settings_dlg_refactorings 
Refactored Settings Tab
 2015-01-20 11:39:25 -05:00
Gavin Bisesi
10aa137475 Merge pull request #562 from poixen/chat_click_mentions 
Click tag mentions
 2015-01-20 10:06:04 -05:00
Matt Lowe
b41d64615d Added "Chat settings..." shortcut to chat cog 2015-01-20 15:35:16 +01:00
Matt Lowe
222105be61 Added functionality in game 2015-01-19 21:29:15 +01:00
Matt Lowe
041e91412d Switch Statement 2015-01-19 08:33:28 +01:00
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