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

174 commits

Author SHA1 Message Date
Fabio Bas
af3b4ded22 Update translations 2016-04-25 18:45:24 +02:00
Fabio Bas
2e7298d064 Fix english language in options 2016-04-08 19:34:28 +02:00
Fabio Bas
4d7795ca3a Split pictuloader out of carddatabase 2015-12-26 16:40:17 +01:00
tooomm
bc44f8ce2a link renaming 
-`Linking FAQ` --> `How to set a custom picture url`
-updated define accordingly
 2015-11-17 16:04:29 +01:00
Zach
d5adec53a2 Revert "Reimplemented PictureLoader as a singleton" 2015-09-23 03:17:33 -04:00
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
a6bc709583 merged master 2015-09-13 19:39:42 +02:00
Fabio Bas
85aa866e02 sound themes 2015-09-13 02:01:50 +02:00
Fabio Bas
00e3e63f41 Themes: remove all hardcoded extensions 2015-09-13 00:14:36 +02:00
Zach
226a8cc017 Merge pull request #1498 from ctrlaltca/sound_whatever 
Reworked SoundEngine overhaul
 2015-09-12 00:35:20 -04:00
Fabio Bas
a06c7b2f9d Rework the sound engine to use QSound 
plus misc fixes
 2015-09-11 00:43:22 +02:00
Fabio Bas
b2f855aeb0 fix settings icon spacing 2015-09-10 23:37:16 +02:00
Jeff
badbcf2753 Fix sound test button 2015-09-09 16:47:09 -04: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
6d7baec37b Merge with master 2015-08-31 22:55:46 +02:00
Fabio Bas
5cfb034452 merged with master 2015-08-31 22:48:14 +02: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
marco
beaa4e9383 Configurable shortcuts 2015-08-16 13:46:57 +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
Fabio Bas
6dfd2e65f6 Fix "Linking FAQ" url 2015-08-01 08:07:47 +02:00
Fabio Bas
ef831d2749 Reworded settings sentence 2015-07-15 22:44:24 +02: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
Zach H
89f1298a48 change wording 2015-06-15 16:47:02 -04: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
45c2e6f646 Allow Custom HQ URL 2015-06-15 01:03:41 -04:00
Matt Lowe
f1703ed0ad Cleanup 
+ Removed todo
+ linked test sound to the player joined sound
 2015-05-12 19:25:49 +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
74f140ade8 removed qfont import 2015-04-23 23:06:21 +02:00
Matt Lowe
637bd767bb Updated to use svgs 2015-04-23 22:43:24 +02:00
Matt Lowe
1ab2ba3f6f Updated + / - buttons 
+ moved to the left to make it easier to move from buttons to macros
+ changed buttons to + / -
+ made buttons a bit bigger
 2015-04-23 18:42:49 +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
Zach H
2aadf09347 fix double popup on delete pics 2015-03-30 16:55:57 -04: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
5fc28e31a6 Disable spec notification toggle if notifications are off on dlg create 2015-02-20 21:36:18 -05:00
Gavin Bises
1562c234ca Add spec notification toggle to UI settings. 2015-02-20 20:57:22 -05: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
26fa936347 Add settings page option to ignore unreg user pm 2015-02-01 12:14:25 -05:00
Matt Lowe
75f8ecd6e9 Added label 2015-01-30 13:06:09 +01: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
Fabio Bas
29190708c3 Fix merge botch 2015-01-29 14:11:15 +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
931b420323 Merge pull request #556 from poixen/settings_dlg_refactorings 
Refactored Settings Tab
 2015-01-20 11:39:25 -05:00
Matt Lowe
b41d64615d Added "Chat settings..." shortcut to chat cog 2015-01-20 15:35:16 +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
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
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
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
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
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
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
Fabio Bas
2d932c68de Fixed translation for "clear downloaded pictures" button 2014-12-26 14:48:58 +01:00
Fabio Bas
b96104bed4 Expose QPixmapCache's cache limit size as an user preference 2014-12-24 16:16:34 +01:00
Zach H
a44b7367be removing blp pricing 2014-12-05 21:26:41 -05: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
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
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
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
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
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
53d2b82e61 Use picUrl templates to download cards. 
Add HQ card option
 2014-06-21 01:12:47 -04:00
Matt Kelly
1bc48a7849 Convert rest of source to 4-space indent 2014-02-11 11:14:19 -05: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
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
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
089d082cf4 moved translations out of resources file 2012-04-22 18:14:17 +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
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
a1bcd9854f preliminary client-side replay support, works in principle 2012-02-21 00:09:03 +01:00
a b
50e85496fa Mac weirdness workaround 2011-10-12 18:53:02 +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
5e3db65846 added deck editor icon 2011-06-22 18:55:03 +02:00
Max-Wilhelm Bruker
6226e381de price tag feature by Marcio Ribeiro 2011-06-16 16:43:01 +02:00
Max-Wilhelm Bruker
c67bc65762 preliminary sound support 2011-05-21 22:55:08 +02: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
a77dc1ff8c abolished economical layout, improved stacking 2010-12-16 02:07:35 +01:00
Max-Wilhelm Bruker
b7e97103e2 added zone bg setting for stack 2010-11-03 21:42:08 +01:00