Commit graph

1885 commits

Author SHA1 Message Date
Fabio Bas
ff1aed717e Added token generation, user activation command and response. 2015-05-24 00:37:45 +02:00
tooomm
8f64fd4a0b text works
fixed welcome msg
added some articles
added database phrase to card updater
cosmetic changes to the description in edit sets
2015-05-23 23:13:45 +02:00
Fabio Bas
5ace0dd892 Almost completed registration
* added missing bits of serverside code;
 * added fronted in client;
 * removed demo python scripts;
2015-05-23 20:13:03 +02:00
ctrlaltca
411fc38337 Merge pull request #1106 from ctrlaltca/fix_1105
Fix crash on server shutdown; fix #1105
2015-05-23 18:26:13 +02:00
Matt Lowe
ad6dc16f84 Fixed replay crash
Game types are only available in online games.
This is the fastest fix.
Replays now work again.
2015-05-23 16:43:35 +02:00
Fabio Bas
323537d08d Fix crash on server shutdown; fix #1105 2015-05-23 11:33:36 +02:00
poixen
43c9f4e123 Merge pull request #1100 from poixen/new_sounds
Updated sounds
2015-05-22 21:03:14 +02:00
woogerboy21
3532c31d91 Merge pull request #1098 from poixen/gui_time_limit
Increased server shutdown limit
2015-05-22 14:52:32 -04:00
Matt Lowe
4c1e24c214 fixed conflicts 2015-05-22 11:51:10 +02:00
poixen
d1b243481b Merge pull request #1086 from poixen/sounds
updated sounds
2015-05-22 11:19:50 +02:00
Matt Lowe
7ac0f6f420 Added game type to tab title
+ The game type(s) is now displayed in the tab
+ Reformatted tab title
2015-05-22 10:39:49 +02:00
Matt Lowe
085eb0f2fa Increased server shutdown limit
Added a max of 999 mins for the server shutdown to the gui.
2015-05-22 10:00:25 +02:00
Fabio Bas
227c18fc5a Fix card update under windows
It failed if the path contained spaces.
2015-05-21 21:39:51 +02:00
Fabio Bas
6af91b3d1c Ignore filename case when loading custom sets 2015-05-21 19:58:35 +02:00
Fabio Bas
ff20e04842 fixed untranslatable string, regenerated translations 2015-05-21 19:40:17 +02:00
tooomm
7db7b7fb06 expanded wording of name conflicts for tokens /2
- removed space
- fixed wording
2015-05-21 15:17:52 +02:00
Fabio Bas
4da1404a06 Translation updates 2015-05-20 19:43:52 +02:00
Fabio Bas
b566bf4a19 Load additional xml sets from $userprofile/customsets/ 2015-05-20 18:27:50 +02:00
Matt Lowe
3ac2a69b8b updated 2015-05-20 00:31:56 +02:00
Matt Lowe
5758ac685c Added untap sound
After more tinkering, it feels nice to have untap sound
2015-05-19 23:50:15 +02:00
Zach
292d730ca7 Merge pull request #1067 from tooomm/patch-1
expanded error msg for name conflicts (tokens)
2015-05-19 16:56:39 -04:00
poixen
5a516de26a Merge pull request #1078 from poixen/url
No need for [url][/url]
2015-05-19 22:43:37 +02:00
poixen
8209c59941 Merge pull request #1076 from poixen/sb_locked
Disable SB button when ready
2015-05-19 11:15:04 +02:00
Matt Lowe
af29d4529c Can now use more url types
Can now use
http://
https://
www.
2015-05-19 11:11:20 +02:00
ctrlaltca
15dd3471bc Merge pull request #1075 from ctrlaltca/fix_1070
Ensure sounds are working at startup; Fix 1070
2015-05-16 18:21:08 +02:00
ctrlaltca
25f444a5af Merge pull request #1051 from poixen/reveal_top_x
Reveal top x cards
2015-05-16 18:20:56 +02:00
ctrlaltca
262ebe3bf7 Merge pull request #1039 from ctrlaltca/update_oracle
Run oracle from inside cockatrice and improve sets handling;
2015-05-16 18:20:36 +02:00
Matt Lowe
9ce3aecd38 No need for [url][/url]
No longer need to use the [url] tags to add **HTTPS** links. I want to
only link to "secure" site by default, hence only https.

