Commit graph

3006 commits

Author SHA1 Message Date
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
Jeff
8bc885c3f1 Double Click to open replays 2015-07-09 00:42:02 -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
Jeff
6470e1fd10 Remove unneeded if 2015-07-08 16:25:25 -04:00
Fabio Bas
a65b2e6c94 Changed url to cockatrice's tokens repo + minor fix 2015-07-08 19:31:04 +02:00
mildmongrel
124788d217 Added ability to rotate player positions in the local game view. 2015-07-08 09:16:37 -07:00
Fabio Bas
eda55679da Implemented suggested improvements 2015-07-08 10:19:05 +02:00
Jeff
438aacb9c4 Play cards only with double left click
Fix #340
2015-07-08 00:55:35 -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
poixen
4a46bd697f Merge pull request #1228 from poixen/formated_db_interface
Refactored tabs to spaces
2015-07-07 21:26:09 +02:00
Matt Lowe
894d6c8d2d Refactored tabs to spaces
Removed tabs in favour of 4 spaces.
2015-07-07 21:01:19 +02:00
Fabio Bas
24aabc4cfe Oracle: download tokens; fix #915 2015-07-07 20:06:14 +02:00
Zach
db604bce03 Merge pull request #1219 from poixen/pic_fix 2015-07-07 13:41:06 -04:00
Fabio Bas
68e176cc00 Add an option to annotate tokens from card text (default off); fix #241 2015-07-07 19:19:58 +02:00
Fabio Bas
1c2ddccb46 Order cards by name in deck-load screen; fix #247 2015-07-07 17:56:11 +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
Matt Lowe
c260a8a1d4 Fixed image centering 2015-07-06 20:34:38 +02: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
cf09aeccfd local user sees orange too 2015-07-05 23:21:46 -04:00
Zach H
8221d37bbe don't share PT 2015-07-05 23:11:26 -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