aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2099 commits 1 branch 0 tags 51 MiB
Commit graph

2099 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matt Lowe
d59e1f135d Refactored Chat Settings tab 
- removed heap alloc
 2015-01-17 18:04:06 +01:00
Matt Lowe
d02d3ed521 Refactored Deck Editor tab 
- removed heap allocation
 2015-01-17 17:55:13 +01:00
Matt Lowe
5cf801eb94 Refactored User Interface tab 
- removed heap allocs
 2015-01-17 17:50:04 +01:00
Matt Lowe
a599fa1a63 Removed manual sizing 
replaced the resize(x, y) to "pack" the widgets. It saves space and
makes the settings tighter.
 2015-01-17 17:30:24 +01:00
Matt Lowe
98e84f0d63 Fixed some merge issues 2015-01-17 17:11:14 +01:00
Matt Lowe
4b45ba46f4 Refactored General Settings Tab 
~ Removed some heap allocs
~ Remaining heap allocs are needed.
~ Unrolled "one line" declarations in header
~ restructured logic in GeneralSettingsPage

Refactored Appearance Tab

- removed some heap allocs
- removed setting of zone view, its not needed here, its configurable in
real time, in game.
 2015-01-17 16:59:00 +01:00
Matt Lowe
ece56ff3f2 Added @ back in 
Added the @ back to the chat, this will help if a user does not have the
newest version of the client.
 2015-01-17 15:03:41 +01:00
Matt Lowe
8bc2adb70b Set focus 
The line edit now gets focus for faster typing.
 2015-01-17 14:53:41 +01:00
Matt Lowe
45112e49b1 Click tag mentions 
You can now click on a username in the main chat to add a "@username"
tag to the chat. Makes communication with other users using tags faster.
 2015-01-17 14:47:16 +01:00
Matt Lowe
49d3ad73d5 Uername block highlighting 
I was able to find a simple way to achive the block highlighting.
 2015-01-17 13:23:30 +01:00
poixen
9b7f488bd7 Merge pull request #559 from poixen/chatnamehighlight 
Fixed #557
 2015-01-17 00:43:49 +01:00
Matt Lowe
e4afd9fa4d Fixed #557 2015-01-17 00:08:54 +01:00
Gavin Bisesi
7ef5f2d3a4 Merge pull request #558 from ctrlaltca/memory_limit 
Limit pixmap cache size to 2047MB; fix #555
 2015-01-16 12:09:00 -05:00
Fabio Bas
24c6e4a81d Limit pixmap cache size to 2047MB; fix #555 
also, fix any invalid values loaded from config
 2015-01-16 17:11:38 +01:00
Matt Lowe
aad98756d1 Refactorings 
+ added comments
+ refactored optimumRect
 2015-01-15 23:52:19 +01:00
Gavin Bisesi
8e396cadc2 Merge pull request #554 from poixen/chatsettingstab 
Updated chat setting tab
 2015-01-15 08:39:30 -05:00
Matt Lowe
a794112b1d Updated chat setting tab 
+ Renamed "Messages" to "Chat Settings"
+ Moved the chat mentions to this tab
+ Added boarder round macro settings
 2015-01-15 00:47:10 +01:00
poixen
9aeeee3a77 Merge pull request #553 from poixen/soundsettings 
Added title for sound settings
 2015-01-15 00:23:23 +01:00
Matt Lowe
0454f9c24b Added title for sound settings 2015-01-15 00:01:12 +01:00
Matt Lowe
e4e3a1d2e5 Sorting views 
+ When viewing a sorted view (like revealing hand, or looking at
library), the cards will now be sorted in columns based on the main card
type.
+ Settings are now saved.
 2015-01-14 23:19:22 +01:00
Gavin Bisesi
d3a7320ce2 Readme links to install instructions wiki page 2015-01-14 17:00:05 -05:00
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