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
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
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
Matt Lowe
fd2b34278f
Fixed spelling mistake
2015-01-21 07:50:20 +01: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
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
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
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
Michael Callahan
142b42e095
Reset Always reveal top card when starting a new game.
2015-01-01 09:53:29 -07: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
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
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
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
