Commit graph

1806 commits

Author SHA1 Message Date
Matt Lowe
46f28f92b6 Changed app title when logged in
As seen in this image, you cant see where you are logged in.

How it looks now:
2015-07-27 16:19:19 +02: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
Fabio Bas
a001238b74 Force cache clear on sets database save. 2015-07-26 11:46:09 +02: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
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
mildmongrel
ba50025e80 tablezone refactor and cleanup 2015-07-24 16:15:08 -07:00
Fabio Bas
800a17e483 Force black text color on deck list; fix #1289 2015-07-24 19:35:31 +02:00
Fabio Bas
119871d114 fix compilation with gcc in paranoic mode
deckview.cpp:244:6: warning: no previous declaration for 'bool
sortCardsByName(DeckViewCard*, DeckViewCard*)' [-Wmissing-declarations]
2015-07-24 19:29:06 +02:00
Fabio Bas
90655ff631 Prefer enabled sets when loading images; fix #1235 2015-07-22 17:35:44 +02:00
Jeff
3f22024281 Joining a full game joins you as spectator 2015-07-18 01:33:15 -04:00
ctrlaltca
0d5e169648 Merge pull request #1270 from ctrlaltca/fix_1269
Fix change flag in edit account; Fix #1269
2015-07-16 18:01:40 +02:00
Fabio Bas
c9e1585322 Fix change flag in edit account; Fix #1269 2015-07-16 17:59:28 +02:00
ctrlaltca
9b9db297b3 Revert "Confirmation dialog on close" 2015-07-16 14:30:12 +02: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 H
ebd516fbf3 confirmation dialog on close 2015-07-15 18:34:21 -04:00
Fabio Bas
ef831d2749 Reworded settings sentence 2015-07-15 22:44:24 +02:00
Zach H
d956a1d309 add colors to popup 2015-07-15 16:38:29 -04:00
Fabio Bas
efe388bddd Fix server message color; try to detect words inside parentheses, punctuation, etc.. 2015-07-15 11:52:04 +02:00
Zach H
c29bf1ae17 require pass & email confirmation 2015-07-14 14:12:49 -04:00
Fabio Bas
2e3e6c55ff Updated with latest changes from #1243 2015-07-14 09:19:07 +02:00
woogerboy21
a9acb3f1cc Total Max User Restriction
Syntax correction.
2015-07-13 17:54:03 -04:00
Zach
7ebf817b17 Merge pull request #1197 from Cockatrice/cpp11 2015-07-13 13:23:18 -04:00
Zach H
29aecc4eb8 Green kick msg 2015-07-13 03:05:03 -04:00
Fabio Bas
87c70466a4 Rework message parser 2015-07-12 23:56:32 +02: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
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
mildmongrel
124788d217 Added ability to rotate player positions in the local game view. 2015-07-08 09:16:37 -07: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
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