Users can still use [url] tags if they want to.

The ENTIRE chat  code needs to be rewitten, as it is just packing more
code upon code. It can be done in another PR though. This just gets the
base working feature in place.
2015-05-16 09:49:28 +02:00
Matt Lowe
f2c3045a71 Disable SB button when ready
Updated to trigger on receive rather than send
2015-05-16 08:49:38 +02:00
Fabio Bas
2299fa1ac4 Add backward compatibility for new client on old servers 2015-05-15 18:18:25 +02:00
Fabio Bas
8fba04397b All platform: at startup, ensure that a proper directory for sounds is set 2015-05-14 15:47:57 +02:00
Fabio Bas
924337ee93 revert 0b4701c42f 2015-05-14 15:36:44 +02:00
ctrlaltca
9c20811a7a Merge pull request #1071 from poixen/sounds
Cleanup
2015-05-14 15:14:36 +02:00
Fabio Bas
44800df89c Reworked the layout of "edit sets" window 2015-05-14 13:12:24 +02:00
Fabio Bas
58a5834f34 Implemented proposed changes to initial popup message 2015-05-14 12:38:30 +02:00
Matt Lowe
f1703ed0ad Cleanup
+ Removed todo
+ linked test sound to the player joined sound
2015-05-12 19:25:49 +02:00
tooomm
c541944089 expanded wording of name conflicts for tokens
added "Make sure to enable the 'token set' in 'Edit sets...' dialog to display them correctly."
2015-05-09 14:12:41 +02:00
Zach
07fcde038c Merge pull request #1065 from poixen/die_roll_parent
Connected die roll dlg to parent
2015-05-08 16:14:47 -04:00
Matt Lowe
80e53b334e Connected die roll dlg to parent
Die roll now has a logo as it is correctly connected to the parent.
2015-05-08 20:36:31 +02:00
poixen
a8c4e4439c Merge pull request #1055 from poixen/sounds
Refreshing Cockatrice Sound
2015-05-07 08:57:30 +02:00
poixen
df834183bd Merge pull request #1053 from poixen/reveal_makeover
Updated reveal zone
2015-05-07 08:54:35 +02:00
poixen
433412dee1 Merge pull request #1061 from poixen/filter_svgs
Updated filter svgs
2015-05-07 08:54:28 +02:00
Matt Lowe
5f27050962 flipped svg 2015-05-06 21:29:53 +02:00
Matt Lowe
c34718fe99 updated clear svg 2015-05-06 15:38:30 +02:00
Matt Lowe
5dfef6215c Added punctuation mark 2015-05-06 14:19:01 +02:00
Matt Lowe
6da6e5b562 Updated card loadout background 2015-05-06 14:09:27 +02:00
Matt Lowe
f2a53abcd8 Updated filter svgs
Now uses the same as in the deck editor
2015-05-06 13:25:06 +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
87d938e56b Updated hand and table color
Updated default colors, darker, more modern, slick. Great feedback from
community.
2015-05-05 23:58:36 +02:00
Matt Lowe
1e0c4cbf87 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.

WIP Remade reveal zone

+ darkened card area to eaisily see boundries
+ reverted back to using a window
+ window can be resized
+ removed fake title bar and "X"
+ moved all cards revealed slightly to the right, makes it easier to
drag-select from the left

Cleanup

Changed style to use cockatrice icon

Changed cast

