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

1907 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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