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

3493 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ctrlaltca
f20e2ce2bd Merge pull request #2185 from tritoch/pending-mtgjson-Ae 
Pending mtgjson/gatherer Æ-->Ae conversion
 2016-10-14 14:07:19 +02:00
tritoch
696b11475e Merge pull request #2 from Cockatrice/master 
Bring current
 2016-10-13 16:05:40 -05:00
woogerboy21
a4b1a79cd4 Merge pull request #2195 from wincinderith/login-error-fix 
Prevent login error handler being incorrectly called
 2016-10-11 11:33:48 -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
89ceb889e0 Merge pull request #2209 from woogerboy21/inactivetimeout 
Idle Client Timeout Functionality
 2016-10-09 14:40:53 -04: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
ctrlaltca
e4127fead3 Merge pull request #2199 from wincinderith/load-remote-fix 
Disable "Load remote deck..." button in local game
 2016-10-05 14:25:50 +02:00
ctrlaltca
d8f7c57eff Fixed travis build on osx 2016-10-05 14:24:50 +02: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
tritoch
85063859e0 Pending mtgjson/gatherer Æ-->Ae conversion 
This is to prepare for when mtgjson converts all Æ cards to 'Ae'.  Formerly it was 'AE'.
 2016-09-23 09:23:47 -05:00
tritoch
b23a53eb1e No "Ae" --> "AE" translate (#2182) 2016-09-23 00:03:38 -04:00
Zach H
6c7ba06930 add pow/toughness filters (#2169) 2016-09-20 18:17:53 -04:00
ctrlaltca
65c98c8422 Merge pull request #2179 from ctrlaltca/fix_gtest 
fix google tests
 2016-09-20 22:39:35 +02: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
ctrlaltca
54cc0c2af6 Merge pull request #2178 from ctrlaltca/translations 
Updated translations
 2016-09-20 22:27:17 +02:00
Fabio Bas
0e8206a36f Updates translations 2016-09-20 22:23:36 +02:00
Fabio Bas
018a4736c6 fix google tests 2016-09-20 21:50:32 +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
Gavin Bisesi
bf4fba6bc5 Readme: Reference "easy" changes issue tickets (#2157) 2016-08-31 14:13:13 -04:00
ctrlaltca
8571815cbd Merge pull request #2134 from ctrlaltca/fix_1992 
Renamed !setnumber! to !collectornumber!
 2016-08-27 10:02:58 +02:00
Fabio Bas
ae456a5bc3 Renamed !setnumber! to !collectornumber! 2016-08-20 10:27:23 +02:00
ctrlaltca
da2eb97c7b Merge pull request #2125 from ctrlaltca/fix_1762 
Fix clipboard behavior in deck editor and game
 2016-08-10 09:23:33 +02:00
ctrlaltca
ac841ee2c6 Merge pull request #2117 from ctrlaltca/fix_2088 
Webclient: misc improvements (was: parse html in server message)
 2016-08-09 11:14:01 +02:00
Fabio Bas
c321227fa7 Fix clipboard behavior in deck editor and game 2016-08-09 11:13:36 +02:00
Fabio Bas
a68df3611b Fix #2088 
Add an autocomplete with known server names to the connect dialog;
Added support for server messages (identification, shutdown, user
warning and promotion)
Connection dialog’s inputs are now wider
Only declare implemented client features
Added check for protocol version on connect before login
Avoid listbox being rendered as dropdown on mobiles
 2016-08-09 10:39:03 +02:00
ctrlaltca
0f0f9a1246 fix #2118 (#2119) 2016-08-02 21:58:56 -04:00
ctrlaltca
1834e09c0f Merge pull request #2115 from Cockatrice/single_game_types 
Radio buttons for game types
 2016-07-30 10:31:04 +02:00
poixen
0df4b34fe4 radio buttons for game types 2016-07-27 21:21:28 +02:00
ctrlaltca
8644016d3c Merge pull request #2114 from ctrlaltca/fix_2107 
Webclient: Fix room closing on disconnect
 2016-07-26 12:50:39 +02:00
Fabio Bas
8eb36fa2f1 fix #2107 2016-07-26 12:49:07 +02:00
woogerboy21
deb6d4dec6 Merge pull request #2111 from woogerboy21/fix_serv_sql_file 
Corrected servatrice.sql file room table entries that were missed
 2016-07-25 01:19:14 -04:00
woogerboy21
5002c293c7 Corrected servatrice.sql file room table entries that were missed 2016-07-25 01:01:35 -04: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
mlowe
f87f677cad Merge pull request #2103 from Cockatrice/space 
More screen space
 2016-07-22 15:07:54 +02:00
woogerboy21
569ae87cbe Merge pull request #2101 from woogerboy21/remove_news_table 
Remove news table (cleanup)
 2016-07-21 23:29:53 -04:00
poixen
f2cd276e5f more screen space 2016-07-21 20:06:45 +02:00
woogerboy21
1c1192c525 Update maint script files 2016-07-21 10:38:46 -04:00
woogerboy21
b39a18b446 Remove unused news database table 2016-07-21 10:30:38 -04: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
8060c8f37b Merge pull request #2099 from woogerboy21/serverid_roomdbgtable_fix 
Servatrice rooms table respect Server ID
 2016-07-21 09:54:20 -04:00
woogerboy21
63bf0029aa Updated client id generation to use host ip rather than name 2016-07-21 09:20:28 -04:00