from static_cast to qstyleoption_cast
2015-05-05 10:14:27 +02:00
poixen
cf24f4aa04 Merge pull request #1045 from poixen/move_reveal_location
Moved zone loactions
2015-05-04 17:09:23 +02:00
Zach
399122f49d Merge pull request #1047 from poixen/move_filter_boxes
Updated reveal zone check boxes
2015-05-04 10:47:44 -04:00
Matt Lowe
45d214aa19 Added deck size limit
Updated to use the current deck size limit
2015-05-04 16:21:59 +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
59c0834427 Reveal top x cards
Updated reveal top card to reveal top x cards
Sometimes you want to reveal more than only the top 1 card.
2015-05-04 10:49:49 +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
ctrlaltca
53f63e2801 Merge pull request #1024 from tooomm/icon_works
Icon works
2015-05-02 18:32:28 +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
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
Fabio Bas
66adeb6d75 Improve sets handling
Move the “check unknown sets” method inside the cards database, so that
it can be executed when the card database gets reloaded after a card
database update.
Additionally, show the user a welcome message the first time they run a
new cockatrice version, so that they know why they get shown the “edit
sets” window and how to hide/disable sets.
2015-05-01 18:55:14 +02:00
Fabio Bas
c356a6fc48 Run oracle from cockatrice 2015-05-01 16:38:31 +02:00
Zach
5410afbbb1 Merge pull request #1035 from ctrlaltca/fix_762
Add "play top card face down" menu entry to library; fix #762
2015-04-28 11:33:41 -04:00
tooomm
a6970d9624 svg+png updates
-updated and cleaned up cockatrice+servatrice svg's
-added old original svg's for future adjustments
-updated cockatrice+servatrice png's

ico+icns updates

-see #925 for more details
-updated svg's as source for new icon files

bmp updates

-updated svg's as source for new installer logos

cleaned up oracle.svg

cleaned up oracle.svg /2

svg updates /2

removed sensible data

`inkscape:export-filename` removed

removed sensible data

inkscape:export-filename

removed sensible data

inkscape:export-filename

removed sensible data

inkscape:export-filename

fix

fix2
2015-04-28 16:06:36 +02:00
Fabio Bas
e649535211 Add "play top card face down" menu entry to library; fix #762 2015-04-27 23:02:45 +02:00
Zach H
425790e398 Fixed incorrect zone positioning 2015-04-27 16:26:57 -04:00
Zach
1ca561dec5 Merge pull request #1033 from poixen/token_pt_fix
Only use local db if no pt is provided
2015-04-27 15:58:41 -04:00
Zach
c5ac3701ba Merge pull request #1031 from ZeldaZach/update_about_menu 2015-04-27 12:21:15 -04:00
Zach H
a15a0c0385 gavin & translate update
Add dev section

add report section
2015-04-27 11:34:53 -04: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
tooomm
f83ddf48fd cleaned up translations
removed tr() tag from hidden strings
2015-04-27 00:25:43 +02:00
Zach
f6d0b5216b Merge pull request #1027 from ctrlaltca/osx_retina_ok
Enable hidpi (retina) support under osx
2015-04-26 18:13:56 -04:00
poixen
ab28b45d68 Merge pull request #1029 from poixen/server_shutdown_fix
Fixed server shutdown crash
2015-04-27 00:12:28 +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
Zach
ecaaa9eeb8 Merge pull request #1022 from poixen/orange_pt
Changed pt to orange
2015-04-26 17:25:16 -04:00
Fabio Bas
e88bad786f Enable hidpi (retina) support under osx
* add to the application bundle a custom info.plist
 * fix a graphic glitch on the life counter
