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

3457 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
woogerboy21
600a8e8c60 Update servatrice to respect server id when doing room information lookups 2016-07-21 09:09:06 -04:00
mlowe
a83816f858 Merge pull request #2100 from Cockatrice/connect_dlg 
Updated connect dlg
 2016-07-21 14:35:34 +02: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
ctrlaltca
b28b174056 Merge pull request #2097 from ctrlaltca/fix_shutdown 
Remove additional minute in server shutdown
 2016-07-19 13:21:33 +02:00
Fabio Bas
36e62df67d Remove additional minute 2016-07-19 11:57:11 +02:00
Zach H
d82564d84c Shutdown timer changes (#2084) 
* change msg popup time from 10min to 30min

* countdown at half time

* simplify math

* move shutdown after checks
 2016-07-15 14:02:40 -04:00
mlowe
3365e0461c Merge pull request #2083 from Cockatrice/connect_dlg 
updated login
 2016-07-15 16:46:39 +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
81006d5342 Merge pull request #2080 from ZeldaZach/fix_reset 
show buddyOnly on filter clear
 2016-07-14 17:39:25 -04:00
Zach H
edd50a7571 show buddyOnly on filter clear 2016-07-14 16:56:17 -04:00
ctrlaltca
cbff59ae59 Merge pull request #2078 from skwerlman/patch-1 
fix typo in sample servatrice ini
 2016-07-14 09:06:47 +02:00
skwerlman
deb8a2c954 fix typo in sample servatrice ini 2016-07-14 03:01:11 -04:00
ctrlaltca
0c731e378a Merge pull request #2077 from ctrlaltca/webclient_ui 
Some web client UI fixes
 2016-07-13 09:01:33 +02:00
Fabio Bas
1a38e4ef98 Some web client UI fixes 2016-07-12 23:15:42 +02:00
mlowe
8cd5803556 Merge pull request #2071 from Cockatrice/game_view_time 
Game Viewer Update
 2016-07-12 11:34:44 +02:00
poixen
a729b1c966 updated game created coloumn text 2016-07-12 09:31:27 +02:00
tooomm
8ac1469fdb typo fix 2016-07-10 11:05:54 +02:00
ctrlaltca
a11e57503e CONTRIBUTING: Syntax highlight, protobuf 2016-07-10 11:01:15 +02:00
ctrlaltca
35df6485ab CONTRIBUTING: C++11, nullptr, Database migrations 2016-07-10 10:47:19 +02:00
ctrlaltca
d4ced6f6af Merge pull request #2067 from ctrlaltca/fix_2066 
Fix compilation warning
 2016-07-09 10:31:55 +02:00
Fabio Bas
430f1baf2f make gcc an happy puppy 2016-07-09 10:18:12 +02:00
tooomm
e29230953d Changes to recommended DL + chat link (#2064) 
* Changes to recommended DL + chat link
* wording update
 2016-07-08 21:07:41 +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
mlowe
b64ff6f930 Merge pull request #2052 from Cockatrice/metion_fix 
Fixed mention bug
 2016-07-04 21:06:19 +02:00
poixen
3717c7440a Fixed mention bug 2016-07-04 20:23:32 +02:00
ctrlaltca
066aff96d7 Merge pull request #2049 from Cockatrice/filterBuddiesOnly 
filter buddies only
 2016-07-03 23:08:44 +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
Gavin Bisesi
b61e023267 Merge pull request #2047 from Cockatrice/autoadmin 
Enable admin features on login and remove "are you sure" prompt
 2016-07-02 19:49:02 -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
Zach
277d7e2173 Merge pull request #2039 from Cockatrice/tooomm-log_dlg_title 
log ui window: title change
 2016-06-30 11:32:28 -04:00