Commit graph

2771 commits

Author SHA1 Message Date
Fabio Bas
eda55679da Implemented suggested improvements 2015-07-08 10:19:05 +02:00
Fabio Bas
24aabc4cfe Oracle: download tokens; fix #915 2015-07-07 20:06:14 +02: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
Fabio Bas
6013974b5e Gender => Pronouns 2015-07-07 14:10:15 +02: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
Fizztastic
4d6a405d01 Added 2 shortcuts to game deck screen
- Ctrl+O (Load Deck)
- Ctrl+Alt+O (Load Remote Deck)
2015-07-07 01:14:06 -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
Fizztastic
0b8fab4721 Load .cod files from clipboard 2015-07-06 23:46:11 -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
Fizztastic
680332a708 keep consistent ordering 2015-07-06 19:18:27 -04:00
Fizztastic
19bd6cc381 Adds Move To... Hand context menu for cards 2015-07-06 19:10:13 -04:00
Zach H
339db24b56 efficency loop 2015-07-06 17:52:20 -04:00
Zach H
ae4436ade7 mod global msg overrides settings 2015-07-06 12:45:08 -04:00
Zach H
9e2da24629 use QSet for zones 2015-07-06 11:02:43 -04:00
Zach
bfa002e50a Merge pull request #1213 from ZeldaZach/fix_1057
Link FAQ pages
2015-07-06 09:00:55 -04:00
Fabio Bas
14bce93c7a make gcc an happy puppy 2015-07-06 09:14:29 +02:00
Zach H
8e4f0c50af remove breaks 2015-07-06 01:31:24 -04:00
Zach H
ef268d79c3 prevent cheating with hashes 2015-07-06 00:30:17 -04:00
Zach H
1bda6e53b2 allow mod global msg 2015-07-05 22:06:35 -04:00
Zach H
e20c06b639 troubleshooting&faq 2015-07-05 20:11:42 -04:00
Fabio Bas
68f1358f54 rebased on master 2015-07-05 22:48:09 +02:00
Fabio Bas
15998fb3e6 Misc fixes 2015-07-05 22:44:35 +02:00
Fabio Bas
7f5f290c93 Profile management 2015-07-05 22:44:35 +02:00
Fabio Bas
960cb04286 Misc fixes 2015-07-05 21:13:39 +02:00
Fabio Bas
26f317ee75 Profile management 2015-07-05 16:39:55 +02:00
Zach
31890450dc Merge pull request #1205 from ZeldaZach/fix_1173
Server Name Rules Information
2015-07-04 19:37:50 -04:00
Zach H
1f9b3ed28f minor fix 2015-07-04 18:52:50 -04:00
Zach
c148994ac7 Merge pull request #1206 from ZeldaZach/fix_at_space
Fix Crash on Mention Bug
2015-07-04 18:38:24 -04:00
Zach H
24e54fd291 fix crash on mention 2015-07-04 18:26:54 -04:00
Zach H
1d210e57bd show all rules 2015-07-03 23:54:14 -04:00
Zach
360498c83f Merge pull request #1194 from ZeldaZach/fix_1192
Fix local mention crash
2015-07-03 18:41:48 -04:00
Gavin Bisesi
bd63315752 Merge pull request #1193 from Cockatrice/doctoc
Add ToC to README
2015-07-03 17:29:42 -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
Fabio Bas
f5be6f836e Improved logging of SIGHUP and cmdReloadConfig 2015-07-03 09:09:41 +02:00
Gavin Bises
9159958c78 Change RUN to CMD
oops
2015-07-03 01:09:27 -04:00
Gavin Bises
434d756b2a Fix typo in Dockerfile 2015-07-03 01:04:30 -04:00
Gavin Bises
a4be8e88d0 Set expose/cmd for Dockerfile 2015-07-03 00:54:32 -04:00
Zach H
cc3e4edfd9 rename function 2015-07-03 00:37:30 -04:00
Zach H
e2be1cd897 fix local mention crash 2015-07-03 00:30:59 -04:00
Gavin Bises
0f81af55d7 Add ToC to README
using doctoc

TOC entries with images need to be manually repaired,
https://github.com/thlorenz/doctoc/issues/73
2015-07-03 00:16:15 -04:00
Gavin Bisesi
dfd5c5e050 Merge pull request #1191 from Cockatrice/docker
Dockerfile for servatrice
2015-07-03 00:02:18 -04:00
Gavin Bises
7ac3201811 Dockerfile for servatrice
Compile & install servatrice

Unhandled currently:
servatrice.ini modification
mysql setup/config/connection
2015-07-02 23:58:25 -04:00
Zach
14e8fcdd44 Merge pull request #1190 from ctrlaltca/fix_1188
oracle: fix broken import of sets; fix #1188
2015-07-02 17:53:36 -04:00
Fabio Bas
5e1566046e removed debug 2015-07-02 15:31:14 +02:00
Fabio Bas
5f28dff30e Fix #1188 2015-07-02 09:22:05 +02:00
Fabio Bas
af9140d8c4 make gcc an happy puppy 2015-07-01 20:13:38 +02:00
Fabio Bas
8cac72158a MSVC fixes 2015-06-30 22:33:29 +02:00