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

2626 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabio Bas
16d9534757 fix for -Werror=unused-parameter 2015-05-23 21:09:29 +02:00
Fabio Bas
d7b6f76191 missing file from previous commit 2015-05-23 20:13:21 +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
Gavin Bises
735fcbf311 Add first draft of protocol extension for registration 
Stub for registration command handling in server

First draft of handling registration requests

WIP (will be rebased)

clean up bad imports (rebase this later)

Finish checkUserIsBanned method

Add username validity check

Check servatrice registration settings

WIP

Finish(?) server side of registration

Needs testing

Fix switch case compile failure

I have no idea why I have to do this

WIP for registration testing python script

Stub register script initial attempt

Rearrange register script

First try at sending reg

register.py sends commands correctly now

Add more debug to register.py

Pack bytes the right way - servatrice can parse py script sends now

register.py should be working now

Parse xml hack correctly

Log registration enabled settings on server start

Insert gender correctly on register

Show tcpserver error message on failed gameserver listen

Fail startup if db configured and can't be opened.

TIL qt5 comes without mysql by default in homebrew...
 2015-05-22 18:55:51 +02:00
poixen
d1b243481b Merge pull request #1086 from poixen/sounds 
updated sounds
 2015-05-22 11:19:50 +02:00
poixen
8eeec5ac7c Merge pull request #1087 from poixen/room_type 
Added game type to tab title
 2015-05-22 11:11:44 +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
Zach
544666a3bc Merge pull request #1096 from ctrlaltca/update_spaces 
Fix card update under windows
 2015-05-21 16:07:37 -04:00
Fabio Bas
227c18fc5a Fix card update under windows 
It failed if the path contained spaces.
 2015-05-21 21:39:51 +02:00
Zach
5975184d67 Merge pull request #1091 from ZeldaZach/oracle_hideaway 2015-05-21 14:06:20 -04:00
ctrlaltca
66c194e27e Merge pull request #1095 from ctrlaltca/translations 
fixed untranslatable string, regenerated translations
 2015-05-21 19:45:42 +02:00
Fabio Bas
ff20e04842 fixed untranslatable string, regenerated translations 2015-05-21 19:40:17 +02:00
ctrlaltca
c07e5e5970 Merge pull request #1094 from ctrlaltca/translations 
Removed gaelic translation from oracle, too
 2015-05-21 19:15:59 +02:00
Fabio Bas
df83a82fa3 Removed gaelic translation from oracle, too 
The cockatrice translation has been removed yesterday.
 2015-05-21 19:14:31 +02:00
Zach
d71c0b277f Merge pull request #1090 from tooomm/patch-1 
expanded wording of name conflicts for tokens /2
 2015-05-21 09:47:00 -04:00
Zach H
56c1a7f8b4 hideaway update 2015-05-21 09:45:16 -04:00
tooomm
7db7b7fb06 expanded wording of name conflicts for tokens /2 
- removed space
- fixed wording
 2015-05-21 15:17:52 +02:00
ctrlaltca
15dcfd1566 Merge pull request #1089 from ctrlaltca/translations 
Translation updates
 2015-05-20 19:44:51 +02:00
Fabio Bas
4da1404a06 Translation updates 2015-05-20 19:43:52 +02:00
Matt Lowe
6ce07ebef2 Remade tap sound 2015-05-20 13:14:40 +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
Matt Lowe
1d2d7ea99b updated sounds 
+ End step is now higher, so that it is easier to hear
+ Both end step and tap are a little louder

Updated sounds
 2015-05-19 23:42:03 +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
Zach
5d08236cbe Merge pull request #1079 from ctrlaltca/fix_918 
Removed resolved issues from TODO.md; fix #918
 2015-05-16 13:08:51 -04:00
Fabio Bas
fab4781395 Removed resolved issues from TODO.md 
Remove old unused sets.xml related files
Remove faqs and shortcuts doc since they’re outdated and been rewritten
in the wiki
 2015-05-16 18:50:51 +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
poixen
02453d3576 Merge pull request #3 from ctrlaltca/pr_1051 
Add backward compatibility for new client on old servers
 2015-05-15 20:36:35 +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
Fabio Bas
76422854a4 NSIS: default to INSTDIR\sounds directory 2015-05-14 15:36:29 +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
ctrlaltca
18da49d454 Merge pull request #1068 from ctrlaltca/fix_1063 
Fix macro for MSVC; fix #1063
 2015-05-11 09:12:25 +02:00
Fabio Bas
590894d283 Fix macro for MSVC; fix #1063 2015-05-11 09:00:25 +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
ctrlaltca
50ab6295c5 Merge pull request #1062 from ctrlaltca/nsis 
NSIS installer improvements; refs #876
 2015-05-09 11:00:34 +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
ctrlaltca
474d952242 Merge pull request #1064 from ctrlaltca/fix_1063 
Remove spaces and parenthesis from package names; hopefully fix #1063
 2015-05-08 15:35:43 +02:00