Commit Graph
100 Commits
Author SHA1 Message Date
Matt Lowe f1703ed0ad Cleanup
+ Removed todo
+ linked test sound to the player joined sound
2015-05-12 19:25:49 +02:00
Matt Lowe 5f27050962 flipped svg 2015-05-06 21:29:53 +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 b81ed893e1 Can now disable desktop mentions
Was not checking if the setting was enabled
2015-05-04 12:40:51 +02:00
Matt Lowe 052ce72993 Updated reveal zone check boxes
I saw in some images from other platforms it can take up alot of space.
Made the boxed horizontal, rather than vertical.
2015-05-02 21:18:02 +02:00
Matt Lowe 7ccc23f902 Moved zone loactions
I have moved the default opening positions of some of the reveal zones.

Example:

The sideboard will be in the same position as the scry and the random
card from hand will be the same as the hand view.
2015-05-02 17:52:34 +02:00
Matt Lowe 878b760321 Removed lprotobuf error on building
Will need @ctrlaltca to confirm this wont mess anything up. I have
removed a option to se set from the cmake file. This option is not
needed.

Windows users, you will need to run cmake to create the sln again.
2015-05-01 22:32:31 +02:00
Matt Lowe 95104df589 Reverted back to full punctuation
Reverted back. Right now it feels strange to only have simple search.
Really you would want both simple search AND accurate search on, though
this requires twice the checks for each result.
2015-05-01 22:26:44 +02:00
Matt Lowe 6fd5c4dd27 Only use local db if no pt is provided
Addresses issue #1032

If a token is created with no p/t then the local db value will be passed
instead. If a value is provided then that will be used instead.
2015-04-27 10:17:46 +02:00
Matt Lowe a729bb076b Fixed server shutdown crash
`serverShutdownMessageBox` was not assigned to 0 in the ctor.
2015-04-26 23:39:20 +02:00
Matt Lowe 9c1e509a37 Fixed issue with non creature perms set to 0/0
The issue was that I had set the ctor to set the p/t to 0/0 rather than
-1/-1. This meant that when you join a game in progress (spec or
reconnect) the server would send the card value to the client as 0/0,
instead of -1/-1. The client has been coded so that if the toughness is
<0 then dont show it. 0/0 is instead shown.

We still need to look into cards with no p/t being set to a 0/1 as
@tooomm mentioned in anther issue. As it stands, this is more important
than that.
2015-04-26 00:57:31 +02:00
Matt Lowe ff1aec406b Changed pt to orange
After feedback, and also noticing myself, the blue requires a little
more focus than should be nessesarry. I have updated to be orange, which
feels more comfortable. I have polled the community and they also agree
orange > blue.
2015-04-25 23:06:41 +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 66f854fe1d Changed to check every 10 mins 2015-04-23 00:26:21 +02:00
Matt Lowe e646122f55 Updated server shutdown timer logic
Will follow the following rules

+ send a message initially
+ send a message every 20 mins
+ send a message every min when time <= 5

Updated client popup

Updated client to close any previous popups and bring up a new one.

NEEDS TO BE TESTED

added missing include

Added delete on close
2015-04-22 19:14:14 +02:00
Matt Lowe 1356bbcd94 Fix for #1007 2015-04-22 16:53:07 +02:00
Matt Lowe 004a952cb4 Colored PT
I compare the card pt, to the card with the same name in the db. if the
card is found, we compare the pt, of the db item and the item in play.
If there is not a match then we change the color of the PT. This is
pretty much the same as mtgo does it.

I looked into having only the P, or the T colored, though this is not
posible, when you set a pen color you can not change it partway through
painting a string. That would require 3 strings painted, one for p, /
and t. Which is more effort than its worth. This does the job pretty
well.

I have also moved the pt slightly to the left so it lines up better. I
have some images to compate.
2015-04-22 15:02:47 +02:00
Matt Lowe 9a36ac8035 Added colored storm counter 2015-04-19 18:14:29 +02:00
Matt Lowe 86fa02c6c5 Added clear chat fix
When clearing the chat, we now clear the last sender.

