Commit graph

85 commits

Author SHA1 Message Date
Fabio Bas
f6c7f3355f Reimplemented PictureLoader as a singleton
* Removed remaining picture handling from card database and cardinfo
 * removed the “noCard object” hack
2015-09-22 23:09:53 +02:00
woogerboy21
87a64da1bc Added chat history to a room that is displayed on join.
With this update a new chat history definition is added on a per
room bases which allows operators to specify the number of chat
messages to store and present to the user on join.  Please see
the sample ini for room definitions.
2015-09-14 17:54:04 -04:00
Fabio Bas
85aa866e02 sound themes 2015-09-13 02:01:50 +02:00
Fabio Bas
50aa6e3a4d Fix autoconnect 2015-09-08 08:37:19 +02:00
woogerboy21
044c2356ff Added server/client feature set communication 2015-09-02 17:54:06 -04:00
marco
baa61d0571 Merge branch 'master' into Refactor-settings
Conflicts:
	oracle/CMakeLists.txt
2015-09-01 21:28:53 +02:00
Fabio Bas
5cfb034452 merged with master 2015-08-31 22:48:14 +02:00
marco
4125d690fa Fix merge & relative path for portable build 2015-08-25 20:22:31 +02:00
marco
be7efa98cf Fix relative path for image download & settings 2015-08-23 15:54:52 +02:00
Jeff
ca82fd867a Option to opt-out of remember game settings 2015-08-22 15:52:03 -04:00
marco
c8d59eec5e Refactred settings to use settingscache & ini files 2015-08-22 01:05:15 +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
marco
e9e75961f4 Redesigning deck editor to work with docks
Moved setting files & Added code for a future portable build
2015-08-07 23:44:40 +02:00
woogerboy21
52db13a1ca Initial release of client ID generation. 2015-08-05 10:15:49 -04:00
woogerboy21
8c7301b19f Updated server and client ping to 5 seconds. Also changed hard set 1 second value on the ping timers to read values from the settings cache. 2015-07-29 23:44:00 -04:00
Zach H
475c54bfe1 fix 1032 merge conflicts 2015-07-27 00:01:05 -04:00
Fabio Bas
2e3e6c55ff Updated with latest changes from #1243 2015-07-14 09:19:07 +02:00
Zach H
97f298452e first fixes 2015-07-12 11:00:11 -04:00
Zach H
dc05a14f4c Highlight Custom Words 2015-07-11 22:46:00 -04:00
Fabio Bas
68e176cc00 Add an option to annotate tokens from card text (default off); fix #241 2015-07-07 19:19:58 +02:00
Fabio Bas
15998fb3e6 Misc fixes 2015-07-05 22:44:35 +02:00
Fabio Bas
872177a5ed Card images blacklist; changed fallback urls 2015-06-23 15:44:43 +02:00
ctrlaltca
8cf0c3beed Merge pull request #1141 from ZeldaZach/hq_options2
Allow Custom Download URL
2015-06-16 09:02:20 +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
45c2e6f646 Allow Custom HQ URL 2015-06-15 01:03:41 -04:00
Fabio Bas
3af5804073 Reworked deck editor 2015-06-13 20:37:51 +02:00
Fabio Bas
924337ee93 revert 0b4701c42f 2015-05-14 15:36:44 +02:00
Matt Lowe
c64eeb4ebe Added sound settings page
+ added sound setting page
+ added sound setting icon
+ moved sound settings from interface settings

Added master volume

+ added master volume slider.
+ volume can be changed by sliding bar or by using the spin box
+ Preview of  volume will be played when dragging and releasing bar.

Added checks for qt4

Qt4 does not have support for setting the volume without some lengthy
work around, I have disabled volume control for qt4 users and have
mentioned that "Master volume requires qt5".

Updated sfx

+ removed all old sfx
+ added new end step and tap sound
+ tap/endstep sound has a timer on it to prevent spamming
+ test sound engine will now use endstep sound

Made end step sfx softer

end step felt too harsh

Added player joined sound

+ added a sound for when a new player joins a room

Updated

Was missing a sound when a player joins

Made end step softer

Made end step even softer

updated sound again
2015-05-06 12:47:48 +02:00
Matt Lowe
a082fbcfef Left hand justification
Set to false by default, let me know if you think it should be true.

As all cards are played to the left of the screen this feels more
comfortable to use as you dont need to keep looking at different areas
of the screen.

Will auto rearrange when changed during game-play.
2015-04-02 12:49:06 +02:00
Fabio Bas
839da83d2c Remove deck brew by ZeldaZach 2015-03-26 23:08:53 +01: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
441cb4447a Added optional card scaling setting
+ Users can now enable/disable the mouse over card scaling.
2015-03-18 13:37:06 +01:00
Gavin Bises
11bd2444d8 Do not alert the application for game events when spectating.
Add a configuration toggle to enable alerts when spectating.

Default behavior is to not alert.
2015-02-20 20:29:36 -05:00
Matt Lowe
64b8ed1e21 Increased default pixmap cache 2015-02-12 14:07:21 +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
Gavin Bises
32c6635137 Add settings interface for ignoring unreg pm 2015-02-01 12:05:04 -05:00
Matt Lowe
3f2c570075 fixed conflict 2015-01-30 19:23:04 +01: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
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
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
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
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
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
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
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
Fabio Bas
dd88476796 Changed parameter name to something more meaningful 2014-12-27 15:02:20 +01:00
Fabio Bas
b96104bed4 Expose QPixmapCache's cache limit size as an user preference 2014-12-24 16:16:34 +01:00