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

3506 commits

This branch
This branch
All branches
Author SHA1 Message Date
Fabio Bas
01e467fa98 Updated translations 2016-05-06 13:17:20 +02:00
Zach
7d0d0f4ea9 Merge pull request #1969 from tooomm/patch-3 
remove numbers from the dice roll translatable strings
 2016-05-05 02:10:20 -04:00
tooomm
a42ef63ec4 removed bracket leftovers 2016-05-04 23:41:09 +02:00
tooomm
a93bef1de5 fix #1833 
remove numbers from the dice roll translatable strings
 2016-05-04 23:21:52 +02:00
Gavin Bisesi
ff1091ac02 Merge pull request #1962 from Cockatrice/mention-bot-config 
Create .mention-bot
 2016-04-27 14:50:49 -04:00
Gavin Bisesi
a4359244bc Create .mention-bot 
Don't tag brukie for code review
 2016-04-27 14:48:40 -04:00
ctrlaltca
c213b67fc4 Merge pull request #1959 from ctrlaltca/translations 
Update translations
 2016-04-25 18:47:08 +02:00
Fabio Bas
af3b4ded22 Update translations 2016-04-25 18:45:24 +02:00
ctrlaltca
6bebbf284f Merge pull request #1955 from leematos/gender-neutral 
Make client gender neutral
 2016-04-25 17:18:25 +02:00
Lee Matos
c01d526161 make client gender neutral 2016-04-21 03:44:39 -04:00
Zach
2e3966afce Merge pull request #1949 from tooomm/patch-3 
changed issue link + new user explanation
 2016-04-16 19:59:15 -04:00
tooomm
5b4a774725 changed issue link + new user explanation 2016-04-16 10:40:57 +02:00
Zach
11dfee404d Merge pull request #1948 from ctrlaltca/deb_svg 2016-04-15 12:39:16 -04:00
Fabio Bas
a92b2ba600 CMake: add Qt-Svg to dependencies 2016-04-15 17:56:04 +02:00
Zach
d75d69400f Merge pull request #1944 from ctrlaltca/fix_1942 2016-04-14 15:10:52 -04:00
Fabio Bas
a340d25077 Fix #1942 2016-04-14 14:36:46 +02:00
ctrlaltca
768a1c5fb4 Merge pull request #1939 from ctrlaltca/fix_appveyor 
Appveyor: stick with a known working nsis version
 2016-04-12 23:08:49 +02:00
Fabio Bas
993cbf5ae9 Appveyor: stick with a known working nsis version 2016-04-12 22:05:30 +02:00
ctrlaltca
6f84f921f3 Merge pull request #1933 from tooomm/patch-3 
docker - tweaks and link to wiki
 2016-04-11 19:46:49 +02:00
tooomm
44d34673f4 docker - tweaks and link to wiki 
added paragraphs for better readability
link to wiki on how to use docker

(also reordered the running part, call it alphabetically or most important part on top... both apply :P )
 2016-04-11 19:38:45 +02:00
ctrlaltca
03af9afe17 Merge pull request #1930 from ctrlaltca/fix_1929 
Fix calculation of card info popup size
 2016-04-11 19:22:20 +02:00
ctrlaltca
cb29e0a057 Merge pull request #1931 from ctrlaltca/docker 
Updated Dockerfile and doc
 2016-04-11 19:04:06 +02:00
Fabio Bas
a72f9af984 Updated Dockerfile and doc 2016-04-11 18:51:44 +02:00
Fabio Bas
14d731da98 fix calculation of card info popup size 2016-04-11 17:07:07 +02:00
ctrlaltca
4f30b5cd31 Merge pull request #1921 from ctrlaltca/number 
Implemented !setnumber!
 2016-04-11 15:16:25 +02:00
ctrlaltca
73da10e485 Merge pull request #1919 from ctrlaltca/fix_1918 
Fix english language in options
 2016-04-11 15:16:02 +02:00
