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
3,142 Commits 53 Branches 176 Tags
3ebe42c4006e5a754fd609c5f7370b09affa4ecd
Commit Graph
39 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
woogerboy21 cd02df78a1 Merge pull request #1627 from ctrlaltca/no_jom_no_cry 
Fix appveyor builds
 2015-10-05 15:13:43 -04:00
woogerboy21 9c4bd8ebed Merge pull request #1593 from woogerboy21/remove_mod_notify 
Crash Fix: Removed mod notification code that causes crashes
 2015-09-26 23:36:50 -04:00
woogerboy21 c1663d578a Merge pull request #1588 from Cockatrice/servatrice.sql_warntable_syntaxfix 
Corrected mod_name column syntax in warnings table
 2015-09-25 18:40:09 -04:00
woogerboy21 7a4cabaf67 Corrected mod_name column syntax in warnings table 
It was missing a comma at the end of the line.
 2015-09-25 18:19:44 -04:00
woogerboy21 291b262b64 Merge pull request #1569 from woogerboy21/correct_warn_schema 
Updated cockatrice_warnings table to use id column as primary key
 2015-09-25 08:09:56 -04:00
woogerboy21 cd7b25f712 Fix #1542 
This should fix #1542 (please test)
 2015-09-22 01:19:31 -04:00
woogerboy21 dd4900b038 Merge pull request #1471 from ctrlaltca/deckeditor_theme_cardback 
get cardback image from theme
 2015-09-06 08:25:48 -04:00
woogerboy21 15e8121cf2 Merge pull request #1468 from woogerboy21/fix_old_gcc 
Fix older gcc nested pre-def with portable builds
 2015-09-05 18:01:31 -04:00
woogerboy21 13e536013e Merge pull request #1442 from woogerboy21/fix_oldsession 
Fix bug that crashes server when old session is logged out during login
 2015-08-30 23:51:33 -04:00
woogerboy21 8bb6bb04d7 Merge pull request #1441 from woogerboy21/fix_check 
Fix ban issue
 2015-08-30 19:45:04 -04:00
woogerboy21 fdea69cfed Merge pull request #1421 from woogerboy21/fix_proto_warnings 
Corrected proto warnings & spacing
 2015-08-26 08:22:50 -04:00
woogerboy21 7453385903 Merge pull request #1417 from woogerboy21/send_clientver 
Extend the login protocol to send the client version (as optional)
 2015-08-24 11:54:04 -04:00
woogerboy21 2a0197a7ab Merge pull request #2 from Cockatrice/admin_adjustmods 
Address PR feedback
 2015-08-21 23:08:29 -04:00
woogerboy21 1ef9041815 Merge pull request #1389 from Cockatrice/schema_level_correction 
Corrected miss-matched schema versions
 2015-08-18 08:04:29 -04:00
woogerboy21 65635bcdd8 Corrected miss-matched schema versions 
Schema version should be 7 (not 6) for current commit level.  Not sure exactly why it wasn't updated.
 2015-08-18 07:40:12 -04:00
woogerboy21 487cbb23cb Merge pull request #1379 from woogerboy21/room_userlevel 
Add permission levels to rooms
 2015-08-16 08:57:34 -04:00
woogerboy21 5634b564e8 Merge pull request #1378 from woogerboy21/last_login 
Add last_login column to user table and populate upon login
 2015-08-15 20:24:18 -04:00
woogerboy21 0f4dc18074 Merge pull request #1374 from woogerboy21/ban_by_clientid 
Ban by client ID
 2015-08-14 11:25:01 -04:00
woogerboy21 8bf58af727 Merge pull request #1365 from woogerboy21/add_clientid_tosessions 
Add clientid field to sessions table.
 2015-08-12 08:07:01 -04:00
woogerboy21 de1b925b7d Merge pull request #1352 from Cockatrice/nonreg_nodbserver_fix 
#1351 Fix
 2015-08-09 15:25:14 -04:00
woogerboy21 5fc0da6ab9 #1351 Fix 
This update address's the issue were a server with no db has only non-registered users but when creating a game will cause the dialogue to only allow the check box of "registered users only" resulting in a game that no user will ever be able to join.
 2015-08-09 15:07:30 -04:00
woogerboy21 90381aa38f Merge pull request #1350 from woogerboy21/showmoreinfo_logincontexterror 
Update Error 11 Clarity
 2015-08-09 14:02:34 -04:00
woogerboy21 f4942d1ea7 Merge pull request #1346 from woogerboy21/regonly_server_refactor 
Reg only server cleanup
 2015-08-09 13:57:17 -04:00
woogerboy21 1f22f1743c Merge pull request #1348 from woogerboy21/fix_clientid_dbmigration 
Add database migration script for client id
 2015-08-09 09:19:12 -04:00
woogerboy21 644ea0482f Merge pull request #1347 from woogerboy21/fix_clientid_localgame 
Fix local game not starting properly.
 2015-08-08 17:33:34 -04:00
woogerboy21 129a6983ed Merge pull request #1345 from Cockatrice/login-error-message 
Add more informative message on unrecognized login response
 2015-08-08 11:12:50 -04:00
woogerboy21 c64bc3fb81 Merge pull request #1344 from woogerboy21/clientid_commit_res 
Commit to resolve requests made by @Daenyth discussed after the commit.
 2015-08-08 09:23:21 -04:00
woogerboy21 62dc3a7ca3 Merge pull request #1342 from marcofernandezheras/CardInfoLayout 
Deck Editor layout
 2015-08-08 08:28:12 -04:00
woogerboy21 ba90d84a13 Merge pull request #1340 from woogerboy21/clientid 
Client ID Generation
 2015-08-06 14:17:06 -04:00
woogerboy21 13011180f7 Merge pull request #1313 from woogerboy21/update_pingtime 
Update Client & Server ping time
 2015-08-03 12:31:20 -04:00
woogerboy21 51d12f3ed6 Merge pull request #1259 from woogerboy21/update_servatrice_scripts 
Script Cleanup
 2015-07-14 15:33:11 -04:00
woogerboy21 d2af7ff99e Merge pull request #1254 from ZeldaZach/fix_1248 
require pass & email confirmation
 2015-07-14 15:21:35 -04:00
woogerboy21 f1cafa0609 Merge pull request #1258 from woogerboy21/servatrice_remove_pcconsoleecho 
Removed Player Count Debug Line
 2015-07-14 09:57:24 -04:00
woogerboy21 d91bbcfbce Removed Player Count Debug Line 
Removed the output put to console for every logged in user.  It just cluttered things up.
 2015-07-14 08:54:05 -04:00
woogerboy21 8a0fdd2089 Merge pull request #1252 from woogerboy21/max_player_limit 
Servatrice: Restrict the total number of users able to connect (Max User Limit)
 2015-07-13 18:20:19 -04:00
woogerboy21 aa540f7968 Merge pull request #1240 from woogerboy21/db_backup_scripts 
Update DB Scripts
 2015-07-13 13:51:08 -04:00
woogerboy21 ea40db972d Merge pull request #1244 from woogerboy21/multi_server_sessions_update 
Multi Server Session Functionality
 2015-07-13 13:12:27 -04:00
woogerboy21 a14a642b2b Merge pull request #1181 from ctrlaltca/servatrice_reload_config 
Servatrice: refactor signal handling and permit config reloading
 2015-07-03 12:29:12 -04:00
woogerboy21 304835c526 Activation Email Misspelling 
Corrected the misspelling of the word "activating' in the servatrice.ini example file.
 2015-06-29 17:05:48 -04:00