2015-04-26 22:50:59 +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
ctrlaltca
54f0706b4a Merge pull request #1019 from ctrlaltca/translations
Fetched new translations from Transifex
2015-04-24 17:23:35 +02:00
Fabio Bas
9e281f70ae Fetched new translations from Transifex 2015-04-24 17:19:46 +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
woogerboy21
924dd174e3 Merge pull request #1010 from poixen/server_shutdown_warnings
Updated server shutdown timer logic
2015-04-23 10:59:32 -04: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
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
Fabio Bas
7e56c5a9c6 Added translation fix missing from #1001 2015-04-22 11:10:14 +02:00
Fabio Bas
629f48e2ff Permit translation in "game created" column; Fix #999
Also, extracted the 2 new strings
2015-04-22 09:12:38 +02:00
Fabio Bas
af3a3239fb Updated translations 2015-04-21 14:49:50 +02:00
ctrlaltca
4a36be84a8 Merge pull request #985 from ctrlaltca/sets_rebased
Rework the way sets selection/importing works; fix #539 (rebased)
2015-04-21 14:46:51 +02:00
poixen
2902d8575e Merge pull request #983 from poixen/mention_fix
Mentions will now work with all legal chars
2015-04-20 14:20:23 +02:00
Zach
118bc06ae8 Merge pull request #987 from poixen/storm
Added colored storm counter
2015-04-19 14:21:05 -04:00
ctrlaltca
5f13f89d74 Merge pull request #986 from poixen/clear_chat_fix
Added clear chat fix
2015-04-19 18:20:40 +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
Fabio Bas
881cea27f4 Rework the way sets selection/importing works; fix #539 (rebased) 2015-04-18 18:47:09 +02:00
ctrlaltca
e69ca60164 Merge pull request #978 from tooomm/useronserver_rename
clearly differentiate user lists
2015-04-18 18:17:55 +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
woogerboy21
69a9484e45 Merge pull request #981 from ctrlaltca/servatrice_compilation_fix
Quick compilation fix for debug mode
2015-04-17 13:44:26 -04:00
woogerboy21
1562d1efd1 Merge pull request #980 from poixen/server_period
Updated server to support "."
2015-04-17 13:44:15 -04:00
Fabio Bas
3d0b132dae yet another unused parameter 2015-04-17 18:57:37 +02:00
Fabio Bas
3969572d36 Fixed double variable declaration 2015-04-17 18:51:48 +02:00
Fabio Bas
2a9945ac6a Reorder member initialization 2015-04-17 17:44:07 +02:00
ctrlaltca
6807fed02f Merge pull request #976 from ctrlaltca/fix_643
Fix #643 (problem in deck editor's OR filter when no term is enabled)
2015-04-17 09:47:32 +02:00
ctrlaltca
b99a0a682e Merge pull request #973 from poixen/filter_dlg
Filter password games consistancy
2015-04-17 09:47:18 +02:00
Matt Lowe
d5a1264bcb Updated server to support "."
Now uses regex.
Added "."
Updated login message
2015-04-16 23:50:05 +02:00
Fabio Bas
c27735b09e Simplified code 2015-04-16 22:20:40 +02:00
tooomm
5be3ec8068 clearly differentiate users lists
users in room vs. users on server
2015-04-16 15:17:08 +02:00
Fabio Bas
9296e6007f Fix #643 2015-04-16 12:44:10 +02:00
Fabio Bas
42c0b09fbd Remove dependency on QtXml (unused) 2015-04-16 12:26:02 +02:00
ctrlaltca
2f35e86be9 Merge pull request #954 from ctrlaltca/deckeditor_cmc
Minor deck editor fixes
2015-04-16 08:12:53 +02:00
ctrlaltca
997ca87377 Merge pull request #966 from ZeldaZach/remove_unnecessary_tr
Fixing Shortcuts; Fix #476
2015-04-16 08:12:26 +02:00
Fabio Bas
eb6d067a21 Speed up deck editor filtering
* card: cache simpleName for each card
 * deck editor: remove double comparation of searched term with card
