Michael Callahan
|
eac6e41de7
|
Resize player names in playerlistwidget properly.
|
2015-01-06 22:20:45 -07:00 |
|
Fabio Bas
|
2101ed7096
|
Merge remote-tracking branch 'upstream/master' into pixmap_memory_2nd_attempt
Conflicts:
cockatrice/src/dlg_settings.cpp
cockatrice/src/dlg_settings.h
|
2015-01-05 22:46:12 +01:00 |
|
Gavin Bisesi
|
c98a146746
|
Merge pull request #520 from mcallahan/always-reveal-top-master-master
Reset Always reveal top card when starting a new game.
|
2015-01-05 16:36:07 -05:00 |
|
Gavin Bisesi
|
fba60c20c0
|
Merge pull request #523 from kaiserfro/apply-filters-at-start2
Apply filters at start
|
2015-01-05 11:26:54 -05:00 |
|
Gavin Bisesi
|
094d6b6422
|
Merge pull request #527 from poixen/chattime
Added timestamps to in game chat
|
2015-01-05 11:22:32 -05:00 |
|
Fabio Bas
|
2671d6abdc
|
Merge remote-tracking branch 'upstream/master' into local_scry_and_move
|
2015-01-05 11:08:11 +01:00 |
|
Jeffrey Oliver
|
4a2a61ef46
|
Replace the 99 with a const int.
|
2015-01-04 15:32:29 -08:00 |
|
Jeffrey Oliver
|
8eb0e2dbef
|
Remove reminder.
|
2015-01-04 15:31:59 -08:00 |
|
Matt Lowe
|
a1a021c99c
|
Added timestamps to in game chat
+ added time stamps to the in game chat
|
2015-01-04 18:01:46 +01:00 |
|
Gavin Bisesi
|
7476667b69
|
Merge pull request #524 from ideocl4st/korean-translation
Fixed a non-standard word in Korean Translation
|
2015-01-04 08:45:20 -05:00 |
|
Jaeic Lee
|
0e250a7d80
|
Fixed a non-standard word in Korean Translation
Fixed a non-standard word (손패) into the word that is used in official
translation (손)
|
2015-01-03 11:24:10 +09:00 |
|
Jeffrey Oliver
|
bb317003b4
|
Save filters after a filter clear.
Remove some duplicated code.
|
2015-01-02 17:23:15 -08:00 |
|
Jeffrey Oliver
|
f01d26bf96
|
Enable the clear filter button by default.
|
2015-01-02 17:10:55 -08:00 |
|
Jeffrey Oliver
|
1e78596dfa
|
Remove unused function.
|
2015-01-02 17:07:30 -08:00 |
|
Jeffrey Oliver
|
f1803fe879
|
Remove some debug.
|
2015-01-02 17:06:30 -08:00 |
|
Jeffrey Oliver
|
b1e5153ea5
|
Should be a const ptr.
|
2015-01-02 17:03:17 -08:00 |
|
Jeffrey Oliver
|
dbfbfcc837
|
WIP: refactor filters to save to persistence from within model.
|
2015-01-02 15:19:36 -08:00 |
|
Jeffrey Oliver
|
6a4384f903
|
WIP: Refactor gamesproxymodel to own the persistence layer.
|
2015-01-02 15:05:33 -08:00 |
|
Fabio Bas
|
0abd1fb299
|
Rework patch for "move to.." menu; fix "P/T"-related menus
|
2015-01-02 17:10:19 +01:00 |
|
Gavin Bisesi
|
471a690cf0
|
Merge pull request #518 from ideocl4st/korean-translation
Added Korean Translation
|
2015-01-02 09:27:29 -05:00 |
|
Jaeic Lee
|
7dc58355c9
|
Added line breaks in Korean translation
Added line breaks in Korean translation for better readability.
|
2015-01-02 11:35:50 +09:00 |
|
Michael Callahan
|
142b42e095
|
Reset Always reveal top card when starting a new game.
|
2015-01-01 09:53:29 -07:00 |
|
Jaeic Lee
|
9c0faf8a9c
|
Edited Korean Translation
Edited several sentences after a third-party review
|
2015-01-02 01:30:27 +09:00 |
|
Fabio Bas
|
51735613e5
|
force NULL as unregistered users's id
|
2015-01-01 16:42:20 +01:00 |
|
Fabio Bas
|
925b4a83b0
|
Fix "sender id" and "ip address" fields in game
|
2015-01-01 16:20:57 +01:00 |
|
Fabio Bas
|
cd69bc8f9d
|
Add configuration options to enable database logging
|
2015-01-01 15:48:53 +01:00 |
|
Jaeic Lee
|
93d6bfed65
|
Merge branch 'master' into korean-translation
Updating to sync with origin
|
2015-01-01 23:25:29 +09:00 |
|
Fabio Bas
|
2896f05823
|
Merge remote-tracking branch 'upstream/master' into message_log
Conflicts:
servatrice/CMakeLists.txt
|
2015-01-01 15:02:17 +01:00 |
|
Jaeic Lee
|
be973879d0
|
Added Korean Translation
|
2015-01-01 22:58:35 +09:00 |
|
ctrlaltca
|
16bbc5e8c0
|
Merge pull request #516 from mcallahan/compilation-warnings
Clean up a small pile of compiler warnings.
|
2015-01-01 14:32:53 +01:00 |
|
Gavin Bisesi
|
0f1c8c59ac
|
Merge pull request #508 from Blitzmerker/master
Fixes the "Card preview window gets stuck and can't be removed" issue by...
|
2015-01-01 08:08:29 -05:00 |
|
Gavin Bisesi
|
a6c750668a
|
Merge pull request #496 from ctrlaltca/set_extinfo
Remove branch decoration
|
2015-01-01 08:07:19 -05:00 |
|
Gavin Bisesi
|
b38cd7833f
|
Merge pull request #500 from ctrlaltca/translation_fixes
Translation fixes
|
2015-01-01 08:07:06 -05:00 |
|
ctrlaltca
|
37dd99ea5e
|
Merge pull request #507 from ctrlaltca/osx_plugins_debug
Optimize qt plugins installation
|
2015-01-01 13:56:31 +01:00 |
|
Gavin Bisesi
|
ec5a81d8a3
|
Merge pull request #515 from mcallahan/player-icon-size
Better icon packing in PlayerListWidget.
|
2014-12-31 14:18:25 -05:00 |
|
Michael Callahan
|
3a0c86938c
|
Clean up a small pile of compiler warnings.
|
2014-12-30 15:54:38 -07:00 |
|
Michael Callahan
|
3c9ddd780e
|
Better icon packing in PlayerListWidget.
|
2014-12-30 15:27:21 -07:00 |
|
Blitzmerker
|
6af8a49aae
|
Fixes the "Card preview window gets stuck and can't be removed" issue by saving the cardname, instead of getting it back from the popup (with possible issues with case sensitivity). Also closes an old popup when a new is created.
|
2014-12-29 19:00:28 +01:00 |
|
Fabio Bas
|
54ce135e0c
|
Optimize qt plugins installation
* Always install “release” plugins
* install only plugins actually used
|
2014-12-28 22:21:45 +01:00 |
|
Fabio Bas
|
ea1067189d
|
Specify the player when triggering a move on a revealed card
Fixes #72, #493
|
2014-12-27 17:12:21 +01:00 |
|
Fabio Bas
|
dd88476796
|
Changed parameter name to something more meaningful
|
2014-12-27 15:02:20 +01:00 |
|
Gavin Bisesi
|
f52935791c
|
Merge pull request #501 from ctrlaltca/crash_on_exit
Fix crash on close #255
|
2014-12-26 20:05:54 -05:00 |
|
Gavin Bisesi
|
f462719134
|
Merge pull request #502 from ctrlaltca/fix_484
Fix #484: Missing tooltip
|
2014-12-26 20:00:45 -05:00 |
|
ctrlaltca
|
eacd06d2b8
|
Merge pull request #503 from ctrlaltca/travis_osx_qt5
Fix travis compilation with osx+qt5
|
2014-12-26 17:00:15 +01:00 |
|
Fabio Bas
|
49310b5291
|
Fix travis compilation with osx+qt5
Homebrew currently installs qt 5.4.0
|
2014-12-26 16:34:42 +01:00 |
|
Fabio Bas
|
390a8f1985
|
Fix #484
Missing tooltip
|
2014-12-26 16:09:56 +01:00 |
|
Fabio Bas
|
15e4c852dd
|
Fix crash on close #255
|
2014-12-26 16:03:59 +01:00 |
|
Fabio Bas
|
2d932c68de
|
Fixed translation for "clear downloaded pictures" button
|
2014-12-26 14:48:58 +01:00 |
|
Fabio Bas
|
499f148783
|
Regnerate translations
|
2014-12-26 14:45:41 +01:00 |
|
Fabio Bas
|
72ba5a1683
|
Parse header files for translatable strings
We previously parsed only .cpp files, but some strings are inlined in
header files.
|
2014-12-26 14:45:31 +01:00 |
|