This fixes the issue where you clear the chat and a user continues to
talk, you get no indication of who is talking. Now it will show the
users name.
2015-04-18 22:23:51 +02:00
Matt Lowe 2d34bfeb1b Mentions will now work with all legal chars
As the server has been updated to enforce username rules, we can now
check for the next position of whitespace. This allows ALL users to have
a working mention system. Currently "-" is available for users, this
will fix that.
2015-04-18 14:42:39 +02:00
Matt Lowe 1f9b1d78bc Double escaped "." 2015-04-17 17:47:58 +02:00
Matt Lowe bba9539229 Updated regex 2015-04-17 00:17:03 +02:00
Matt Lowe d5a1264bcb Updated server to support "."
Now uses regex.
Added "."
Updated login message
2015-04-16 23:50:05 +02:00
Matt Lowe 8938d291f8 Filter password games consistancy 2015-04-15 22:00:52 +02:00
Matt Lowe 751315a413 updated second string 2015-04-15 19:03:59 +02:00
Matt Lowe 386cbcec7f Updated username dlg message
updated
2015-04-15 14:22:56 +02:00
Matt Lowe 25dbfb37f4 Game created code improvements
+ No longer get "5hrs" and "5+ hrs" instead will be "4hrs" and "5+ hrs".
+ Refactored into an else-if with a single return.
+ removed comments
+ removed code from namespace and added to class
2015-04-15 14:18:16 +02:00
Matt Lowe 2e5ecd841c Removed check
When searching for a card the line edit will not be empty, so this check
is not needed. The performance when the line edit IS empty will take a
slight hit, but you really want additional performance when searching,
not when the line edit is empty.

Removing will increase performance.
2015-04-15 12:25:06 +02:00
Matt Lowe 778ad8dee1 Simple name searching on by default
Previously would try to match the card name, if nothing is found, then
we would try again with the simple name.

I have now made it only the simple name version. We do not need to
perform the first check. Should help a little with performance.
2015-04-14 23:30:29 +02:00
Matt Lowe 2336ee4f84 Updated invalid username dlg
Relates to #964. We want to give a the correct reason for failed logins
and display the reason why.
2015-04-14 09:59:29 +02:00
Matt Lowe 0979f8fa34 Updated return value 2015-04-13 22:09:47 +02:00
Matt Lowe 53352c5f71 Added "-" to allowed names 2015-04-13 20:51:34 +02:00
Matt Lowe b68cf51341 Added menu item to open custom image folder
Needs to be tested on mac
2015-04-13 00:30:49 +02:00
Matt Lowe bf0f3e0b44 Capitalized some text 2015-04-13 00:05:58 +02:00
Matt Lowe b9cda5e36e Updated ini 2015-04-12 23:01:29 +02:00
Matt Lowe f46d68b5c6 Server was using message limit for commands
Server was using getMaxMessageCountPerInterval over
getMaxCommandCountPerInterval.

Raised command limit from 10 to 20
2015-04-12 22:55:38 +02:00
Matt Lowe 1b165bde4c Updated context menus
+ added more separators
+ swapped some actions from lib menu (scry action now higher)
+ Added capital letters to words
2015-04-12 22:36:48 +02:00
Matt Lowe a2aad95ede Added missing checks 2015-04-12 21:52:17 +02:00
Matt Lowe 70ef95931e Restricted unreg usernames
Can now only be made up of [a-z][A-Z][0-9][-_]
2015-04-12 21:29:40 +02:00
Matt Lowe 8e61fb0bae Updated message limit from 10 -> 15
I have updated the `maxMessageCountPerInterval` from 10 to 15. This will
allow some faster play from exp users.

NOTE:
If you have an existing server and update to this version, you will need
to manually change the value in the ini file, or have no ini file to
begin with. Otherwise the old ini will load in 10.
2015-04-12 19:01:16 +02:00
Matt Lowe 379ceeeca0 Zone crash fix
Related to #808

When closing the app/game tab with a zone revealed the client will
crash. This was due to the zones not being deleted.
2015-04-12 17:39:04 +02:00
Matt Lowe 6e39cc3823 Updated grammar based on #932
Based on #932 I have added pronouns the the graveyard and hand, and also
changed "from play" to "from battlefield"
2015-04-12 17:00:43 +02:00
Matt Lowe 06accd519c Fixed main chat room lag 2015-04-11 00:49:07 +02:00
Matt Lowe 44d4a534bf Added () for || && logic handling 2015-04-10 13:31:44 +02:00
Matt Lowe 9689b8e56a Fixed token PT issue for #931
The problem was that back when I added #336 I made it so that if YOU
didnt recive the PT of the token, then it would be fetched from your
tokens.xml, the issue is that we needed to send that value to the
server. The server sees it as a 0/0