name when sorting
2015-04-15 23:21:44 +02:00
Matt Lowe
8938d291f8 Filter password games consistancy 2015-04-15 22:00:52 +02:00
poixen
feeaa9c9d1 Merge pull request #970 from poixen/updated_username_message
updated second string
2015-04-15 20:23:24 +02:00
poixen
53d25e738d Merge pull request #969 from poixen/game_created
Game created code improvements
2015-04-15 20:22:45 +02:00
poixen
698e6ccee4 Merge pull request #950 from poixen/zone_grammar
Updated grammar based on #932
2015-04-15 20:21:49 +02:00
Matt Lowe
751315a413 updated second string 2015-04-15 19:03:59 +02:00
poixen
aa95125fb2 Merge pull request #955 from poixen/custom_folder_link
Added menu item to open custom image folder
2015-04-15 14:51:04 +02:00
poixen
82d2ac8c32 Merge pull request #965 from poixen/updated_username_message
Updated invalid username dlg
2015-04-15 14:23:50 +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
Zach H
9be29641b0 apply QKeySequence & remove unnecessary tr 2015-04-14 17:17:01 -04: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
Zach
cd49b2f785 Merge pull request #960 from poixen/capitalize_text
Capitalized some text
2015-04-12 19:38:19 -04: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
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
Fabio Bas
25290227ca Sort Mana cost using CMC 2015-04-12 18:54:00 +02:00
Fabio Bas
0e203b3ac2 CardDatabaseDisplayModel: sort cards by search term only when the current sort column is NameColumn
When the list os sorted using another column, you don’t  need to
compare that column’s value with the searched term
2015-04-12 18:43:45 +02:00
Fabio Bas
013087a4eb CardDatabaseModel: use an enum for columns 2015-04-12 18:42:10 +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
poixen
4c66ef03e2 Merge pull request #937 from poixen/create_token_dlg
Updated token dlg
2015-04-12 16:36:45 +02:00
Matt Lowe
06accd519c Fixed main chat room lag 2015-04-11 00:49:07 +02:00
Zach
19e86c61f0 Merge pull request #940 from poixen/token_pt_fix
Fixed token PT issue for #931
2015-04-10 16:21:17 -04:00
poixen
fbb7194a10 Merge pull request #942 from poixen/logic_order
Added () for || && logic handling
2015-04-10 15:01:28 +02:00
Fabio Bas
9f0b383036 Fetch updated translations from transfix 2015-04-10 13:35:23 +02:00
Matt Lowe
44d4a534bf Added () for || && logic handling 2015-04-10 13:31:44 +02:00
Fabio Bas
bc7cb6279b extract new strings 2015-04-10 13:29:05 +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
poixen
db23d3c9ec Merge pull request #936 from poixen/replay_system
Reworked replay buttons
2015-04-10 10:43:44 +02:00
poixen
3bf3c7e94e Merge pull request #922 from poixen/sys_icon_fix
Fixed double click sys icon
2015-04-10 10:36:36 +02:00
poixen
ebcee34e0d Merge pull request #923 from poixen/popup_fix
Fixed issue with clicking on PM/mention bubbles
2015-04-10 10:36:20 +02:00
poixen
2356788289 Merge pull request #929 from poixen/reveal_top_card_shortcut
Added shortcut to reveal top card or lib
2015-04-10 10:33:04 +02:00
poixen
88da9ec815 Merge pull request #938 from poixen/load_token_fix
Fixed deck tokens showing in token dlg
2015-04-10 10:29:13 +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
poixen
86f6e911bd Merge pull request #920 from poixen/card_search_punctuation
Ignore punctuation in card search
2015-04-08 20:30:37 +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
Zach
6f69485f99 Merge pull request #911 from ctrlaltca/fix_67
Large decks (up to 8000-ish cards) no longer make client crash; Fix #67
2015-04-08 10:56:33 -04:00
Matt Lowe
fbbeb12413 Added shortcut to reveal top card or lib
+ Ctrl + N
2015-04-08 13:09:00 +02:00
Fabio Bas
8f3421204e Optimize loop; refers #910 2015-04-08 12:52:02 +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
poixen
89bce3d649 Revert "Kick message no longer takes you to kicked tab" 2015-04-07 15:55:11 +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
Zach
8ca2135f08 Merge pull request #901 from poixen/left_justified_hand
Left hand justification
2015-04-04 17:45:02 -04:00
poixen
7c6b6818f1 Merge pull request #907 from poixen/right_click_cast
Right click cast
2015-04-04 23:38:53 +02:00
poixen
e96e2e4b04 Merge pull request #906 from poixen/rename_user_lists
Renamed userlist tab to account
2015-04-04 23:38:44 +02:00
Fabio Bas
0a366d7564 Fix #67
Workaround the two remaining issues, mostly fixing the “load deck”
screen in tab_game:
 * Only preload up to the first 300 cards of a deck;
 * don’t even bother trying to load card images if they’ll be shown
with width <= 10

