gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-30 23:50:19 -07:00
Code Issues Packages Projects Releases Wiki Activity
2,656 Commits 53 Branches 176 Tags
1d08dc581be645cf2f808f5af5581f904e225d3f
Commit Graph
2656 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gavin Bises 1d08dc581b Notify slack for travis builds 2015-06-02 13:20:04 -04:00
ctrlaltca 2de99475b0 Merge pull request #1121 from ctrlaltca/fix_1119 
Permit the use of the same game type in more rooms; Fix #1119
 2015-05-31 16:55:22 +02:00
Fabio Bas 83773e5e37 Fix #1119 2015-05-31 16:52:22 +02:00
ctrlaltca be641a3146 Merge pull request #1120 from ctrlaltca/fix_1102 
Fix "welcome" popup appearing more than once
 2015-05-31 16:33:55 +02:00
Fabio Bas 7ff318bd04 Fix "welcome" popup appearing more than once 2015-05-31 16:32:46 +02:00
Zach dd16ea78ac Merge pull request #1115 from poixen/text_highlight 
Highlight text after adding card
 2015-05-30 18:51:25 -04:00
woogerboy21 28ccec711e Merge pull request #1101 from ctrlaltca/registration 
[WIP] In-client Registration support
 2015-05-30 13:49:04 -04:00
Matt Lowe 7d2ad9ee3b Highlight text after adding card 
After adding a card to the main or side, the search text will become
selected to easily start the next search
 2015-05-30 16:50:52 +02:00
ctrlaltca fab0a0ee4e Merge pull request #1110 from tooomm/text-works2 
text works
 2015-05-30 14:23:48 +02:00
ctrlaltca 595d70cf23 Merge pull request #1088 from ctrlaltca/customsets 
Load additional xml sets from $userprofile/customsets/
 2015-05-30 14:23:01 +02:00
Fabio Bas 657a5164e9 Fix servatrice compilation with msvc 2015-05-25 17:07:47 +02:00
tooomm 3767d49407 resolved typo 2015-05-25 03:27:27 +02:00
Fabio Bas 13b8fd4516 gcc -Werror=unused-parameter 2015-05-24 23:15:23 +02:00
Fabio Bas 471f6371b5 More work 
* Refactored code out of common/ into servatrice/
 * added smtp client library
 * disable registration when connected
 * validate email address
 * send activation token via email
 2015-05-24 23:02:51 +02:00
Fabio Bas 8cf4461616 fix qt4 compilation 2015-05-24 01:00:55 +02:00
Fabio Bas d6cee242e3 Another gcc warning-as error removal 2015-05-24 00:53:08 +02:00
Fabio Bas 21155ce54a Make gcc an happy puppy (-Wunused-parameter) 2015-05-24 00:47:12 +02:00
Fabio Bas ff1aed717e Added token generation, user activation command and response. 2015-05-24 00:37:45 +02:00
tooomm 8f64fd4a0b text works 
fixed welcome msg
added some articles
added database phrase to card updater
cosmetic changes to the description in edit sets
 2015-05-23 23:13:45 +02:00
Fabio Bas 42796b0d0e More fix for -Werror=unused-parameter 2015-05-23 21:17:22 +02:00
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
ctrlaltca 411fc38337 Merge pull request #1106 from ctrlaltca/fix_1105 
Fix crash on server shutdown; fix #1105
 2015-05-23 18:26:13 +02:00
ctrlaltca bce0b6b03a Merge pull request #1107 from poixen/replay_tab_text 
Fixed replay crash
 2015-05-23 18:25:51 +02:00
Matt Lowe ad6dc16f84 Fixed replay crash 
Game types are only available in online games.
This is the fastest fix.
Replays now work again.
 2015-05-23 16:43:35 +02:00
Fabio Bas 323537d08d Fix crash on server shutdown; fix #1105 2015-05-23 11:33:36 +02:00
poixen 43c9f4e123 Merge pull request #1100 from poixen/new_sounds 
Updated sounds
 2015-05-22 21:03:14 +02:00
woogerboy21 3532c31d91 Merge pull request #1098 from poixen/gui_time_limit 
Increased server shutdown limit
 2015-05-22 14:52:32 -04:00
Gavin BisesandFabio Bas 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
Matt Lowe 4c1e24c214 fixed conflicts 2015-05-22 11:51:10 +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
Matt Lowe 085eb0f2fa Increased server shutdown limit 
Added a max of 999 mins for the server shutdown to the gui.
 2015-05-22 10:00:25 +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
Fabio Bas 6af91b3d1c Ignore filename case when loading custom sets 2015-05-21 19:58:35 +02: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
Fabio Bas b566bf4a19 Load additional xml sets from $userprofile/customsets/ 2015-05-20 18:27:50 +02:00
Matt Lowe 6ce07ebef2 Remade tap sound 2015-05-20 13:14:40 +02:00