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

142 commits

Author SHA1 Message Date
marco
44fefc20c2 Fix portable on OSX 2015-09-03 19:47:07 +02:00
marco
b4c5729bf5 fix Decks, Pics replays & sounds paths on Portable build 2015-09-03 18:31:11 +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
marco
1e2d5b0693 Fix translate setting + Mod oracle to portable build 2015-08-23 14:14:11 +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
Gavin Bisesi
59568bf13c Revert "#1351 Fix" 2015-08-09 15:52:32 -04:00
woogerboy21
5fc0da6ab9 #1351 Fix 
This update address's the issue were a server with no db has only non-registered users but when creating a game will cause the dialogue to only allow the check box of "registered users only" resulting in a game that no user will ever be able to join.
 2015-08-09 15:07:30 -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
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
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
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
Matt Lowe
bf0750db20 Set download hq images to false by default 
Due to mtgimage being taken down we I have made a one time check that
will uncheck the hq image option.
 2015-03-10 22:10:50 +01:00
Zach
90880c8b7e Merge pull request #763 from poixen/pixmap_fix 
One time pixmap cache update
 2015-02-28 20:39:02 -05: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
6a91f3a976 Added hq image to check 2015-02-20 21:50:16 +01:00
Matt Lowe
c5bc3ea4dd One time pixmap cache update 
Code will now perform a one time check on starting to see if the cache
has been updated to the new 2048 default. If the update has not been set
we update. After this time if the user lowers the level, it will not
reset back to 2048 by default.
 2015-02-20 21:43:02 +01:00
Matt Lowe
3c60ac6114 Set to download HQ images by default 2015-02-11 21:38:34 +01: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 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
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
b96104bed4 Expose QPixmapCache's cache limit size as an user preference 2014-12-24 16:16:34 +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
Antony Woods
1f58f7d848 Changed 'value' to 'setValue' on line 275 2014-10-02 08:48:04 +01: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
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
d811fee2f3 Include missing qdebug 
Dunno how I missed that.

Fix #128
 2014-06-25 00:11:55 -04:00
Gavin Bisesi
65f59747c9 Merge pull request #116 from ctrlaltca/feature-cpack 
Use cpack to create osx's dmg
 2014-06-24 21:08:57 -04:00
Daenyth
e5d15e8dbc Notify deck editor when price feature setting is changed 
Ref #112
 2014-06-22 21:20:14 -04:00
Daenyth
c54f7b9245 Log on failed path copy 2014-06-22 20:14:22 -04:00
Fabio Bas
0b4701c42f OSX: Handle zonebg for first time installations 
If none of the gameboard images is set and and the user’s data
directory doesn’t contain a “zonebg” directory, create the directory,
copy contents from cockatrice’s app bundle and sets the config
accordingly.
 2014-06-22 23:42:12 +02:00
Daenyth
53d2b82e61 Use picUrl templates to download cards. 
Add HQ card option
 2014-06-21 01:12:47 -04:00
Daenyth
8281f63134 Add settings fields for pic urls 2014-06-20 22:10:26 -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
8f6de6637f don't call QAudioOutput constructor unless sound is enabled 2012-04-22 12:51:33 +02:00
Max-Wilhelm Bruker
cc516823d7 deck editor is tab, replay viewer is tab, deck editor shown by default, cache window geometry between sessions, 'open this deck in deck editor' open in game 2012-04-22 12:23:33 +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
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
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
6226e381de price tag feature by Marcio Ribeiro 2011-06-16 16:43:01 +02:00
Max-Wilhelm Bruker
9cfe4bea59 CardInfoWidget improvement by Absinthe and Hellkeepa 2011-06-13 19:15:12 +02:00
Max-Wilhelm Bruker
c67bc65762 preliminary sound support 2011-05-21 22:55:08 +02:00
Max-Wilhelm Bruker
5f46b5cd41 game tab: added splitter for manual size control of text boxes 2011-04-06 15:49:03 +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
8bd8b6218e settings dialog bug fix 2010-11-30 23:01:01 +01:00
Max-Wilhelm Bruker
bcf92fc510 changed some config defaults, added about box 2010-11-15 16:02:51 +01:00
Max-Wilhelm Bruker
df5791d318 Introduced stack zone, shrunk table to have higher zoom factor 2010-11-03 21:28:43 +01:00
Max-Wilhelm Bruker
bc7b48a7aa new table layout with inverted y coordinate 2010-10-14 17:51:36 +02:00
Max-Wilhelm Bruker
970da7d214 save minimized state of card info widget in settings 2010-10-13 15:57:49 +02:00
Max-Wilhelm Bruker
db2c2d1b15 card tap/untap animation; misc fixes 2010-10-07 17:18:15 +02:00
Max-Wilhelm Bruker
11e1202dcc Added option to customize the card back picture 2010-09-10 19:30:14 +02:00
Max-Wilhelm Bruker
f2092b89e9 correct mirroring of players when spectating 2010-05-29 17:31:16 +02:00
Max-Wilhelm Bruker
e6e20cb048 optional setting for horizonal hand display 2010-05-27 17:22:18 +02:00
Max-Wilhelm Bruker
4bf4bbea6a some fixes 2010-03-08 20:17:48 +01:00
Max-Wilhelm Bruker
26a77d9e40 new zone view code 2010-03-08 15:55:35 +01:00
Max-Wilhelm Bruker
e9a0203880 make more use of SettingsCache 2010-03-06 23:02:45 +01:00
Max-Wilhelm Bruker
2c9a8c2b57 minor cleanups and optimizations 2010-03-06 22:10:50 +01:00