This fix will send the PT from the tokens.xml if available.
2015-04-10 13:26:38 +02:00
Matt Lowe be2a5f4720 Creatures can now have power less than -1
Addresses issue from #934
2015-04-10 12:39:41 +02:00
Matt Lowe 884579529d Fixed deck tokens showing in token dlg
Tokens from decks will now show in the token dlg window
2015-04-10 00:46:11 +02:00
Matt Lowe 4ca58eecb7 Updated token dlg
Adjusted proportions to make the table fit better.

Needs to be checked on UHD screens.
2015-04-09 18:34:21 +02:00
Matt Lowe 45542243b7 Reworked replay buttons
+ Removed unused buttons
+ remade button art
+ fixed crash with font colors/replays
+ removed unused timestamp label in replay
2015-04-09 16:05:12 +02:00
Matt Lowe 56cbae17ac added separator
Felt like areas different to the current zone should be segregated.
2015-04-09 14:44:29 +02:00
Matt Lowe a7d41a322c Added connection dlg popup on server timeout 2015-04-08 21:00:33 +02:00
Matt Lowe b27854e440 Ignore punctuation in card search
It is awkward to have to use precise punctuation when searching for
cards. Planeswalkers and legendary creatures often have "," in the name
and you have to enter it.

This commit means you no longer need to do that.

+ Can use " " in place of "-" (example: Wilt-Leaf Liege)
+ Can use "" in place of non word chars (Example: Hero's Downfall and
Ajani, Caller of the Pride)
2015-04-08 18:35:27 +02:00
Matt Lowe fbbeb12413 Added shortcut to reveal top card or lib
+ Ctrl + N
2015-04-08 13:09:00 +02:00
Matt Lowe 1c89b90cbb Fixed double click sys icon
Was an issue with double clicking the icon when the app was full screen/
fullscreen + minimized.

Now works as expected.
2015-04-08 10:12:41 +02: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 7680154395 Added more actions to server white list
I have added card moving to the white list. I was getting flood messages
when moving cards quickly in my side deck.
2015-04-07 21:49:49 +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 20bfb4d0a7 Fix for hand target casting
if you have the setting to NOT play cards to the stack enabled, it meant
that any spells (like Lightning Bolt) would be cast to the stack but no
arrow would show. This was an edge case I missed.
2015-04-03 19:02:14 +02:00
Matt Lowe 725cb2f863 Renamed userlist tab to account 2015-04-02 23:02:54 +02:00
Matt Lowe 9e6be7459d Reopen connection if socket failure
Missed from #879
2015-04-02 18:33:35 +02:00
Matt Lowe aeb63cba87 Rounder logo corner
Before:

After:
2015-04-02 14:30:41 +02:00
Matt Lowe 986eab4d40 Default to one player
I think the majority of players use this feature for
goldfishing/practicing. Defaulting to one player for convenience.
2015-04-02 13:23:39 +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 c039a3aa42 Added Mull to the whitelist
Mullling through 2 hands will give a flood warning, a user thought this
should not happen. It is very similar to drawing cards, which is in the
white list.
2015-04-01 22:08:46 +02:00
Matt Lowe a0be18ca09 Removed dev code 2015-04-01 18:33:02 +02:00
Matt Lowe e78747241d Refactored code and made lines cleaner
Before:

After:
2015-04-01 17:24:50 +02:00
Matt Lowe a873a4efa4 Fixed accidental +/- of counters
Previously if you middle click on a counter (life/mana) and then click
away, depending on the button clicked, the counter would +/-.

