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

2719 commits

Author SHA1 Message Date
Zach H
261d3ac591
better null check (#3036) 2018-01-20 14:54:34 -05:00
Zach H
bc52882ac4
Fix Bad Gameplay (#3034) 2018-01-19 20:34:14 -05:00
Zach H
d1b95aad16
move to slot (#3032) 2018-01-19 19:04:48 -05:00
Zach H
691bf36fbe
Disable sideboard button w/o deck (#3025) 2018-01-19 10:50:18 -05:00
Zach H
ebec30dd1c
Add No annotations export option w/ shortcut (#3013) 2018-01-18 19:25:30 -05:00
Zach H
5757d60b1d
Smarter Mana Cost sorting & small cleanup (#3008) 2018-01-18 19:25:10 -05:00
Zach H
34bec90193
Fix deck loader with spaces (#3007) 2018-01-18 19:23:13 -05:00
Zach H
dcc632e0d4
Fix a crash (#3011) 2018-01-18 11:53:57 -05:00
Zach H
7a150c558d Trim all inputs (except password) (#3018) 
* Trim all inputs (except password)

* missed )
 2018-01-17 18:57:13 +01:00
Zach H
8825e2932a
fix linux crash (#3014) 2018-01-13 04:20:12 -05:00
tooomm
cc822dd8df card filter: add clear button and placeholder text (#3003) 2018-01-11 16:43:08 -05:00
Kyle Grammer
6fc1aaef90 Add comp architecture (#2968) 2018-01-10 22:19:07 -05:00
tooomm
e6e6932dbb card filter: alphabetical ordering for keywords (#2987) 2018-01-10 13:37:39 -05:00
tooomm
d124e6ac22 deck editor: add placeholder text to search (#3000) 2018-01-10 13:33:37 -05:00
tooomm
7efab80d9b token creation context menu improvements (#2999) 2018-01-10 13:32:29 -05:00
Zach H
d19744236e
Automatic Spoiler Season (#2991) 
* oracle now can be run in spoiler or normal mode

* tests for travis

* only run on relaunch

* spoilers in client (not oracle now) and tray icon shows when done

* spoiler status will be checked before downloading spoiler file

* only download if they care about spoilers

* reload db on spoiler download

* manual update button, code cleanup, and fix enabling sets when new

* cleanup, nullchecks, and fixes to spoiler

* reload DB even if not in spoiler season; necessary as we have a check elsewhere to prevent the reload if spoiler check happens

* Implement changes from 2991#issuecomment-356169374

* Change implicit nullptrs, alert on file deletion, minor changes

* make reload thread safe and minor changes from 2991#issuecomment-356450302

* Fix locking

* Disable update now button while process running
 2018-01-10 13:27:43 -05:00
tooomm
51ec593759 fix space (#2990) 2018-01-02 22:57:23 -05:00
Zach H
b75882b6b9
Allow non-db cards to be moved around (#2960) 2017-12-18 14:17:54 -05:00
Zach H
2abfd3b4a9
Update Rarity Filters & Refactoring (#2962) 2017-12-17 19:42:54 -05:00
Zach H
014b9947fe
clear search bar if all filters cleared (#2961) 2017-12-17 17:48:57 -05:00
Zach H
ec4e6d53df
allow backspace button to remove a filter (#2959) 2017-12-17 17:39:41 -05:00
Zach H
0eae4dbe54
add checkbox option to clear log (#2963) 2017-12-17 17:32:31 -05:00
Zach H
297f1f2555
remove untap option, combine w/ tap (#2964) 2017-12-17 17:31:31 -05:00
Kyle Grammer
5e00faed5d Fix for Aftermath and Split Cards when sending to Tappedout; fix #2942 (#2944) 2017-12-10 17:56:49 -05:00
John Robe
6c038a91e4 Deck export (#2938) 
* Added “export deck” option to export deck to decklist.org for viewing/printing. Implemented using a new menu item, added shortcut ability, and functionality to parse the deck correctly and add main/sideboard cards to decklist. Per issue #2931
 2017-12-05 22:34:19 -05:00
tooomm
59824cf4dd update finish (#2923) 2017-11-19 20:22:02 -05:00
tooomm
b615b5b33e Translation Updates (#2918) 2017-11-19 15:11:37 -05:00
John Hill
422c899cdb Sorting by P/T numerically (#2901) 2017-11-04 13:11:46 -04:00
ctrlaltca
4baaf978f5 Deck editor: force default file extension on file save; fix #2829 (#2910) 2017-10-31 15:34:56 -04:00
ctrlaltca
6b6ba9a8f1 Update translations (#2890) 
* Translations

* update and test codacy change
 2017-10-09 19:16:23 +02:00
Zach H
96b30da492 fix deckstats.net regex (#2886) 2017-10-04 23:36:42 -04:00
tooomm
9cbdc4195e change to https (#2863) 2017-10-04 12:46:43 -04:00
Alessandro Marzialetti
78e299fdfd Fixed life points not showing (#2868) (#2881) 2017-10-04 12:44:36 -04:00
tooomm
ef89104503 add colourless keyword to deck filter (#2858) 
extends #2737 for missing term (add colourless)
 2017-09-27 14:03:58 +02:00
ctrlaltca
ccee0aa3fd Cmake: remove old unneeded POLICIES (fix Appveyor) (#2859) 2017-09-22 17:47:05 +02:00
John Hill
a6d3229e74 If playing online, don't change your life/mana counters if you click on your opponent's (#2839) 2017-08-19 00:43:18 -06:00
John Hill
e694cbe854 add ability to clone from stack (#2824) 2017-08-06 23:56:17 -04:00
John Hill
3963570838 Mana counter shortcut (#2821) 2017-08-06 21:09:25 -04:00
John Hill
dd05b86bc9 initial way of getting rid of warning (#2817) 2017-08-06 21:04:03 -04:00
John Hill
6b1ea9186a Double click token (#2815) 2017-07-31 22:50:32 -04:00
John Hill
556d19ff70 Clone in exile and graveyard (#2813) 2017-07-31 00:34:24 -04:00
tooomm
1cb3d88e35 flag updates (#2804) 2017-07-14 21:30:27 -04:00
ctrlaltca
1366e5970e Portable mode for windows (#2794) 
* Portable mode for windows

* fix start menu in portable mode

* Make gcc an happy puppy

* Clean old installation if we are installing over an old portable mode installation

* Default to Desktop\CockatricePortable

* Settings dialog fixes

* wording
 2017-07-08 11:22:29 +02:00
Psithief
b05ed0376a Fixes #2712 (#2797) 
When checking unknown sets, consider sets with an empty long name, 
set type and release date as 'incomplete'/'partial' sets.
Do not mark partial sets as known, or ask the user to enable them.
Instead, silently enable partial sets.
When a partial set becomes complete, the user is prompted to enable the
set as before. If they choose not to enable, those partial sets are 
disabled, as we can no longer assume they are disabled by default.
 2017-07-07 00:45:46 -04:00
Zach H
e8dbdc3c6d Add token creation for opponent board items (#2744) 2017-06-28 23:09:10 -04:00
tritoch
5abfda49be Import spoiler.xml as spoiler.xml and overwrite existing (#2784) 2017-06-28 22:54:09 -04:00
Psithief
bfcc48f5bf Check for .xlhq (CCGHQ naming scheme) files (#2778) 2017-06-22 22:59:33 -04:00
Psithief
ae15f5df06 Handling of tokens/related cards improved. (#2773) 2017-06-20 18:35:06 -04:00
Zach H
9ddb18a35e Make deck list appear if deck loaded (#2745) 2017-06-12 12:25:52 +02:00
woogerboy21
2094910b7a More descriptive reason for "to many requests" when registering (#2760) 
* More descriptive reason for "to many requests" when registering

Currently the only way for a user to get a response of "to many registration attempts"  is by the servers configuration to restrict the number of registration attempts but the error message presented to the user is very vague as to why they have been denied.  This PR updates the reasoning.  I'm open for suggestions on any clarity recommendations.

* Added more clarity

Updated error message to include email address information for even greater clarity.
 2017-06-12 12:12:36 +02:00
tooomm
b36c349f9b remove unused define (#2757) 2017-06-11 00:42:09 -04:00
Zach H
99e7458f9b make not set to untap normally more distinct (#2746) 2017-06-04 14:02:35 -04:00
Zach H
0a57229886 keep client version persistant (#2750) 2017-06-04 13:59:37 -04:00
Zach H
f3f83882e0 Model col widths off deck editor & disable button if no tokens in deck (#2751) 2017-06-04 13:58:34 -04:00
Zach H
d970b9e50f fix card not showing correctly in games (#2752) 2017-06-04 13:57:47 -04:00
Zach H
b0d8a31a2e remove invalid connect (#2753) 2017-06-04 13:57:21 -04:00
tritoch
c5ac61c797 Colorless for color filter (#2737) 
* Colorless for color filter

Add 'colorless' as an option for color filter in deck editor / card list.

* Remove empty quote check

Empty quote does not work here. Add 'none' as optional string instead.

* Add C to colorless filters
 2017-05-30 08:19:11 +02:00
tooomm
87060dc5c7 created_at to published_at (#2723) 2017-05-22 16:00:38 +02:00
backendr
62681f7f8d contect menu fix (#2719) 2017-05-18 17:03:21 -04:00
Zach H
b53cd33eed Smarter Clipboard Pasting/Parsing (#2706) 2017-05-14 14:35:40 -04:00
backendr
405a719412 Better scrolling in reveal zones (#2716) 2017-05-14 19:01:50 +02:00
Zach H
aca6917d42 Merge pull request #2672 from Cockatrice/tooomm-update_msg_rework 
update msg rework
 2017-05-13 16:06:53 -04:00
tooomm
73e2c3d32f Publish --> Release 2017-05-13 14:49:35 +02:00
tooomm
7f273b547b add missing tr() 2017-05-13 13:24:04 +02:00
backendr
77e0cddbae counter context sensative (#2714) 2017-05-13 11:48:26 +02:00
backendr
d9230d6c6b Message Log Widget changes (#2709) 
* Message Log Widget changes

* Gravard now logs as before

* removed redundant QString()
 2017-05-13 11:47:43 +02:00
Zach H
d347e54526 Merge pull request #2688 from backendr/ignore_first_server_message 
Prevent emitting initial server message event
 2017-05-08 19:46:17 -04:00
backendr
55dcf4a845 Log refresh 2017-05-06 00:40:41 +02:00
backendr
b140721d50 Add flag for checking inital server message 2017-05-06 00:18:49 +02:00
Zach H
c96f234b6d Merge pull request #2683 from ctrlaltca/fix_2682 
Remove unneeded debug
 2017-05-05 13:42:02 -04:00
Fabio Bas
a4e78bbfa2 remove debug 2017-05-05 15:23:59 +02:00
Zach H
16bc8b764b remove all of pricing 2017-05-04 23:29:43 -04:00
Fabio Bas
36f6907fa3 Improved token loading 2017-05-04 23:28:51 -04:00
tooomm
339945e089 fix custom build + displaying name (#2668) 
* fix custom build name

* remove html and argument from tr()
 2017-04-30 16:20:29 +02:00
tooomm
faeb3f8daf fix 2017-04-30 15:17:03 +02:00
tooomm
e04010f00b further tweaks and uniform style 2017-04-30 15:06:32 +02:00
tooomm
cbd9d2c4fc better wording (#2674) 2017-04-29 22:15:43 -04:00
tooomm
fdc82708c6 extend updater description in menu (#2673) 2017-04-29 20:13:33 -04:00
tooomm
8f7691b47a next round 2017-04-29 22:55:49 +02:00
tooomm
ca2e3e5eab trial_error 2017-04-29 22:45:25 +02:00
tooomm
da42d9e049 fix 2017-04-29 22:32:07 +02:00
tooomm
f18679bfff fix attempt 2017-04-29 22:06:53 +02:00
tooomm
970b67cdb6 update message rework 2017-04-29 20:57:52 +02:00
ctrlaltca
3c5e38bd14 Hide some icons for spectators; fix #2589 (#2656) 
* fix #2589

* Additional fix
 2017-04-29 15:06:30 +02:00
Zach H
12c9e4b81a allow placement below top X cards (#2666) 
Close #2666
 2017-04-27 20:32:24 -04:00
Zach H
7c1a18da5e Add "Random card from graveyard" (#2652) 2017-04-26 18:12:56 -04:00
ctrlaltca
df211748ca Add clear button to deck editor (#2654) 2017-04-26 15:20:35 -04:00
ctrlaltca
ce77d51a8f Fix crash on logger; make log window modalless (#2659) 2017-04-26 15:05:24 -04:00
tooomm
9dd3a04a08 improve provided info in "edit sets" (#2641) 2017-04-25 15:46:37 -04:00
Zach H
62d8f5a039 change cards from sb<->mb with double-click (#2606) 2017-04-25 14:05:25 -04:00
Fabio Bas
2c551bdd35 Revert "fix #2332" 
This reverts commit 0fd77346df.
 2017-04-25 19:35:07 +02:00
Fabio Bas
0fd77346df fix #2332 2017-04-25 18:58:01 +02:00
ctrlaltca
a46c7156dd fix_crash (#2649) 2017-04-25 18:13:45 +02:00
ctrlaltca
3c54499a40 sort edit sets better (#2648) 2017-04-25 11:40:47 -04:00
ctrlaltca
160d66d890 show tokens all sets (#2646) 2017-04-25 11:32:51 -04:00
ctrlaltca
3f3839d70a fix deck card backs (#2645) 2017-04-25 11:32:00 -04:00
ctrlaltca
ab94d2c91d Token Dialog Revamp (#2639) 2017-04-25 00:29:57 -04:00
ctrlaltca
8ad448a23c fix #2600 (#2638) 2017-04-25 00:29:32 -04:00
ctrlaltca
acb40bc738 Fix #2608; fix #2609; fix #2611 (#2636) 2017-04-24 22:20:44 +02:00
ctrlaltca
f2a887a6a4 fix #2623 (#2634) 2017-04-24 22:20:19 +02:00
ctrlaltca
29904c49da Specify reason when on game leave; fix #2624 (#2633) 
* fix #2624

* feedback++
 2017-04-24 22:20:08 +02:00
Zach H
176ea444ba revert clear focus (#2619) 2017-04-21 17:52:14 +02:00
ctrlaltca
3356b2ede7 Change version in about window and installer name (#2570) 
* Change version in about window and installer name

* Change version in about window and installer name

* Cmake get version updates

* dev snapshot format changed

* alignment changes
 2017-04-20 13:41:18 +02:00
Zach H
5f3a3f535a clear focus only if needed (#2604) 2017-04-20 05:21:30 -04:00
Zach H
e2e9c5ab96 disable join if spec disabled (#2605) 2017-04-20 03:01:28 -04:00
Zach H
dc6c375220 clear focus when changing phases (#2583) 2017-04-15 14:37:01 -04:00
Zach H
657e1ac9e6 fix c style casting (#2561) 2017-04-05 15:45:58 -04:00
tooomm
ee154da598 clean transifex translations up (#2566) 2017-04-03 16:35:10 -04:00
Zach H
b3c1a87f60 better bool checking (#2564) 2017-04-01 21:29:23 -04:00
Zach H
ef7670a1e6 translation file updates (#2559) 
* translation file updates

* translation updates
 2017-03-31 15:29:43 -04:00
Zach H
d7e5b29d41 Dev channel to GitHub (#2557) 2017-03-31 14:47:49 -04:00
Zach H
87ebea7b0f fix memory leak (#2549) 2017-03-28 13:13:42 -04:00
tooomm
a273f55b6f exchange tr() for QString() (#2547) 2017-03-27 15:07:17 -04:00
Zach H
06c3edf4c6 cancel downloads from updater (#2534) 
* cancel downloads from updater - fix #2534

* fix double popup
 2017-03-25 16:35:43 -04:00
Gavin Bisesi
6f30304271 Change stable channel downloads to use only github api and links (#2515) 
* Change stable channel downloads to use only github api and links

Ref #2502
 2017-03-25 16:35:04 -04:00
Zach H
559d4bd47f use list over vector 2017-03-23 00:45:52 -04:00
Gavin Bisesi
b99ae7f463 Merge pull request #2501 from Cockatrice/refactor-chatview 
Remove direct usages of TabSupervisor from Chatview
 2017-03-22 22:22:19 -04:00
Gavin Bisesi
f5a5ea0434 ChatView: Initialize fields in declared order 2017-03-22 21:52:15 -04:00
woogerboy21
2f23a9cb2f Smarter rooms (#2484) 
* Added VIP only room

* Added DONATOR room.

* Extended Room to include privilege level.

* Updated room join logic

* Updated server tab permissions column display based on perm+privlevel definitions

* Fixed new client -> old server blank permissions column on server tab

Added the ability for registered user - VIP/DONATOR/PRIVILEGED room.
 2017-03-22 21:45:16 -04:00
Zach H
317ac05919 logbuffer crash fix (#2524) 2017-03-22 21:39:16 -04:00
Zach H
f688c046ab Size constraints for Settings Dialog (#2513) 2017-03-22 21:25:40 -04:00
Zach H
141e6df50a Updater dialog changes (#2504) 2017-03-22 21:23:25 -04:00
Gavin Bisesi
8ac2a5870d Un-const non-pointer return types 2017-03-22 21:12:42 -04:00
Gavin Bisesi
a3f4012d1a Reduce TabSupervisor direct usage in UserContextMenu 2017-03-22 20:44:05 -04:00
Gavin Bisesi
c5aa75d4d1 Reduce data dependency for GamesProxyModel 2017-03-22 20:44:05 -04:00
Gavin Bisesi
d65a444ac5 Remove direct usages of TabSupervisor from Chatview 
- There still might be inherited usages
- It's still used in the ctor

Areas to test
- Mentions
- Chat notifications
- Username clickable links
 2017-03-22 20:44:05 -04:00
tooomm
2c3b85aed3 fix translators link (#1987) 2017-03-22 16:26:59 -04:00
Zach H
85985a9433 Add support for multi-selection in set editor (#2441) 2017-03-22 15:49:38 -04:00
Zach H
5ebc9ca360 allow auto connect (#2522) 2017-03-20 18:21:20 -04:00
Zach H
4feb43cdcc changes to connection dialog (#2503) 2017-03-19 20:24:58 -04:00
Zach H
b5b9527c13 Font size defaults (#2521) 2017-03-19 20:20:06 -04:00
Zach H
a2a7561613 allow max font size to be defined by user (#2488) 2017-03-19 14:13:20 -04:00
Zach H
0da2bdd7aa additional null checks in player, gameselector, remoteclient, log (#2514) 2017-03-19 12:55:55 -04:00
Zach H
212a7d00db better null checking decklist (#2510) 2017-03-18 20:56:49 -04:00
Zach H
3b2eff2551 file filenames so window updater works (#2500) 
* file filenames so window updater works
 2017-03-18 18:48:40 -04:00
Zach H
fb194db766 additional null checks & parsing (#2506) 
* additional null checks & parsing
 2017-03-18 18:48:23 -04:00
Zach H
127a91147c rename from update to check (#2505) 2017-03-18 18:46:19 -04:00
Zach H
2048aac387 STDout debugging (#2499) 2017-03-17 20:45:13 -04:00
Zach H
a8a4557738 auto_connect toggle fix (#2485) 2017-03-16 16:59:48 -04:00
Zach H
a7dbc2e1f6 Fix token window resize (#2480) 2017-03-15 15:53:57 -04:00
Zach H
4cfcca33db Server Connect Remade (#2452) 
* Save multiple server configurations
* Each server has its own password/port storage

Close #2452
 2017-03-14 17:51:51 -04:00
Zach H
37b43f9916 make settings size vary based on sizeHint() (#2472) 2017-03-14 17:48:02 -04:00
ctrlaltca
6e723b2a99 translations (#2469) 2017-03-14 00:04:26 +01:00
ctrlaltca
2817f54c96 Fix issues with new updater; fix #2465 (#2468) 
* fix #2465
 2017-03-13 23:21:15 +01:00
ctrlaltca
f9a025081a fix #2445 (#2458) 2017-03-12 18:23:58 +01:00
ctrlaltca
877a5ca3b1 fix_2449 (#2459) 2017-03-12 18:21:49 +01:00
tooomm
72825c43ec rephrase missing feature setting (#2462) 2017-03-12 13:20:15 -04:00
Zach H
bd850fa3ff create related token if you press the 'Token:' button (#2455) 
* create related token if you press the 'Token:' button

* function set
 2017-03-12 11:51:59 +01:00
Zach H
b2f2e9db8a make sure xml file is uploaded (#2440) 2017-03-07 12:48:07 -05:00
Zach H
638c5e25fa temp fix to downloading folders (#2442) 2017-03-04 22:36:35 -05:00
Zach H
c850ae98d8 add player numbers to in game (#2435) 2017-03-04 11:03:39 -05:00
Zach H
18b8a0ef5c fix folder names (#2432) 2017-03-04 00:49:09 -05:00
Zach H
6619612c30 fix buddy checkbox bug (#2434) 2017-03-04 00:48:16 -05:00
Zach H
b8334d0cd5 fix incorrect pawn icons (#2436) 
* fix incorrect pawn icons
 2017-03-02 22:26:10 -05:00
Zach H
cf08d1d267 Revert "Condensed Card Counter Context Menu" (#2433) 2017-03-02 17:47:15 -05:00
Zach H
2bad56f6b6 removal of p server (#2438) 2017-03-02 16:41:08 -05:00
ctrlaltca
160c4cea6b Translations (#2430) 2017-03-01 10:18:56 +01:00
ctrlaltca
7373819c32 Add release channels for autoupdater (#2362) 
Fetch releases from github and find corresponding installers on bintray
 2017-03-01 09:43:09 +01:00
Mark McDonald
b9cd942308 Add keybaord shortcut for creating related cards (#2426) 
* Extract createCard from actCreateRelatedCard

* Merge related cards and reverse related cards before handling

* Add "Create all related cards" action to a card

* Stop displaying all related tokens if only one token is available

* Add shortcut for Creating all tokens related to selected card

* Extract method for adding related card actions

* Prefer foreach to index based iteration

* Guard against null cards, card menus, or cardInfos

* Remove QRegExp dependency from commonly depended header
 2017-02-27 08:50:10 +01:00
Name Temporarily Hidden
c0e7d0c7c7 Removed font-size cap for on-card text (fixes bug: #2368) (#2427) 2017-02-26 23:20:54 -05:00
woogerboy21
d0088f6a18 Server audit table (#2423) 
* Creating of server side audit table for auditing actions such as password resets, account registrations and log queries.

* Add migration script

Add migration script for database

* Update database script

Update database script to reflect new audit table

* Creating of server side audit table for auditing actions such as password resets, account registrations and log queries.

* Add migration script

Add migration script for database

* Update database script

Update database script to reflect new audit table

* Corrected results column possible value(s).

* Fixed migration script.

* Added boolean audit logic

Added enable/disable audit options
Added audit functionality for forgot password

* Added registration auditing

Added registration auditing

* Updated ActivateAccount Function

Created clientid variable and used it in preporation for future
potential protocol expansion.

* Extended activation protocol

Added clientid to activation command protocol

* Typo correction

Fix typo's

* Missed type fix

Found the infamous E!

* Updated database function syntax

Updated if/else syntax in db add audit function

* Untabify content

Untab files changed in PR
 2017-02-25 13:48:31 -05:00
tritoch
3c2063df40 Update Custom PIcture URL to match wiki (#2422) 
Wiki page was moved, link in settings points to old page.
 2017-02-24 01:13:26 -05:00
Zach H
47cafde521 fix lowercase (#2419) 
* fix lowercase

* fix changes

* fix .desktop

* servatrice .desktop
 2017-02-23 08:53:18 +01:00
Mitchell Rosen
9ba3f21730 Fix indentation (and Debug build) (#2418) 
* Fix indentation (and Debug build)

* More indentation fixes
 2017-02-20 08:48:12 +01:00
Zach H
172fc79327 fix crash if no trayicon found (#2415) 2017-02-19 14:52:44 +01:00
tritoch
90c62c8ab8 Add cockatric.es server (#2414) 2017-02-16 15:06:30 -05:00
woogerboy21
0cfa6863d5 Simpler forgot password functionality (#2393) 
* Simpler forgot password functionality (Server/Client)
 2017-02-15 17:41:40 -05:00
woogerboy21
b64eab204c Added custom notify user event (#2398) 
* Added custom notify user event.

* Untabbify
 2017-02-08 18:00:53 -05:00
woogerboy21
0fdb9b7c83 Added registration email blacklist (#2352) 
* Added registration email blacklist

Added the ability to define email blacklist for user registration.  Now
server operators can prevent users from registering accounts that
contain providers they do not wish users to use.

* Update ini option for clarity

Updated servatrice ini option name for clarity.

* Updated description for clarity

Added implicit explination
 2017-02-08 15:25:27 -05:00
tritoch
bdb8e931b4 Registered + VIP + Buddy Gummy Update (#2336) 
* Reg + Buddy + VIP

* Registered VIP Gold de-Star

Removed the star from VIP.  Changed gummy to all-gold.
 2017-01-14 13:17:03 -05:00
poixen
cdeb1a7f9a Merge branch 'master' into priv_level 2017-01-08 09:40:21 +01:00
woogerboy21
a85b0dcbba Add email registration restriction (#2350) 
* Add ability to limit number of account registrations with same email address

This commit adds server side functionality that will allow operators to
limit the number of accounts that can be registered to the server with
the same email address.

* Updated ini wording

Updated configuration file wording for better description.
 2017-01-07 11:26:23 -05:00
poixen
93c7b1b846 Added priv level to user details 
added priv level to user details

Fix #1881
This change allows the server operator to enable or disable the internal
SMTP client that sends activation emails.  With this new configuration
option server operators can choose to require email activation yet use
an external method of account verification and/or account token
notification.
 2017-01-07 08:16:21 +01:00
woogerboy21
3e39432ccc Add configuration to enable/disable internal smtp client (#2337) 
Fix #1881
This change allows the server operator to enable or disable the internal
SMTP client that sends activation emails.  With this new configuration
option server operators can choose to require email activation yet use
an external method of account verification and/or account token
notification.
 2017-01-06 17:02:52 -05:00
woogerboy21
dbf7d7f748 Fix replay chatview with new gummys (#2340) 
Fix #2334
This update fixes the violation that happens when watching replays to
determin the proper user privlevel in order to generate the correct
gummy.
 2017-01-06 15:28:30 -05:00
poixen
2d216807c7 Condensed counter menu 2017-01-06 19:07:31 +01:00
Zach H
3d0600b516 Tokens in sub menu (#2320) 2016-12-17 13:05:29 -05:00
woogerboy21
960ecaaeda New privuser gummys (#2305) 
* New user gummys based on account privilege level

This change add's new user gummy icons for vip/donator priv levels that
are now available.

YaY for Zach!
 2016-12-08 22:52:25 -05:00
Zach H
e0636db60d Recursively search CUSTOM folder for images (i.e. subdirectories) (#2251) 2016-12-08 11:00:44 +01:00
woogerboy21
d039c9b6bd Add missing feature rememberance to client (#2275) 
Fix #2249
Add the ability for the client to remember the missing features that it
received from the server it last connected to and not display the
"missing/optional feature" message at every login.
 2016-11-29 15:50:00 -05:00
woogerboy21
6962777ded Rework idle timeout, now server side (#2259) 
* Server side idle timeout

Initial commit for server side idle timeout counter.  This adds a new
int value that is updated when room/game/mod/admin commands occur and is
checked during the regular ping timout function that if the users new
"idle" value exceeds the idleclienttimeout value defined in the servers
configuration file the user is logged out.  The user will receive a
warning at the 90% time frame mark about being idle.

* Use round instead of ceil

Travis fix for older xcode issue's.

* Fixed requested items

Mis-spelleed function, added header, added warning message sent check
value.  Also corrected the protobuf declaration file for
event_notifyuser

* Moved bool to protected

* Re-Ordered Declarations

* Removed most stylistic items

Resolved most noted things.

* Remove client side idle timeout

Removed client side idle timeout functionality
 2016-11-08 22:18:12 -05:00
woogerboy21
1cebe030f6 Fix one to many zero's (#2260) 
Looks like I typo'd the default value for the number of seconds in 1
hour for the default client side idle time out.  This fixes it.
 2016-11-02 01:26:00 -04:00
Jeff
a2f4fa916e Adds !corrected_name! and !corrected_name_lower! to customURL (#2255) 2016-11-01 00:13:39 -04:00
Zach H
3498b16e01 update wordings (#2246) 2016-10-30 03:54:43 -04:00
ctrlaltca
a1840ea9d3 translations galore (#2245) 2016-10-29 11:31:35 +02:00
woogerboy21
63a4f147f4 Add client UI setting for idleclientdisconnect (#2244) 
* Add client UI setting for idleclientdisconnect

Added disabled option in client UI for client disconnect.

* Updated settings text

Updated settings text for clarity.

* Updated descripton text (again)

Per request for clarity
 2016-10-29 04:24:18 -04:00
ctrlaltca
b808d3824b don't use corrected name when downloading card (#2164) 2016-10-22 19:07:58 -04:00
ctrlaltca
c3ef53d6fd Removed unused class (#2222) 2016-10-18 14:34:11 +02:00
ctrlaltca
40468a79ea Merge branch 'master' into CleanupMaxUserCheck 2016-10-17 12:27:20 +02:00
Kevin Boxhoorn
0b7f4c134c Disallow usernames that contain certain words and RegExp (#2200) 
* Add `disallowedwords` setting and perform check

Check if any of the words in `disallowedwords` are contained in the username. If
so, return false like other checks.

NOTE: Needs testing for advanced bugs.

* Remove "administrator" from `disallowedwords`

"administrator" contains "admin" anyway, so it is not needed.

* Add error message if username contains a disallowed word

* Add `disallowedregexp` setting and perform check

Check if each expression in `disallowedregexp` exactly matches the username. If
so, return false.

TODO: Add specific error to dialog in `window_main.cpp`.

* Add error message for username matching RegExp

* Fix indentation

* Compile `disallowedregexp` into a QList upon initialization

Reduces system load with each registration request.

* Clean up `isUsernameValid` function

* Fix indentation

* Add backwards compatibility to client

Client can accept either 7 or 9 rules to maintain compatibility with older
versions of server.

* Add examples and warnings to `servatrice.ini`
 2016-10-17 12:24:42 +02:00
woogerboy21
10b677acdf Cleanup max user check at login 
This change accomplishes two goals.  The first is it moves the checking
for if the servers set user limit is reached out of the socket interface
and into the protocol handler portion of the code (were it should live).
It also eleminates the need for a DB query at login to check the user
count.  The user account is actually already maintained by the server
and a function already existed to get the user count total.
 2016-10-16 12:48:39 -04:00
Kevin Boxhoorn
1cbf67ab57 Merge branch 'master' of https://github.com/Cockatrice/Cockatrice into login-error-fix 2016-10-10 20:52:58 +11:00
woogerboy21
7af2f3f057 Idle Client Timeout Functionality 
Added the functionality client side to log users out of servers if they
are idle for more than 1 hour without joining either a game or room.
Sending a message (room/game/private) or performing a game action.
 2016-10-09 13:55:07 -04:00
Kevin Boxhoorn
000f6ea2c0 Merge branch 'master' into login-error-fix 2016-10-06 20:39:46 +11:00
Kevin Boxhoorn
2376a7dbc0 Make isLocalGame const 2016-10-05 09:43:22 +11:00
Kevin Boxhoorn
c1aebc1af5 Fix member variable initialization order 2016-10-03 13:16:16 +11:00
Kevin Boxhoorn
3680f40981 Disable "Load remote deck..." button in local game 2016-10-03 12:36:18 +11:00
Kevin Boxhoorn
2a7fc827f4 Add getIsLocalGame to TabGame 2016-10-03 12:33:40 +11:00
Kevin Boxhoorn
6825486776 Prevent login error handler being incorrectly called (#2176) 
In some situations, when the server disconnects the client during a login,
multiple dialogs will be shown. This is undesirable behavior, and hence
`loginError` should only be called when the client is actually connected
(`response.response_code() != Response::RespNotConnected`).
 2016-09-29 12:21:06 +10:00
tooomm
a7a0ea23ca removed tr() for URLs (#2190) 2016-09-25 19:28:34 -04:00
Zach H
6c7ba06930 add pow/toughness filters (#2169) 2016-09-20 18:17:53 -04:00
ctrlaltca
c4bb16e74b Merge pull request #2175 from Cockatrice/add_new_pub_server 
add mtg.tetrarch.co server
 2016-09-20 22:28:54 +02:00
Fabio Bas
0e8206a36f Updates translations 2016-09-20 22:23:36 +02:00
tooomm
8b1aaea79d add mtg.tetrarch.co server 
added `mtg.tetrarch.co` server hosted by @skwerlman to the in-client default list
 2016-09-20 21:18:58 +02:00
ctrlaltca
7f28a7e844 Fix #601; Fix #725 (#2126) 
Analyze deck on tappedout
Fix small bug in deckstats interface
 2016-09-02 01:34:56 -04:00
ctrlaltca
680277ad6a fix #2129 (#2132) 
Remove selection move at all
 2016-08-31 14:13:30 -04:00
Fabio Bas
ae456a5bc3 Renamed !setnumber! to !collectornumber! 2016-08-20 10:27:23 +02:00
Fabio Bas
c321227fa7 Fix clipboard behavior in deck editor and game 2016-08-09 11:13:36 +02:00
poixen
0df4b34fe4 radio buttons for game types 2016-07-27 21:21:28 +02:00
ctrlaltca
2cbfc5a8e6 Merge pull request #2096 from ctrlaltca/fix_2091 
Fix infinite loop on local game close
 2016-07-24 12:29:03 +02:00
poixen
f2cd276e5f more screen space 2016-07-21 20:06:45 +02:00
woogerboy21
c04298fb43 Merge pull request #2087 from woogerboy21/client_id_nametoip_fix 
Client id nametoip fix
 2016-07-21 10:20:16 -04:00
woogerboy21
63bf0029aa Updated client id generation to use host ip rather than name 2016-07-21 09:20:28 -04:00
poixen
8d989ca7fb updated connect dlg 2016-07-21 11:45:11 +02:00
Fabio Bas
d61d9c98a0 Avoid locking on local server shutdown 2016-07-20 16:53:57 +02:00
poixen
69e8db441c updated login 2016-07-15 15:41:51 +02:00
ctrlaltca
0939cd8b21 Merge pull request #2082 from ctrlaltca/fix_2081 
Remove newlines from Deck name in TabDeckEditor
 2016-07-15 11:14:13 +02:00
Fabio Bas
b0efcf9f89 Remove newlines from Deck name in TabDeckEditor 2016-07-15 10:57:42 +02:00
Zach H
edd50a7571 show buddyOnly on filter clear 2016-07-14 16:56:17 -04:00
poixen
a729b1c966 updated game created coloumn text 2016-07-12 09:31:27 +02:00
ctrlaltca
6a152ffbac Merge pull request #1991 from ctrlaltca/websockets 
Implementation of websockets in servatrice and test js client
 2016-07-05 14:45:31 +02:00
ctrlaltca
07bc215b3e Merge pull request #2021 from ZeldaZach/color_list 
Colors to deck editor
 2016-07-05 14:45:09 +02:00
poixen
3717c7440a Fixed mention bug 2016-07-04 20:23:32 +02:00
poixen
089edc53d0 filter buddies only 2016-07-03 21:48:21 +02:00
Gavin Bisesi
e038534a51 Merge pull request #2045 from Cockatrice/timestamps 
added additional timestamps in game
 2016-07-02 19:49:34 -04:00
poixen
2a11466779 auto admin 2016-07-02 22:34:45 +02:00
poixen
60f457827f added more in game timestamps 2016-07-02 21:45:38 +02:00
tooomm
c095daa282 log ui window title change 
While translating I realized that `View Debug Log` for the menu is perfectly fine, the dialog window should just say `Debug Log` though...
 2016-06-30 17:15:37 +02:00
Fabio Bas
670f55bc28 Translations update 2016-06-30 15:26:52 +02:00
ctrlaltca
9807bcb48f Merge pull request #2025 from ctrlaltca/logui 
Log UI
 2016-06-29 13:56:46 +02:00
Fabio Bas
8db10be892 Log UI 2016-06-27 22:18:39 +02:00
Fabio Bas
5b21dc8cde Implementation of websockets in servatrice and test js client 2016-06-26 19:38:53 +02:00
ctrlaltca
c19f225806 Merge pull request #2015 from Cockatrice/tooomm-tr_tags 
fix hardcoded strings
 2016-06-26 18:52:37 +02:00
ctrlaltca
7282aa7eea Merge pull request #2014 from Cockatrice/tooomm-patch-1 
properly differentiate between singular and plural
 2016-06-26 18:52:17 +02:00
Zach H
79fc24769a Colors to list 2016-06-21 00:48:03 -04:00
tooomm
85c6bcdfa7 fix travis debug error 
introduced in https://github.com/Cockatrice/Cockatrice/pull/2011
 2016-06-17 17:34:07 +02:00
tooomm
57f9b2c200 add tr() tags 2016-06-17 17:03:42 +02:00
tooomm
1782096805 add tr() tags 2016-06-17 16:56:08 +02:00
tooomm
bfbbedd604 pluralisation 2016-06-17 16:12:41 +02:00
Fabio Bas
1bc56e1c86 Fix some translation issues 
Fix #2010
 2016-06-15 22:17:31 +02:00
Gavin Bisesi
f7d1802390 Check for x86/x86_64 update version on windows. 
Fix #1977
 2016-06-08 18:13:01 -04:00
Gavin Bisesi
0baccd3c00 Merge pull request #2000 from ZeldaZach/fix_1946 
Add set names to dialog
 2016-06-04 16:36:10 -04:00
tooomm
4e198bdf70 Merge pull request #2001 from tooomm/tooomm-patch-1 
typo fix
 2016-06-03 21:25:29 +02:00
tooomm
32f8eb308a typo fix 
`Toogle untap` --> `Toggle untap`
 2016-06-03 20:22:03 +02:00
Zach
47de7beac1 Merge pull request #1999 from ZeldaZach/fix_1476 
Prevent no games from showing
 2016-06-01 02:25:41 -04:00
Zach H
1ff98cfcb4 Add set names to dialog 2016-05-31 20:29:00 -04:00
Zach H
c25eae9d23 Prevent no games from showing 2016-05-31 19:16:05 -04:00
Zach H
829c96673b Add rarity filter to deck editor 2016-05-31 03:33:56 -04:00
ctrlaltca
cf3e172d25 Merge pull request #1981 from MarkyMarkMcDonald/feature/create-token-dialog-uses-name-as-search 
Create token dialog uses name as search
 2016-05-17 21:49:49 +02:00
Mark McDonald
8dd8b434b2 Make "create token" dialog's card name a filter 
* There is a circular update loop I had to cut off where the name field
  updates the filter and then the currentRowChanged signal is firing without a row.

* I chose to make a private method to show intent instead of relying on
  other QLineEdit methods (textEdited) that don't fire signals.

* Some other shenanigans may be at hand that are causing this
  workaround, but my familiarity with Qt is pretty low.
 2016-05-11 21:42:52 -04:00
Mark McDonald
7bc14b594d Include card name criteria when filtering token database model. 2016-05-11 21:42:52 -04:00
Mark McDonald
d12c86d89c Separate search's card name matching out from token filter check 
* Trying to eventually reuse card name filtering in "create token"
  dialog
 2016-05-11 21:42:52 -04:00
Fabio Bas
bb5292aa8d Drop Qt4, libgcrypt, qtmobility dependencies 2016-05-11 12:45:58 +02:00
Zach
e3fb308ea1 Merge pull request #1974 from ZeldaZach/fix_updater 
fix updater from bintray api issue
 2016-05-08 15:08:50 -04:00
Zach H
0163d7af99 fix if/else 2016-05-08 03:35:18 -04:00
Zach H
449982553a remove qt4 check, not needed 2016-05-07 21:51:37 -04:00
Zach H
d46cdd8044 fix updater from bintray api issue 2016-05-07 21:28:45 -04:00
Fabio Bas
01e467fa98 Updated translations 2016-05-06 13:17:20 +02:00
tooomm
a42ef63ec4 removed bracket leftovers 2016-05-04 23:41:09 +02:00
tooomm
a93bef1de5 fix #1833 
remove numbers from the dice roll translatable strings
 2016-05-04 23:21:52 +02:00
Fabio Bas
af3b4ded22 Update translations 2016-04-25 18:45:24 +02:00
Lee Matos
c01d526161 make client gender neutral 2016-04-21 03:44:39 -04:00
Fabio Bas
a340d25077 Fix #1942 2016-04-14 14:36:46 +02:00
Fabio Bas
14d731da98 fix calculation of card info popup size 2016-04-11 17:07:07 +02:00
ctrlaltca
4f30b5cd31 Merge pull request #1921 from ctrlaltca/number 
Implemented !setnumber!
 2016-04-11 15:16:25 +02:00
ctrlaltca
73da10e485 Merge pull request #1919 from ctrlaltca/fix_1918 
Fix english language in options
 2016-04-11 15:16:02 +02:00
Fabio Bas
8c17e2d12a Implemented !setnumber! 
fix #1741
 2016-04-08 22:22:22 +02:00
Fabio Bas
c7061523e6 fix #1915 2016-04-08 19:48:29 +02:00
Fabio Bas
2e7298d064 Fix english language in options 2016-04-08 19:34:28 +02:00
Fabio Bas
e9736d298e Translations update 2016-04-05 19:35:24 +02:00
ctrlaltca
4691f3e2c5 Merge pull request #1906 from ctrlaltca/fix_1903 
Token dialog: disable progressive loading
 2016-04-05 08:30:32 +02:00
ctrlaltca
2b138cce93 Merge pull request #1900 from ctrlaltca/dbview 
Save deck editor's database view columns state
 2016-04-05 08:29:46 +02:00
Fabio Bas
2a3701b036 fix #1903 2016-04-03 18:33:10 +02:00
Fabio Bas
ce56e5f1a4 CardDb: be permissive when loading xmls 2016-04-03 11:15:16 +02:00
Fabio Bas
58f85e7ebd Save deck editor's database view columns state 2016-04-02 09:38:34 +02:00
ctrlaltca
f217551f5f Merge pull request #1877 from Psithief/patch-2 
Prevent PTColumn from being the last column shown.
 2016-03-30 22:55:49 +02:00
ctrlaltca
55f3e9314b Merge pull request #1859 from ctrlaltca/carddb 
Rework some parts of the card database
 2016-03-30 22:55:36 +02:00
woogerboy21
44123b9b0b Untabify 
Yay!  Figured out how to do this in VS2015!
 2016-03-30 15:30:58 -04:00
woogerboy21
506ad91b03 Privatized Function 
Moved the updated hashing function out of the settingscache and into the
remoteclient and privatized the function for proper use.
 2016-03-29 22:00:42 -04:00
woogerboy21
ee849f6379 Updated ClientID Functionality 
ClientID is now generated on startup and stored in settings cache.  Then
upon connect there is a new SrvClientID generated from the ClientID +
servername being connected to
 2016-03-29 17:05:25 -04:00
Fabio Bas
e94f59d7c2 Crash fix 2016-03-22 17:07:45 +01:00
Lee Matos
9f3b50086d Remove "Ghost" Toolbar 
I'm working on a theme and realized we have a toolbar that used to be used for price, which we no longer display. I removed the code (and the unused price code action) as we weren't using either.
 2016-03-21 21:27:38 -04:00
Fabio Bas
a55b3784eb cmake: Enable c++11 for all targets 2016-03-21 11:42:38 +01:00
Fabio Bas
18993b397b First test for card database: loading and clear 2016-03-21 11:08:14 +01:00
Psithief
ba3a9f83bc Prevent PTColumn from being the last column shown. 
P/T column is really narrow. It should go before Card Type, so Card Type can expand into the remaining space.

Improves #1671, assuming I got this correct.

Untested!
 2016-03-19 19:55:57 +08:00
Fabio Bas
df393638ed Small Fix 2016-03-18 21:18:48 +01:00
Zach H
27969b6752 prevent null crash 2016-03-18 14:25:29 -04:00
Fabio Bas
1e3fb6c6e1 Rework "paths" settings loading and card database loading 
* main.cpp: removed path checking and db loading
 * card database: merge card loading methods into a single one
 * settings cache: take care of returning safe paths for decks,
replays, etc..
 * main window: if db loading fails (eg. first run), propose to run
oracle

NSIS: propose to run cockatrice instead of oracle

Rework card database loading

 * Move carddatabase-related method out of deckeditor tab
 * Load cards in another thread and render them progressively
 * Optimize database reload after enabled sets change

Fix deck editor column width

 * removed the noCard hack.
 * getCard() no more creates cards instead of just returning existing
ones
 * Fix the “edit tokens” dialog.
 * PictureLoader: avoid trying to download twice the same card
 * PictureLoader: correct return of card background
 * AbstractCardItem: avoid recalculating card color at every paint

Use a different file to save custom tokens

Misc required improvements

 * Use nullptr;
 * Refactor CardInfoWidget to use CardInfoPicture and CardInfoText
instead of duplicating code;
 * Added CardInfo::getColorChar()
 * Fixed some potential crashes
 * removed dead code related to CardInfoWidget
 * Don't require a restart after adding a new custom sets file
 * Bump CMake requirements to 3.1
 2016-03-15 22:27:55 +01:00
ctrlaltca
b2c1ae264b Merge pull request #1832 from tooomm/restructure 
move sounds+themes folder inside cockatrice
 2016-02-24 21:38:09 +01:00
tooomm
754e666eaa updated to new folder locations 
- `sounds` and `themes` moved into `cockatrice/`

moved subdirectory reference
`/cmakelists` to `/cockatrice/cmakelists`
 2016-02-24 15:41:04 +01:00
Gavin Bisesi
bc79d9e2f8 Merge pull request #1796 from zebington/feat/custom-set-import 
Add "Import custom set" function
 2016-02-24 09:12:31 -05:00
Zach
5b22187a3d Merge pull request #1794 from zebington/master 
Fixes for create game dialogue.
 2016-02-16 17:07:28 -05:00
Fabio Bas
a8c723326d Game tab: use short title for undocked wdgets 
fix #1777
 2016-02-12 14:49:37 +01:00
Fabio Bas
ae8296a50e Game tab: reset docks sizes on "reset layout" 2016-02-11 18:29:50 +01:00
Ira Aspen
aa658f95f6 Gave error dlg a description of the error for the user. 2016-02-09 03:10:57 +00:00
Ira Aspen
d078cf52c9 Removed unnecessary confirmClose() call. 2016-02-09 02:57:23 +00:00
Ira Aspen
96fbad1f0c Moved get next set index code to own function 2016-02-09 02:55:52 +00:00
Ira Aspen
829f84fe50 Moved from using hex QT version checks to QT_VERSION_CHECK(). 2016-02-09 01:56:24 +00:00
Ira Aspen
0ef2b48902 Refactored DlgAddSet class/functions to DlgAddSetResult 2016-02-09 01:52:09 +00:00
Ira Aspen
5a975831d4 Renamed "dlg_add_set.*" to "dlg_add_set_result.*" and updated references. 2016-02-09 01:40:21 +00:00
Fabio Bas
058b913455 Game: save and restore dock sizes 2016-02-07 21:58:51 +01:00
Ira Aspen
9d3c4f20a1 Changed strings referencing a set to say sets/cards. 2016-02-07 01:41:35 +00:00
tooomm
802ccd7f14 shortcut tabs adjustments 
- typo fix
- improved description of some shortcuts
 2016-02-06 19:29:57 +01:00
Ira Aspen
b5363f47ab Updated message. 2016-02-06 12:42:45 +00:00
Ira Aspen
927226633d Moved menu item decleration to work on all OSs. 2016-02-06 02:37:34 +00:00
Ira Aspen
de388a74bd Moved exec statement. 2016-02-06 02:32:04 +00:00
Ira Aspen
54a759497f Added confirmation dialogue when set added. 2016-02-06 02:29:09 +00:00
Ira Aspen
c914395236 Finished add set functionality. 2016-02-06 01:33:43 +00:00
Ira Aspen
2960cba12b Added a file picker to the add set menu item. 2016-02-05 21:09:24 +00:00
Ira Aspen
646c4b4197 Added functionless menu button for adding a set. 2016-02-05 20:32:40 +00:00
Ira Aspen
9846fb1d8e Made reseting the create game dialogue box only select 'Only regeistered users' if player is a registered user. 2016-02-05 19:32:27 +00:00
Ira Aspen
154da4452d Made create game box prevent only buddies can join being selected for unregistered users. 2016-02-05 19:29:19 +00:00
Fabio Bas
50dde5dde1 Some updated translations from transfix 2016-02-02 22:04:49 +01:00
Fabio Bas
7c128f69b0 Updated translations 2016-01-29 00:30:54 +01:00
Gavin Bisesi
7de8e8a6a7 Merge pull request #1747 from tooomm/about_url 
[WAIT] added webpage to about window
 2016-01-28 18:02:37 -05:00
ctrlaltca
5dd20181fd Merge pull request #1753 from ctrlaltca/pr_1544 
Re-Dockified the game & replay review areas
 2016-01-28 22:44:32 +01:00
ctrlaltca
14e94f1f8b Merge pull request #1767 from Fizztastic/fix_1764 
Sounds on buddy login & logout.
 2016-01-28 22:33:10 +01:00
Fabio Bas
ee42d547bf Disable downlod button when download starts 2016-01-28 22:27:14 +01:00
ctrlaltca
5577d618bd Merge pull request #1727 from TMiguelT/target 
Client update implementation
 2016-01-28 22:25:54 +01:00
ctrlaltca
7ec3968c02 Merge pull request #1770 from ctrlaltca/fix_pixmaps 
Fix pixmap usage in pictureloader
 2016-01-23 18:23:55 +01:00
Fabio Bas
133693d9ce Fix pixmap usage in pictureloader 
fix #1765
 2016-01-23 11:00:10 +01:00
Jeff
9767b1f69d Fix #1764 
Add Sounds on buddy login & logout.
Add Files: buddy_join.wav; buddy_leave.wav
 2016-01-22 15:03:01 -05:00
Michael Milton
66fda086c3 Client update implementation 2016-01-20 22:26:17 +01:00
woogerboy21
f57e0454bb Dockified the game & replay review areas 2016-01-16 00:54:14 +01:00
Zach
36c3536e0c Merge pull request #1721 from ctrlaltca/speedup 
Misc speedups in card database
 2016-01-15 18:43:01 -05:00
Fabio Bas
3605cc55b7 fix replay progress bar 2016-01-13 00:17:02 +01:00
tooomm
953b183dab added url to about 
added gh pages url
 2016-01-09 22:53:54 +01:00
Zach H
e0a25e74ac fix merge issues 2015-12-30 11:54:30 -05:00
Zach H
f568a4e865 todo 2015-12-30 11:51:53 -05:00
Zach H
703ff7905c token coordinates 2015-12-29 23:43:03 -05:00
Zach H
da0e3292d3 Token PT shown in create related dialog 2015-12-29 18:28:41 -05:00
Lee Matos
8a6d63265f Enable HiDpiPixmaps for Qt5 2015-12-28 22:03:38 -05:00
Fabio Bas
fddcbb8296 Lazy loading of card database view => faster startup times 2015-12-28 15:26:10 +01:00
ctrlaltca
c917a6c272 Merge pull request #1722 from ctrlaltca/rev-related 
Implement reverse-related tag for cards
 2015-12-27 18:44:05 +01:00
Zach H
137d7328b5 coin flip 
remove male/female as it's same

male/female fixes

translate
 2015-12-27 12:34:11 -05:00
Fabio Bas
4b1c59424e Implement reverse-related tag for cards 2015-12-26 19:57:20 +01:00
Fabio Bas
e721280bc0 Implemented proposed changes 2015-12-26 16:40:17 +01:00
Fabio Bas
4d7795ca3a Split pictuloader out of carddatabase 2015-12-26 16:40:17 +01:00
Fabio Bas
696ae7e85f Add gear icon to settings menu entry 2015-12-19 11:48:54 +01:00
Fabio Bas
5093ea4170 Small typos + reextracted strings 2015-12-15 16:31:58 +01:00
Fabio Bas
2712dd4248 Extracted new translation strings 2015-12-15 15:59:20 +01:00
Fabio Bas
ed4149fa7b Add .txt to the common deck file types 
fix #1683
 2015-12-13 12:00:39 +01:00
ctrlaltca
0c137e8a10 Merge pull request #1662 from BrandonGriffin/SetFocusOnDescriptionWhenLoadingGameDialog 
Added set focus to description anytime a create dialog is opened
 2015-12-12 18:17:12 +01:00
ctrlaltca
de6235f69c Merge pull request #1698 from ctrlaltca/fix_1694 
Improved login error message
 2015-12-12 09:15:01 +01:00
ctrlaltca
a07b72a031 Merge pull request #1699 from ctrlaltca/fix_1687 
Fix column widths in rooms list
 2015-12-12 09:14:51 +01:00
Fabio Bas
deec7cdc14 Avoid crash on dereferencing null pointer 2015-12-11 19:32:08 +01:00
Fabio Bas
803589264d Fix column widths in rooms list 2015-12-11 18:51:40 +01:00
Fabio Bas
beecc0f970 Improved login error message 2015-12-11 18:42:29 +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
Brandon Griffin
813a0c2070 Added set focus to description anytime a create dialong is opened 2015-10-27 08:58:29 -04:00
Brandon Griffin
64c15d1fdc Changed the default setting to play cards to the stack 2015-10-23 20:11:13 -04:00
ctrlaltca
613f712974 Merge pull request #1646 from ctrlaltca/debian_package 
CPack: Debian package
 2015-10-17 09:33:06 +02:00
ctrlaltca
75eb779826 Merge pull request #1637 from ctrlaltca/cmdjoin_handler 
Handle more Command_JoinRoom return values
 2015-10-16 11:48:40 +02:00
Fabio Bas
23e84273ed If the user request to join a room and we are already in, just focus the correct tab 
Also, handle all the Command_JoinRoom return values
 2015-10-15 19:17:02 +02:00
Fabio Bas
bab4a51ebb CPack: Debian package 2015-10-13 22:16:00 +02:00
Fabio Bas
7fe60279de Fix PR #1600 2015-10-09 14:59:42 +02:00
Gavin Bisesi
3ebe42c400 Add dummy googletest 
Uses the built in cmake -Dtest=ON

It should download googletest on the fly if needed.

Adds a new make target, `make test`

Ref #167
 2015-10-09 14:58:46 +02:00
ctrlaltca
43262b294d Merge pull request #1620 from ctrlaltca/fix_rpath 
Fix qt libraries bundling on osx
 2015-10-02 17:54:10 +02:00
ctrlaltca
b0e9e0fb3a Merge pull request #1603 from ctrlaltca/fix_audio 
Fix volume control
 2015-10-02 14:46:30 +02:00
Fabio Bas
74c58cc2b0 fix qt libraries bundling on osx 
fix #1547
 2015-10-01 23:35:54 +02:00
Psithief
ca9bfc9ff2 Revert focus policy change in tab_game 
Fixes #1529.

Completely untested, because I don't think this could possibly interfere with anything. It's a straight revert.
 2015-10-01 12:00:30 +08:00
Fabio Bas
a9f2cd73de Fix volume control 
fix #1528
 2015-09-28 12:24:22 +02:00
Zach
d5adec53a2 Revert "Reimplemented PictureLoader as a singleton" 2015-09-23 03:17:33 -04:00
Zach
064c89ba5c Merge pull request #1556 from ctrlaltca/carddatabase_changes 
Reimplemented PictureLoader as a singleton
 2015-09-23 01:21:37 -04:00
woogerboy21
62ffcde6bd Added logs tab to allow moderators the ability to review log history/details 2015-09-23 00:50:01 -04:00
Zach
e68b8b314a Merge pull request #1522 from woogerboy21/offical_warnings 
Added official warning messages moderators can use to inform users
 2015-09-22 23:29:12 -04:00
woogerboy21
6ad2a59367 Added official warning messages moderators can use to inform users 2015-09-22 22:27:46 -04:00
Fabio Bas
e0383af6dd workaround "Signals are protected in qt4" 2015-09-22 23:57:39 +02:00
Fabio Bas
ac16602f08 Fix crash on null pointer dereference 2015-09-22 23:46:41 +02: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
Zach
3f70513096 Merge pull request #1555 from ctrlaltca/cards_crash 
Fix crash on loading invalid cards.xml
 2015-09-22 16:19:12 -04:00
Zach
8125358052 Merge pull request #1523 from marcofernandezheras/Restore-Shortcuts 
Restore shortcuts
 2015-09-22 16:00:49 -04:00
Fabio Bas
7a4bf9a313 Fix crash on loading invalid cards.xml 
Additionally, move the custom database load after the LoadStatus check,
so that they don't bring up the “fix your card database path” settings
dialog
 2015-09-22 21:56:02 +02:00
Zach
aacbe93d04 Merge pull request #1540 from ctrlaltca/remove_unused_sounds 
Removed unused sound names
 2015-09-22 15:51:05 -04:00
woogerboy21
cd7b25f712 Fix #1542 
This should fix #1542 (please test)
 2015-09-22 01:19:31 -04:00
Fabio Bas
2df50f5766 Removed unused sound names 2015-09-20 12:08:55 +02:00
marco
599ef0ae62 Confirmation to clear/restore shortcuts 2015-09-20 00:21:07 +02:00
Zach
1409b97490 Merge pull request #1530 from ZeldaZach/fix_1527 
Minors Fixes for #1527
 2015-09-18 10:18:12 -04:00
Zach H
ccc8ac4826 minor fixes 2015-09-18 09:56:32 -04:00
Fabio Bas
2a20b6028e Changed problematic shortcuts 2015-09-18 08:38:54 +02:00
woogerboy21
b0693299c7 Added server private message functionality to allow server based PM notifications. 
Ban based notification to other online moderators is the first form implemented by this PR.
 2015-09-17 22:40:29 -04:00
marco
0ce38ea88e Reset & Clear all shortcuts 
This closes #1517
 2015-09-16 13:35:26 +02:00
marco
8eacd85d68 Link to wiki: how to set shortcuts 2015-09-16 12:30:32 +02:00
ctrlaltca
c7c84bca8f Merge pull request #1521 from tooomm/patch-2 
remove debug code; fix #1520
 2015-09-16 08:42:48 +02:00
tooomm
1bec6dc37a shortcut tabs adjustments 
- `|` over `/` to make `P/T` better readable
- Game play --> Gameplay
- Player - Playing Area
 2015-09-15 18:56:53 +02:00
tooomm
814553dae6 remove debug code 
fixes #1520
 2015-09-15 18:53:06 +02:00
Zach
385455e77c Merge pull request #1510 from woogerboy21/room_message_history 
Added chat history to a room that is displayed on join
 2015-09-15 12:10:37 -04: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
Zach
3412ce2f7d Merge pull request #1501 from marcofernandezheras/Fix-Shortcut-Detection 
Fix shortcuts detection on settings & game
 2015-09-14 16:02:45 -04:00
marco
4c6b543cbe Fix shortcuts detection on settings & game 
Fix #1499, Fix #1493, Fix #1477
Fix typo
 2015-09-14 16:56:51 +02:00
Fabio Bas
a6bc709583 merged master 2015-09-13 19:39:42 +02:00
Fabio Bas
5aaae5279c revert to using QAudioOutput 2015-09-13 19:37:49 +02:00
Zach
f2864ce569 Merge pull request #1511 from ctrlaltca/theme_extensions 
Themes: don't use hardcoded extensions on images
 2015-09-13 13:26:12 -04:00
Fabio Bas
f78c01fa88 Avoid multiple sounds playing at the same time 2015-09-13 17:22:58 +02:00
woogerboy21
46f78fcead Fix server crash on banning 2015-09-13 00:52:52 -04:00
Fabio Bas
85aa866e02 sound themes 2015-09-13 02:01:50 +02:00
Fabio Bas
28df389ea6 Fixed flags size: they're not squared 2015-09-13 00:53:11 +02:00
Fabio Bas
dfe9719637 Removed unused parameter 2015-09-13 00:26:28 +02:00
Fabio Bas
00e3e63f41 Themes: remove all hardcoded extensions 2015-09-13 00:14:36 +02:00
Jeff
32df2c29ed Fix library, grave, exile crash on windows 2015-09-12 17:24:36 -04:00
Zach
226a8cc017 Merge pull request #1498 from ctrlaltca/sound_whatever 
Reworked SoundEngine overhaul
 2015-09-12 00:35:20 -04:00
Zach
4c9555bb59 Merge pull request #1496 from ctrlaltca/clamp_zoneview 
Clamp zone view widget's titlebar inside the viewable area
 2015-09-12 00:34:12 -04:00
Zach
29446d80d4 Merge pull request #1469 from woogerboy21/request_ban 
Added the ability or moderation staff to request user ban history
 2015-09-10 21:34:16 -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
0b072e2d60 Remove dependency to qt multimedia/mobility under qt4 and unused phonon plugins 2015-09-11 00:42:37 +02:00
Fabio Bas
b2f855aeb0 fix settings icon spacing 2015-09-10 23:37:16 +02:00
Fabio Bas
a7616835e3 Clamp zone view widget's titlebar inside the viewable area 2015-09-10 23:29:01 +02:00
woogerboy21
90cb890cc2 Added the ability or moderation staff to request user ban history 2015-09-10 16:02:45 -04:00
Jeff
badbcf2753 Fix sound test button 2015-09-09 16:47:09 -04:00
Jeff
d6398477ae SoundEngine overhaul 2015-09-09 02:24:02 -04:00
Zach
05aa8b2c92 Merge pull request #1474 from woogerboy21/no_tab_close 
Do not close message tabs on disconnect
 2015-09-09 00:04:06 -04:00
woogerboy21
7bfea03af8 Do not close message tabs on disconnect 2015-09-08 14:38:48 -04:00
ctrlaltca
c984a7c962 Merge pull request #1488 from ctrlaltca/translations 
Translations update
 2015-09-08 19:25:34 +02:00
Fabio Bas
fcc5370082 Fetched new translations 2015-09-08 19:12:41 +02:00
Fabio Bas
5951c95e81 extracted new translatable strings 2015-09-08 19:10:57 +02:00
Fabio Bas
c214234bb2 fix typo 2015-09-08 19:08:34 +02:00
Zach
aac980a8cb Merge pull request #1485 from ctrlaltca/fix_notification_click 
Don't change window maximized state when clicking a notification
 2015-09-08 12:49:00 -04:00
Zach
601ada8473 Merge pull request #1484 from ctrlaltca/fix_f12 
Fix loading of "increase life counter" shortcut in settings
 2015-09-08 12:43:27 -04:00
Zach
b47aa86c84 Merge pull request #1483 from ctrlaltca/deckeditor_filter_buttons 
Add back "remove" buttons to deck editor's filter
 2015-09-08 12:33:15 -04:00
Zach
73f2d2b0e5 Merge pull request #1478 from ctrlaltca/fix_replay_crash 
Fix replay crash due to completer
 2015-09-08 12:31:59 -04:00
Fabio Bas
4ee12f0b69 Don't change window maximized state when clicking a notification 2015-09-08 17:49:31 +02:00
Fabio Bas
db18c7da10 Fix loading of "increase life counter" shortcut in settings 2015-09-08 17:13:47 +02:00
Fabio Bas
3be1bcd356 Add back "remove" buttons to deck editor's filter 2015-09-08 10:25:33 +02:00
Fabio Bas
50aa6e3a4d Fix autoconnect 2015-09-08 08:37:19 +02:00
Fabio Bas
f14ebb0028 Fix replay crash due to completer 2015-09-08 08:12:00 +02:00
marco
36f19be06a Fix thememanager on portable build 2015-09-06 18:29:48 +02:00
Fabio Bas
e50d0c6db2 get cardback image from theme 2015-09-06 11:44:19 +02:00
woogerboy21
9dc77d674f Fix older gcc nested pre-def with portable builds 2015-09-05 17:44:51 -04:00
Zach
60ed9fd1ff Add slash 2015-09-03 14:56:23 -04:00
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
Zach
f4ae08f8b1 Merge pull request #1439 from woogerboy21/feature_check 
Added server/client feature set communication
 2015-09-02 23:38:53 -04:00
woogerboy21
044c2356ff Added server/client feature set communication 2015-09-02 17:54:06 -04:00
Zach
3188ef4cde Merge pull request #1444 from woogerboy21/fix_blank_ban 
Detect if a use is trying to place an invalid ban
 2015-09-01 22:20:05 -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
woogerboy21
66c19ab727 Detect if a use is trying to place an invalid ban 2015-08-31 01:00:13 -04:00
Fabio Bas
fcff6301ed Fetched new translations. Arrr! 2015-08-27 18:32:14 +02:00
tooomm
83e9f9deba typos resolved 
@marcofernandezheras ok?
 2015-08-26 15:33:05 +02:00
marco
0b94b47f72 Servatrice portable + cmake options 
Use -DPORTABLE=1 to build a portable version
 2015-08-25 21:25:13 +02:00
marco
4125d690fa Fix merge & relative path for portable build 2015-08-25 20:22:31 +02:00
woogerboy21
364df4daf0 Extend the login protocol to send the client id (as optional) 2015-08-24 11:38:24 -04:00
Zach
324ddda4dd Merge pull request #1416 from ZeldaZach/fix_1411 
Define URLs
 2015-08-23 23:00:22 -04:00
Zach
14da4efe6d Merge pull request #1414 from ZeldaZach/fix_1412 
Prevent bad flags
 2015-08-23 17:59:52 -04:00
Zach H
a8727d5a50 define URLs 2015-08-23 17:57:26 -04:00
Zach
4d2fdaec08 Merge pull request #1407 from Fizztastic/fix_1396 
Option to opt-out of remember game settings
 2015-08-23 16:28:01 -04:00
Zach H
8ffe310855 prevent bad flags 2015-08-23 16:27:18 -04:00
ctrlaltca
ab33258ce9 Merge pull request #1415 from ctrlaltca/translations 
Translations: extracted new strings
 2015-08-23 20:54:50 +02:00
Fabio Bas
b335bc5e7d Translations: extracted new strings 2015-08-23 20:54:11 +02:00