Gavin Bisesi
b4d572158d Merge pull request #1926 from tooomm/issue_template 
Update ISSUE_TEMPLATE.md
 2016-04-09 21:56:36 -04:00
tooomm
963e5d7f33 Update ISSUE_TEMPLATE.md 
see https://github.com/Cockatrice/Cockatrice/pull/1914
 2016-04-09 20:54:51 +02:00
Fabio Bas
8c17e2d12a Implemented !setnumber! 
fix #1741
 2016-04-08 22:22:22 +02:00
ctrlaltca
8d67c75028 Merge pull request #1920 from ctrlaltca/fix_1915 
Fix card mention in chat
 2016-04-08 21:54:22 +02:00
Fabio Bas
c7061523e6 fix #1915 2016-04-08 19:48:29 +02:00
Fabio Bas
2e7298d064 Fix english language in options 2016-04-08 19:34:28 +02:00
ctrlaltca
948a5c62ef Merge pull request #1910 from ctrlaltca/translations 
Translations update
 2016-04-05 19:36:24 +02:00
Fabio Bas
e9736d298e Translations update 2016-04-05 19:35:24 +02:00
ctrlaltca
4691f3e2c5 Merge pull request #1906 from ctrlaltca/fix_1903 
Token dialog: disable progressive loading
 2016-04-05 08:30:32 +02:00
ctrlaltca
2b138cce93 Merge pull request #1900 from ctrlaltca/dbview 
Save deck editor's database view columns state
 2016-04-05 08:29:46 +02:00
ctrlaltca
ef62261e43 Merge pull request #1901 from ctrlaltca/carddb_loading 
CardDb: be permissive when loading xmls
 2016-04-05 08:29:06 +02:00
Fabio Bas
2a3701b036 fix #1903 2016-04-03 18:33:10 +02:00
Fabio Bas
ce56e5f1a4 CardDb: be permissive when loading xmls 2016-04-03 11:15:16 +02:00
Fabio Bas
58f85e7ebd Save deck editor's database view columns state 2016-04-02 09:38:34 +02:00
ctrlaltca
f217551f5f Merge pull request #1877 from Psithief/patch-2 
Prevent PTColumn from being the last column shown.
 2016-03-30 22:55:49 +02:00
ctrlaltca
55f3e9314b Merge pull request #1859 from ctrlaltca/carddb 
Rework some parts of the card database
 2016-03-30 22:55:36 +02:00
ctrlaltca
830a4c2f56 Merge pull request #1894 from woogerboy21/clientid_update 
Updated ClientID Functionality
 2016-03-30 22:55:17 +02:00
woogerboy21
44123b9b0b Untabify 
Yay!  Figured out how to do this in VS2015!
 2016-03-30 15:30:58 -04:00
woogerboy21
506ad91b03 Privatized Function 
Moved the updated hashing function out of the settingscache and into the
remoteclient and privatized the function for proper use.
 2016-03-29 22:00:42 -04:00
woogerboy21
ee849f6379 Updated ClientID Functionality 
ClientID is now generated on startup and stored in settings cache.  Then
upon connect there is a new SrvClientID generated from the ClientID +
servername being connected to
 2016-03-29 17:05:25 -04:00
Fabio Bas
e94f59d7c2 Crash fix 2016-03-22 17:07:45 +01:00
Gavin Bisesi
3c58003a3d Merge pull request #1880 from leematos/patch-1 
Remove "Ghost" Toolbar
 2016-03-22 08:14:36 -04:00
Lee Matos
9f3b50086d Remove "Ghost" Toolbar 
I'm working on a theme and realized we have a toolbar that used to be used for price, which we no longer display. I removed the code (and the unused price code action) as we weren't using either.
 2016-03-21 21:27:38 -04:00
Fabio Bas
2d2958e931 cmake: Enable c++11 for all targets 2016-03-21 13:09:56 +01:00