gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-30 23:50:19 -07:00
Code Issues Packages Projects Releases Wiki Activity
2,078 Commits 53 Branches 176 Tags
d0f4d96d17b9699eed3aa8e2be962393ed366b95
Commit Graph
2078 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gavin Bisesi 06ac74ec6b Merge pull request #546 from ideocl4st/master 
Added Korean flag and newly added strings' translations
 2015-01-14 14:29:39 -05:00
Gavin Bisesi ce2520d74f Merge pull request #538 from poixen/settingscleanup 
Realigned Icons
 2015-01-14 07:38:23 -05:00
poixen 8fee9c6c4b Merge pull request #535 from poixen/chatnamehighlight 
Chat highlighting when username is mentioned
 2015-01-13 19:11:52 +01:00
Matt Lowe f1a9401416 Changed color 2015-01-13 18:06:49 +01:00
Jaeic Lee ab2aeee138 Added Korean flag and some translated strings 
Added translation of some new strings and svg file of South Korean flag.

Flag of South Korea is from
http://commons.wikimedia.org/wiki/File:Flag_of_South_Korea.svg
 2015-01-13 13:36:07 +09:00
Gavin Bisesi 2ae9cd2c37 Merge pull request #543 from poixen/clearchat 
Clear chat
 2015-01-12 21:15:55 -05:00
Matt Lowe 2e342361a5 Clear chat 
Users can now clear the chat in the main lobby. This removes unwanted
text and clears up memory when the client has been open a long time.
 2015-01-13 00:39:19 +01:00
Matt Lowe 5452d0ceae Chat highlighting when mentioned 
When being mentioned in a post with '@username' you will now see the entry highlighted. This
helps to see when someone is talking to you. It work across the main
chat, in game and in private chat.
 2015-01-12 15:15:15 +01:00
Gavin Bisesi 69e6aa355f Merge pull request #534 from poixen/accountage 
Added account age to user info window
 2015-01-11 21:37:07 -05:00
Matt Lowe 0445e570d7 Realigned Icons 
+ Moved Icons to the top. You can now see all options.
+ All SVGs now have a background (GO! was missing one).
+ All SVGs now have the same background (General had one of its own)
 2015-01-11 11:55:48 +01:00
Matt Lowe 02043ad4f9 Added Account Age 
+ Added the ability to see the account age of registered users. Changes
are both in server and client. The server will now send back the
registration date along with the user data. The client will then use
this to calculate the account age and display it in the user details
window.
 2015-01-11 00:45:12 +01:00
Gavin Bisesi 761d549f9a Merge pull request #519 from ctrlaltca/message_log 
Message log
 2015-01-07 15:43:54 -05:00
Gavin Bisesi 37a4c0d0e6 Merge pull request #531 from mcallahan/resizing2 
Resize player names in playerlistwidget properly.
 2015-01-07 15:42:03 -05:00
Gavin Bisesi 621d33638f Merge pull request #498 from ctrlaltca/pixmap_memory_2nd_attempt 
Pixmap memory, 2nd attempt
 2015-01-07 15:41:20 -05:00
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