100 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Zach	04a96e96bb	Merge pull request #1492 from tooomm/patch-1 ... shortcut text adjustments	2015-09-15 13:11:16 -04:00
Zach	385455e77c	Merge pull request #1510 from woogerboy21/room_message_history ... Added chat history to a room that is displayed on join	2015-09-15 12:10:37 -04:00
Zach	3412ce2f7d	Merge pull request #1501 from marcofernandezheras/Fix-Shortcut-Detection ... Fix shortcuts detection on settings & game	2015-09-14 16:02:45 -04:00
Zach	f97a7e8370	Merge pull request #1512 from ctrlaltca/sound_themes ... sound themes	2015-09-13 15:37:00 -04:00
Zach	f2864ce569	Merge pull request #1511 from ctrlaltca/theme_extensions ... Themes: don't use hardcoded extensions on images	2015-09-13 13:26:12 -04:00
Zach	59da62d240	Merge pull request #1502 from woogerboy21/fix_ban_crash ... Fix server crash on banning	2015-09-13 01:12:29 -04:00
Zach	226a8cc017	Merge pull request #1498 from ctrlaltca/sound_whatever ... Reworked SoundEngine overhaul	2015-09-12 00:35:20 -04:00
Zach	4c9555bb59	Merge pull request #1496 from ctrlaltca/clamp_zoneview ... Clamp zone view widget's titlebar inside the viewable area	2015-09-12 00:34:12 -04:00
Zach	29446d80d4	Merge pull request #1469 from woogerboy21/request_ban ... Added the ability or moderation staff to request user ban history	2015-09-10 21:34:16 -04:00
Zach	e4470acb84	Merge pull request #1497 from ctrlaltca/settings_icons ... fix settings icon spacing	2015-09-10 21:33:43 -04:00
Zach	3bc61eb2e9	Merge pull request #1473 from woogerboy21/user_stats_table ... Added user analytics table to database	2015-09-09 08:46:52 -04:00
Zach	05aa8b2c92	Merge pull request #1474 from woogerboy21/no_tab_close ... Do not close message tabs on disconnect	2015-09-09 00:04:06 -04:00
Zach	aac980a8cb	Merge pull request #1485 from ctrlaltca/fix_notification_click ... Don't change window maximized state when clicking a notification	2015-09-08 12:49:00 -04:00
Zach	601ada8473	Merge pull request #1484 from ctrlaltca/fix_f12 ... Fix loading of "increase life counter" shortcut in settings	2015-09-08 12:43:27 -04:00
Zach	b47aa86c84	Merge pull request #1483 from ctrlaltca/deckeditor_filter_buttons ... Add back "remove" buttons to deck editor's filter	2015-09-08 12:33:15 -04:00
Zach	73f2d2b0e5	Merge pull request #1478 from ctrlaltca/fix_replay_crash ... Fix replay crash due to completer	2015-09-08 12:31:59 -04:00
Zach	433c5703e7	Merge pull request #1479 from ctrlaltca/fix_autoconnect ... Fix autoconnect	2015-09-08 12:29:53 -04:00
Zach	2a83f6dd4b	Merge pull request #1472 from marcofernandezheras/Fix-Portable-Paths ... Fix thememanager on portable build	2015-09-07 18:03:46 -04:00
Zach	60ed9fd1ff	Add slash	2015-09-03 14:56:23 -04:00
Zach	4eb708c3b0	Merge pull request #1458 from marcofernandezheras/Fix-Portable ... fix Decks, Pics replays & sounds paths on Portable build	2015-09-03 14:52:17 -04:00
Zach	d97a9bdb15	Merge pull request #1459 from Cockatrice/portable_readme ... Add portable info	2015-09-03 13:32:46 -04:00
Zach	48f68343a2	Add portable info ... Portable info	2015-09-03 13:11:42 -04:00
Zach	f4ae08f8b1	Merge pull request #1439 from woogerboy21/feature_check ... Added server/client feature set communication	2015-09-02 23:38:53 -04:00
Zach	3188ef4cde	Merge pull request #1444 from woogerboy21/fix_blank_ban ... Detect if a use is trying to place an invalid ban	2015-09-01 22:20:05 -04:00
Zach	f5f5074023	Merge pull request #1081 from ctrlaltca/themes_clean ... Theme manager	2015-08-31 18:50:36 -04:00
Zach	6a64e4a2e1	Merge pull request #1432 from ZeldaZach/fix_1427 ... Remove docs in favor of wiki	2015-08-28 15:39:00 -04:00
Zach H	854e0a764c	remove docs in favor of wiki	2015-08-28 14:59:49 -04:00
Zach	e6a8fa59e3	Merge pull request #1428 from tooomm/patch-1 ... text adjustments in oracle	2015-08-27 12:39:00 -04:00
Zach	311536d1aa	Merge pull request #1423 from tooomm/patch-1	2015-08-26 10:26:57 -04:00
Zach	324ddda4dd	Merge pull request #1416 from ZeldaZach/fix_1411 ... Define URLs	2015-08-23 23:00:22 -04:00
Zach	14da4efe6d	Merge pull request #1414 from ZeldaZach/fix_1412 ... Prevent bad flags	2015-08-23 17:59:52 -04:00
Zach H	a8727d5a50	define URLs	2015-08-23 17:57:26 -04:00
Zach	4d2fdaec08	Merge pull request #1407 from Fizztastic/fix_1396 ... Option to opt-out of remember game settings	2015-08-23 16:28:01 -04:00
Zach H	8ffe310855	prevent bad flags	2015-08-23 16:27:18 -04:00
Zach	432c856f0d	Merge pull request #1400 from woogerboy21/logout_old_session ... Log old session out of server if logging in from a second location	2015-08-22 15:37:50 -04:00
Zach	e9156ecd62	Merge pull request #1391 from woogerboy21/admin_adjustmods ... Allows admins to promote users to mod and demote mod to user	2015-08-22 00:03:46 -04:00
Zach	a6a62b3334	Merge pull request #1354 from Cockatrice/fix-1351 ... Fix #1351 - Server ignores only-reg if in "none" auth mode.	2015-08-21 22:15:32 -04:00
Zach H	41b10308ba	country to lower (fix win bug)	2015-08-21 20:05:49 -04:00
Zach	9c28cdd1f5	Merge pull request #1394 from Fizztastic/fix_1387 ... Add LineEditCompleter to Tab_Game	2015-08-20 23:46:19 -04:00
Zach	b2ab2c6eba	Merge pull request #1382 from marcofernandezheras/Customizable-shortcuts ... Customizable shortcuts	2015-08-20 21:44:05 -04:00
Zach	8c0722953f	Merge pull request #1386 from Fizztastic/fix_1383 ... Fix linked cardwidget not showing PT/Loyalty	2015-08-17 17:14:30 -04:00
Zach	98fa9eb159	Merge pull request #1356 from Fizztastic/ChatRoomCompleter ... Username Completer in server room	2015-08-15 20:08:34 -04:00
Zach	4b0ccc30ec	Merge pull request #1376 from Fizztastic/customsets_option	2015-08-14 11:04:06 -04:00
Zach	26e63a9a3a	Merge pull request #1343 from tooomm/readme-toc-change ... readme adjustments	2015-08-13 21:17:07 -04:00
Zach	54ff4ef417	Merge pull request #1369 from ZeldaZach/fix_1360 ... remove max screen default	2015-08-11 17:41:13 -04:00
Zach H	b57a316bfd	remove max screen default	2015-08-11 17:10:05 -04:00
Zach	1c3e13109f	Merge pull request #1361 from woogerboy21/servatrice_disable_replaystorage ... Add option to servatrice to disable replay storage.	2015-08-11 16:32:37 -04:00
Zach	26b9560753	Merge pull request #1367 from woogerboy21/add_script_maintcountrycodes ... Added lower case country code on correction.	2015-08-11 16:05:56 -04:00
Zach	bf230f2c86	Merge pull request #1366 from woogerboy21/add_script_maintcountrycodes ... Add script to validate/clear invalid country codes in the DB.	2015-08-11 15:18:11 -04:00
Zach	e9478ff99c	Merge pull request #1362 from woogerboy21/rem_clientid_protoreq ... Removed clientid requirements from the protocol handler.	2015-08-10 17:36:31 -04:00
Zach	ff41e69a30	Merge pull request #1349 from ctrlaltca/fix_server_msvc	2015-08-09 13:49:53 -04:00
Zach	44d757f691	Merge pull request #1328 from marcofernandezheras/FixBug#1296 ... Ctrl + Double Click: Add card to SB	2015-08-03 22:47:32 -04:00
Zach	dfb7847dab	Update README.md	2015-08-01 21:45:14 -04:00
Zach	c28da9f066	Merge pull request #1321 from ZeldaZach/readme ... README fix	2015-08-01 21:35:41 -04:00
Zach H	ee6020ab8c	url fix	2015-08-01 21:35:21 -04:00
Zach	da48b71442	Merge pull request #1310 from ctrlaltca/emails ... Servatrice: do not disclose user emails to clients	2015-07-31 10:57:52 -04:00
Zach H	8a86165890	allow URL redirects	2015-07-28 02:41:08 -04:00
Zach	183fbd2805	Merge pull request #1305 from poixen/appname ... Changed app title when logged in	2015-07-27 19:51:24 -04:00
Zach	c0bb640a37	Merge pull request #1295 from ctrlaltca/servatrice_email_v2 ... Refactor servatrice email send	2015-07-26 21:13:58 -07:00
Zach	9aa161575d	Merge pull request #1303 from ZeldaZach/fix_1069 ... fix 1032 merge conflicts	2015-07-26 21:12:50 -07:00
Zach H	475c54bfe1	fix 1032 merge conflicts	2015-07-27 00:01:05 -04:00
Zach	e318b70329	Merge pull request #1286 from ctrlaltca/disabled_sets ... Prefer enabled sets when loading images	2015-07-26 12:10:00 -07:00
Zach	bd92f18e9d	Merge pull request #1293 from ctrlaltca/fix_1289 ... Force black text color on deck list	2015-07-26 12:05:52 -07:00
Zach	ac4c745521	Merge pull request #1294 from mildmongrel/tablezone_refactor_001 ... tablezone refactor and cleanup	2015-07-25 22:45:06 -07:00
Zach	387137fbc7	Merge pull request #1292 from ctrlaltca/fix_compile_debug ... fix compilation with gcc in paranoic mode	2015-07-25 22:37:18 -07:00
Zach	f3ee1eac12	Merge pull request #1287 from ctrlaltca/servatrice_db_version ... Fix misleading error message in servatrice; fix #1275	2015-07-25 22:36:01 -07:00
Zach	f1b7a422ee	Merge pull request #1284 from ctrlaltca/fix_1283 ... Fix calculation of ban expiration	2015-07-25 22:19:58 -07:00
Zach	c675cf4010	Merge pull request #1272 from Fizztastic/fix_577 ... Joining a full game joins you as spectator	2015-07-25 22:16:00 -07:00
Zach	e0b71d3b05	Merge pull request #1257 from ctrlaltca/messageparser ... Chatview: split message parser and add "highlight words"	2015-07-15 20:00:08 -04:00
Zach	1d425f5b66	Merge pull request #1261 from ZeldaZach/fix_982 ... Confirmation dialog on close	2015-07-15 18:57:03 -04:00
Zach H	ebd516fbf3	confirmation dialog on close	2015-07-15 18:34:21 -04:00
Zach	da3ade3205	Merge pull request #1264 from ZeldaZach/color_popup ... Add colors to popup	2015-07-15 16:55:17 -04:00
Zach H	d956a1d309	add colors to popup	2015-07-15 16:38:29 -04:00
Zach	97acbbfd41	Merge pull request #1262 from ctrlaltca/servatrice_mail ... Merge memory leak fix for smtp client	2015-07-15 12:24:23 -04:00
Zach H	c29bf1ae17	require pass & email confirmation	2015-07-14 14:12:49 -04:00
Zach	7ebf817b17	Merge pull request #1197 from Cockatrice/cpp11	2015-07-13 13:23:18 -04:00
Zach	acaeadfcb3	Merge pull request #1241 from ZeldaZach/fix_719	2015-07-13 12:52:18 -04:00
Zach H	29aecc4eb8	Green kick msg	2015-07-13 03:05:03 -04:00
Zach H	97f298452e	first fixes	2015-07-12 11:00:11 -04:00
Zach H	dc05a14f4c	Highlight Custom Words	2015-07-11 22:46:00 -04:00
Zach	9edacd7b3e	Merge pull request #1236 from Fizztastic/fix_574 ... Double Click to open replays	2015-07-09 23:36:33 -04:00
Zach	f437dabfbb	Merge pull request #1227 from ctrlaltca/oracle_tokens ... Oracle: download tokens	2015-07-09 23:34:37 -04:00
Zach	f733daf18a	Merge pull request #1179 from mildmongrel/feature-player-rotation ... Added ability to rotate player positions in the local game view.	2015-07-08 18:23:10 -04:00
Zach	091ca9fc12	Merge pull request #1230 from ZeldaZach/fix_97 ... add shortcut for filter delete	2015-07-08 18:11:08 -04:00
Zach	2837a4c010	Merge pull request #1232 from ZeldaZach/fix_242 ... show colors of cards	2015-07-08 18:10:23 -04:00
Zach	2bd0133055	Merge pull request #1233 from Fizztastic/fix_340 ... Play cards only with double left click	2015-07-08 18:09:31 -04:00
Zach H	afa8b53870	show colors of cards	2015-07-07 23:50:37 -04:00
Zach H	ce42d56a2d	add shortcut for filter delete	2015-07-07 22:42:05 -04:00
Zach	f199e20740	Merge pull request #1216 from ZeldaZach/fix_morphs ... Fix Morphs from Sharing Information	2015-07-07 22:00:32 -04:00
Zach	955cc3920f	Merge pull request #1189 from mildmongrel/fix_col_layout ... Fixed horizontal positioning in multicolumn layout.	2015-07-07 21:40:17 -04:00
Zach	f0efab5142	Merge pull request #1226 from ctrlaltca/fix_241 ... Add an option to annotate tokens from card text (default off)	2015-07-07 21:12:59 -04:00
Zach	9b87f9e7e7	Merge pull request #1225 from ctrlaltca/fix_247 ... Order cards by name in deck-load screen	2015-07-07 20:42:44 -04:00
Zach	db604bce03	Merge pull request #1219 from poixen/pic_fix	2015-07-07 13:41:06 -04:00
Zach	685aa99ad6	Merge pull request #1224 from ctrlaltca/profile_edit ... Integrate #1210 changing "Gender" to "Pronouns"	2015-07-07 10:47:37 -04:00
Zach	1c69288f0e	Merge pull request #1222 from Fizztastic/fix_740 ... Added 2 shortcuts to game deck screen	2015-07-07 02:43:04 -04:00
Zach	6bf421cc31	Merge pull request #1210 from ctrlaltca/profile_edit ... Profile management	2015-07-07 02:01:27 -04:00
Zach	2b484aa9ee	Merge pull request #1221 from Fizztastic/fix_818 ... Load .cod files from clipboard in deck editor	2015-07-07 00:36:49 -04:00
Zach	e76c109f2d	Merge pull request #1217 from ZeldaZach/fix_cheat ... Prevent Hash Collision	2015-07-06 23:49:48 -04:00
Zach	29b83c3700	Merge pull request #1215 from ZeldaZach/fix_1208 ... Mod Global Messaging	2015-07-06 23:48:46 -04:00
Zach	4cf92de44d	Merge pull request #1220 from Fizztastic/fix_1011 ... Add Move to Hand in card menu	2015-07-06 22:42:01 -04:00