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

67 commits

Author SHA1 Message Date
Fabio Bas
5cfb034452 merged with master 2015-08-31 22:48:14 +02:00
Jeff
05f2bc8392 Fix Conflicts 2015-08-20 22:27:46 -04:00
Jeff
e9bad2cacb Merge branch 'master' into fix_1387 
Conflicts:
	cockatrice/CMakeLists.txt
	cockatrice/src/tab_game.h
	cockatrice/src/tab_room.cpp
 2015-08-20 22:23:47 -04:00
marco
c6aba5a6d0 Renamed file + reduced window size + resfresh on change 2015-08-20 20:23:08 +02:00
Jeff
a64ea17357 Add LineEditCompleter to Tab_Game 2015-08-19 18:46:08 -04:00
marco
d3d6f70496 Removed 2nd arg from ShortcutsSettings::getShortcut 2015-08-16 21:53:59 +02:00
marco
be82472f35 Merge branch 'master' into Customizable-shortcuts 2015-08-16 14:01:48 +02:00
Jeff
50d67467dc Username Completer in server room 
Adds QCompleter in server room and a setting to enable/disable it.
 2015-08-13 23:51:39 -04:00
marco
b0bf94e378 Shorcut read from settings 2015-08-09 12:16:52 +02:00
Fabio Bas
f17dec29f6 Reorganized images in subfolders 
As per @daenyth’s comment:
https://github.com/Cockatrice/Cockatrice/pull/792#issuecomment-76593730
 2015-06-15 14:37:19 +02:00
Fabio Bas
6b8ebe54e9 Theme manager 
This is the first implementation of a theme manager. It’s a rebased and
revisited version of #792.
 2015-06-15 14:35:58 +02:00
Zach H
9be29641b0 apply QKeySequence & remove unnecessary tr 2015-04-14 17:17:01 -04:00
Matt Lowe
6b307469fe Fixed issue with clicking on PM bubbles 
Previously would not open the client if the window was minimized.
Added the same popup fix for mentions
 2015-04-07 23:32:13 +02:00
Matt Lowe
b20ae9710c Mention popup fix 
+ will now only popup with a mention alert when you are not on the same
tab/window.
+ will also no longer popup by mentioning yourself
 2015-04-05 12:43:02 +02:00
Matt Lowe
81a8141fe5 Added system tray icon 
+ Can be used for setting client size and closing the client.

Will expand on by sending client alerts to the tray.

Updated to push message notifactions to the toolbar

Preview image:

Added setting to enable/disable message popups

Added functionality

+ updated popup message and translation
+ Double clicking tray icon will now bring up the app/minimize it
+ can now be alerted of mentions
+ added setting to set if you want mentions on desktop
+ clicking mention message will take you to the main chat
+ added translations for icon menu
+ removed maximize/minimize/restore from menu, not needed.

Added disconnect

+ Disconnects any previous message slots/signals from the system icon
message bubble
 2015-03-26 18:37:57 +01:00
Matt Lowe
e0839db648 Updated chatview texts 
This is enforcing a new client wide color scheme.
RULES
+ Green = Major server message (Welcome to chat room, change phase...)
+ Red = Minor server message (timestamps, game actions...)
+ Blue = Key word
+ Blue with modifier (underline/italics) = Keyword that can be
interacted with.
+ Black = User text

+ key numbers are now blue. player drew X cards, looks at the top X
cards, places X counters on . . . and so on.
+ card names are now italic (different from urls now)

I did have the player names set to blue also, but it felt like too much.

Player names in phase change are blue

Updates

+ Updated username colors in phases to match other areas of client

Small update

+ Made server message in chat room bold
+ made User names in chat/pm match the weight of in-game (consistancy)
 2015-03-25 13:16:22 +01:00
Matt Lowe
697358e484 Added shortcut to clear chat 
F12 will now clear the chat in the main chat.
 2015-03-15 21:13:41 +01:00
Fabio Bas
0d974914a3 Disable filters in "show user's games" dialog 
Hide filters-related buttons
Bypass the proxy model
 2015-02-08 22:35:37 +01: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
Matt Lowe
c0aafec907 Removed a connection 
This isnt being used anymore
 2015-01-25 12:15:53 +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
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
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
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
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
6f18e3692d Chat room: ensure the line input has focus when the window gets created 2014-07-03 15:57:40 +02:00
Fabio Bas
d86fa410df Chat room: ensure focus on the input line 2014-06-29 19:32:03 +02:00
Matt Kelly
1bc48a7849 Convert rest of source to 4-space indent 2014-02-11 11:14:19 -05:00
Max-Wilhelm Bruker
7cc775cb58 added missing retranslateUi calls 2012-06-25 03:03:38 +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
1cd63375ba ignore unregistered users fix 2012-04-02 00:14:43 +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
4e4a7563db The remote client now runs in an extra thread, fixing issue #29 2012-03-25 13:19:40 +02:00
Max-Wilhelm Bruker
5182820964 merged from master 2012-01-29 17:14:59 +01:00
Max-Wilhelm Bruker
d5c628966f PB: everything compiles except for deck storage 2012-01-01 02:48:24 +01:00
Max-Wilhelm Bruker
f115342e47 local mode is working again 2011-12-18 23:30:53 +01:00
Max-Wilhelm Bruker
314f17091d protobuf client->server communication almost working 2011-12-18 18:35:14 +01: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
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
unknown
b001421cfe french translation update 2011-08-25 19:19:08 +02:00
Max-Wilhelm Bruker
abd5425796 finished getGamesOfUser function 2011-07-02 16:43:19 +02:00
Max-Wilhelm Bruker
0120d2a019 cardInfoPopup fix; chatView fix 2011-06-28 02:37:49 +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
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
a3b7ed719f QSplitter in TabRoom 2011-06-13 20:04:10 +02:00