Trying a 17k cards deck like the one proposed in #67 is still a no go,
mostly due to the cpu time used to create all the objects. Anyway, i
tested decks up to 8k cards and they works fine now (if you like to
wait while trice is loading them)..
2015-04-04 14:03:22 +02:00
Fabio Bas
cab1e096df Fix #118
Fix selection problem when sorting the deck list
2015-04-04 12:49:28 +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
poixen
b8401592d4 Merge pull request #905 from poixen/socket_failure_dlg
Reopen connection if socket failure
2015-04-02 19:22:18 +02:00
Matt Lowe
9e6be7459d Reopen connection if socket failure
Missed from #879
2015-04-02 18:33:35 +02:00
poixen
79e9b05a79 Merge pull request #904 from poixen/rounder_logo
Rounder logo corner
2015-04-02 17:39:57 +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
Zach
fb49a8867e Merge pull request #897 from poixen/counter_issue
Fixed accidental +/- of counters when using middle click menu
2015-04-01 15:54:41 -04: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
Zach
580927a50b Merge pull request #870 from ctrlaltca/mentions
Reworked a bit mentions/tags support in chat view; fix #791
2015-04-01 09:34:42 -04:00
Gavin Bisesi
48f88e117e Merge pull request #895 from poixen/close_tray_icon
tray icon is now hidden and then removed
2015-04-01 06:17:37 -04: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
Zach H
2aadf09347 fix double popup on delete pics 2015-03-30 16:55:57 -04:00
Fabio Bas
399886c25c Sound engine: don't open() inexistent files
Avoid error “QIODevice::read: device not open”
2015-03-30 15:58:33 +02:00
Fabio Bas
757795f7cd Deck editor: skip unnecessary card name comparison when no search term is defined 2015-03-30 15:41:28 +02:00
Fabio Bas
b5b7ad8958 Startup: fix resetting card database to default
The check was inverted. LoadStatus::Ok = 0, so only when
db->loadCardDatabase() returns 0 we know the card database path is
correct
2015-03-30 12:28:13 +02:00
Gavin Bisesi
1cf7c71631 Merge pull request #881 from poixen/right_click_cast
Cast to target from hand
2015-03-29 09:03:16 -04:00
Fabio Bas
c11d33540e extracted new strings 2015-03-27 12:09:53 +01: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
Zach
4fdfed38d2 Merge pull request #878 from poixen/blue_cog
Updated settings chat settings cog
2015-03-26 20:09:59 -04:00
Zach
2a6c08b9db Merge pull request #882 from ctrlaltca/remove_deckbrewz
Remove deck brew by ZeldaZach
2015-03-26 18:50:29 -04:00
Zach
c15bbee98a Merge pull request #879 from poixen/login
Failed logins reopen login dlg
2015-03-26 18:27:53 -04:00
Fabio Bas
839da83d2c Remove deck brew by ZeldaZach 2015-03-26 23:08:53 +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
poixen
b2e032b365 Merge pull request #860 from poixen/italic_card_names
Updated chatview texts
2015-03-26 18:35:43 +01:00
poixen
cd9f4e9856 Merge pull request #845 from poixen/card_boarder
Updated card borders
2015-03-26 17:48:44 +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
Fabio Bas
c3e5679604 Fetch updated translations from transifex 2015-03-26 15:13: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
Fabio Bas
4cd98483ba Reworked a bit mentions/tags support in chat view; fix #791 2015-03-23 00:03:31 +01:00
ctrlaltca
88b242b34d Merge pull request #829 from ctrlaltca/antiflood
Anti flood for game commands; fix #753
2015-03-22 22:08:25 +01:00
Fabio Bas
7c2db752a5 Revert "Updated translation file"
This reverts commit 4568adb498.
2015-03-22 21:51:38 +01:00
Fabio Bas
1f33e34d8f Add tooltips to tabs 2015-03-19 16:43:27 +01:00
Fabio Bas
31635d2ae8 Remove "talking to" prefix from private chats
Additionally, use the same name for “private chat“ in all menus (we had
“personal talk” and “direct chat“ before)
2015-03-19 16:32:59 +01:00
Fabio Bas
dafa7c6fe1 fix #811 2015-03-19 16:08:46 +01:00
Fabio Bas
4568adb498 Updated translation file 2015-03-19 10:54:01 +01:00
Fabio Bas
8be5563563 Added user notification for RespChatFlood 2015-03-19 10:10:19 +01:00
Gavin Bisesi
20123b2c7a Merge pull request #721 from poixen/kick_message
Kick message no longer takes you to kicked tab
2015-03-18 20:54:27 -04: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
Zach
adcae59eb0 Merge pull request #846 from poixen/optional_card_scaling
Added optional card scaling setting
2015-03-18 18:44:58 -04:00
poixen
fead9f31f3 Merge pull request #839 from poixen/resize_columns
Resized game view columns
2015-03-18 16:57:14 +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
Zach
0df227ec46 Merge pull request #840 from poixen/user_games_window_size
Updated user games window size
2015-03-16 22:16:25 -04: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
Fabio Bas
2da43b8155 fetched updated translations from transifex 2015-03-14 18:49:00 +01:00
Zach
b1736c7599 Merge pull request #809 from poixen/search_new_fix
Re-added some search and filter code
2015-03-11 10:54:46 -04: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
ctrlaltca
29ddd44334 Merge pull request #805 from ctrlaltca/translations
Fetched new translations from transifex
2015-03-07 14:47:36 +01:00
Fabio Bas
38ad972d03 Fetched new translations (bis) 2015-03-07 12:45:50 +01:00
Fabio Bas
ec8382cbb5 Fetched new translations from transifex 2015-03-07 12:45:27 +01:00
Zach
5df7f61360 Merge pull request #800 from poixen/dice_roll
Changed color of server maessges in-game
2015-03-06 23:57:43 -05:00
Zach
5f05c0be91 Merge pull request #775 from Cockatrice/fix-331
Cards played face down always go untapped to main row.
2015-03-06 23:57:05 -05: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
poixen
fd4f76289c Merge pull request #798 from poixen/window_title_username
Updated english, reverted spanish
2015-03-04 18:45:52 +01:00
Matt Lowe
afe33be229 Updated english, reverted spanish 2015-03-04 18:05:35 +01:00
Zach
5f7d0fe7c2 Merge pull request #796 from poixen/search_improvement
Fixed card search
2015-03-03 18:53:09 -05:00
poixen
cc6b826cad Removed comments 2015-03-03 16:53:48 +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
Zach
90880c8b7e Merge pull request #763 from poixen/pixmap_fix
One time pixmap cache update
2015-02-28 20:39:02 -05: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
Zach
b0fe2ef9d3 Merge pull request #772 from ctrlaltca/trice_saveonclose_2ndtry
cockatrice: ask to save modified decks on close; fix #759
2015-02-25 17:09:53 -05:00
Fabio Bas
061fd5a830 Workaround for duplicated dialogs on close 2015-02-25 18:32:33 +01:00
Jaeic Lee
e6bf3b783c Updating source language file 2015-02-24 11:37:30 +09:00
Fabio Bas
def4d50e97 Fetched new translations from transifex 2015-02-23 22:40:07 +01:00
Fabio Bas
a7b8934a1b Fix remaining issues 2015-02-22 20:02:58 +01:00
Gavin Bisesi
a984a9ea69 Merge pull request #773 from ctrlaltca/fix_754
Clamp the zoneviewwidget's topleft point to the scene view area; fix #754
2015-02-22 06:16:39 -05:00
Gavin Bises
e423fb2a39 Readability tweak 2015-02-21 21:31:17 -05:00
Gavin Bises
779a400de4 Fix #331 2015-02-21 15:18:32 -05:00
Zach
66678e95dc Merge pull request #765 from Cockatrice/no-spec-alerts
Game events do not notify taskbar while spectating.
2015-02-21 13:32:09 -05:00
Fabio Bas
b9f0212c9b Clamp the zoneviewwidget's topleft point to the scene view area; fix #754 2015-02-21 16:43:38 +01:00
Fabio Bas
399d4bf516 cockatrice: ask to save modified decks on close; fix #759 2015-02-21 15:21:26 +01:00