I have added a fix to make sure the mouse is over the counter to change
it.
2015-03-31 23:07:24 +02:00
Matt Lowe 2684397a1e Fixed order of the counters
Previously had - numbers at the top and + at the bottom.
This feels like it makes more sense.
2015-03-31 22:15:21 +02:00
Matt Lowe 5bd37e1d06 tray icon is now hidden and then removed
I noticed that sometimes I would have lots of icons in the sys tray. I
would have to mouse over them to make then be removed. This also happens
with some other programs too. I have added some code to hide() the sys
icon when the client is close, it seems to be helping with the issue.
Hard to reproduce, might also only be a windows issue.
2015-03-31 22:05:02 +02:00
Matt Lowe 5ee6229535 Cast to target from hand
Users can now target from their hand. This will cast the card and point
to the target.
2015-03-27 09:19:36 +01:00
Matt Lowe 38f0977456 Removed icon
Removed hidden layer from svg that could be seen as tm/copyrighted
content.
2015-03-26 21:10:52 +01:00
Matt Lowe 12716e43d3 Failed logins reopen login dlg
If you fail a login you are returned to the login dialog
2015-03-26 21:05:21 +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 686b215910 Updated settings chat settings cog
+ Cog was grey and always looked like it was inactive.
2015-03-26 15:40:09 +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 5218e2f710 Fix for filter
fix for #749
+ You can now search for sets using lower case: "frf", "dtk", "rtr" and
so on.
+ You now need exact matches on set short and full names. "rtr" and
"return to ravnica" will work. "return" will not work.
2015-03-19 00:55:50 +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 c05f75438b Updated card borders
+ refactored code
+ improved card border lines (black)
+ cards no longer have curved edges, this prevents card image corners
showing behind.
+ tapped cards now have better border lines
2015-03-18 13:11:30 +01:00
Matt Lowe 9205ef2912 Updated user games window size 2015-03-16 15:36:51 +01:00
Matt Lowe 39482534c0 Resized game view columns
Previously all columns were the same width, making it cramped. I have
resized them to give a better initial width.
2015-03-16 11:21:15 +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
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
Matt Lowe b91bab8356 Re-added some search and filter code
I had previously removed some filtering code that would allow users to
filter cards using our filtering tools. This functionality has now been
re-added.
2015-03-10 21:54:02 +01:00
Matt Lowe 319b5d88b2 Removed redundant constructor
Removed constructor that was not needed. Also removes annoying "error"
output when compiling.
2015-03-06 21:09:18 +01:00
Matt Lowe 71e794c0c6 Changed color of server maessges in-game
Due to an exploit of being able to mimic a die roll in a message:

"Hi all gl, hf !
username rolls a 20 with a 20-sided die."

I have changed all server messages to be colored.
2015-03-06 15:20:14 +01:00
Matt Lowe afe33be229 Updated english, reverted spanish 2015-03-04 18:05:35 +01:00
Matt Lowe b5dd7a42ce Fixed card search
Card search will now order the following way:

1. Exact match at top
2. Exact match with preceding values sorted lexically.
3. Match contained in word sorted lexically
2015-03-03 13:32:51 +01:00
Matt Lowe 8f732325b2 Updated english translations 2015-03-03 13:29:43 +01:00
Matt Lowe 4cbffc3f6d Added username to window title
While having more than 1 client open I found it hard to know which user
was which. I have added the user name to the title bar so you know who
you are logged in as.
2015-03-03 13:09:41 +01:00
Matt Lowe 9cea8e0229 Added faint black line, tilted tick more 2015-02-27 00:00:49 +01:00
Matt Lowe e4f8a499f4 Updated ready/not ready 2015-02-26 23:26:36 +01: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 f28a8b5ad1 Updated player fighting svg
+ Changed to be black
+ Made a little thicker
2015-02-19 18:09:38 +01:00
Matt Lowe 1b8c1ab9cd Updated image
Bolder outline
More defined shape
2015-02-19 17:35:12 +01:00
Matt Lowe 28aed657b3 Fixed 5+ hour issue for new games
The problem was converting a negative int to an unsigned int. This was
resulting in a value of: (2^32) - n. Meaning that the room age was
extreamly old. After 48s the delay from the server will catch up and the
time diff will be 0 rather than negative, which is why after 48s the
room will change from 5+ hours to <1 min.
2015-02-19 12:45:33 +01:00
Matt Lowe cfa54e5eb8 Updated to 48x48 2015-02-18 16:58:32 +01:00
Matt Lowe d1fa7a1075 Vacuumed defs 2015-02-12 14:45:30 +01:00