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

1991 commits

Author SHA1 Message Date
Zach H
e0a25e74ac fix merge issues 2015-12-30 11:54:30 -05:00
Zach H
f568a4e865 todo 2015-12-30 11:51:53 -05:00
Zach H
703ff7905c token coordinates 2015-12-29 23:43:03 -05:00
Zach H
da0e3292d3 Token PT shown in create related dialog 2015-12-29 18:28:41 -05:00
Lee Matos
8a6d63265f Enable HiDpiPixmaps for Qt5 2015-12-28 22:03:38 -05:00
ctrlaltca
c917a6c272 Merge pull request #1722 from ctrlaltca/rev-related 
Implement reverse-related tag for cards
 2015-12-27 18:44:05 +01:00
Zach H
137d7328b5 coin flip 
remove male/female as it's same

male/female fixes

translate
 2015-12-27 12:34:11 -05:00
Fabio Bas
4b1c59424e Implement reverse-related tag for cards 2015-12-26 19:57:20 +01:00
Fabio Bas
e721280bc0 Implemented proposed changes 2015-12-26 16:40:17 +01:00
Fabio Bas
4d7795ca3a Split pictuloader out of carddatabase 2015-12-26 16:40:17 +01:00
Fabio Bas
696ae7e85f Add gear icon to settings menu entry 2015-12-19 11:48:54 +01:00
Fabio Bas
5093ea4170 Small typos + reextracted strings 2015-12-15 16:31:58 +01:00
Fabio Bas
2712dd4248 Extracted new translation strings 2015-12-15 15:59:20 +01:00
Fabio Bas
ed4149fa7b Add .txt to the common deck file types 
fix #1683
 2015-12-13 12:00:39 +01:00
ctrlaltca
0c137e8a10 Merge pull request #1662 from BrandonGriffin/SetFocusOnDescriptionWhenLoadingGameDialog 
Added set focus to description anytime a create dialog is opened
 2015-12-12 18:17:12 +01:00
ctrlaltca
de6235f69c Merge pull request #1698 from ctrlaltca/fix_1694 
Improved login error message
 2015-12-12 09:15:01 +01:00
ctrlaltca
a07b72a031 Merge pull request #1699 from ctrlaltca/fix_1687 
Fix column widths in rooms list
 2015-12-12 09:14:51 +01:00
Fabio Bas
deec7cdc14 Avoid crash on dereferencing null pointer 2015-12-11 19:32:08 +01:00
Fabio Bas
803589264d Fix column widths in rooms list 2015-12-11 18:51:40 +01:00
Fabio Bas
beecc0f970 Improved login error message 2015-12-11 18:42:29 +01:00
tooomm
bc44f8ce2a link renaming 
-`Linking FAQ` --> `How to set a custom picture url`
-updated define accordingly
 2015-11-17 16:04:29 +01:00
Brandon Griffin
813a0c2070 Added set focus to description anytime a create dialong is opened 2015-10-27 08:58:29 -04:00
Brandon Griffin
64c15d1fdc Changed the default setting to play cards to the stack 2015-10-23 20:11:13 -04:00
ctrlaltca
613f712974 Merge pull request #1646 from ctrlaltca/debian_package 
CPack: Debian package
 2015-10-17 09:33:06 +02:00
ctrlaltca
75eb779826 Merge pull request #1637 from ctrlaltca/cmdjoin_handler 
Handle more Command_JoinRoom return values
 2015-10-16 11:48:40 +02:00
Fabio Bas
23e84273ed If the user request to join a room and we are already in, just focus the correct tab 
Also, handle all the Command_JoinRoom return values
 2015-10-15 19:17:02 +02:00
Fabio Bas
bab4a51ebb CPack: Debian package 2015-10-13 22:16:00 +02:00
Fabio Bas
7fe60279de Fix PR #1600 2015-10-09 14:59:42 +02:00
Gavin Bisesi
3ebe42c400 Add dummy googletest 
Uses the built in cmake -Dtest=ON

It should download googletest on the fly if needed.

Adds a new make target, `make test`

Ref #167
 2015-10-09 14:58:46 +02:00
ctrlaltca
43262b294d Merge pull request #1620 from ctrlaltca/fix_rpath 
Fix qt libraries bundling on osx
 2015-10-02 17:54:10 +02:00
ctrlaltca
b0e9e0fb3a Merge pull request #1603 from ctrlaltca/fix_audio 
Fix volume control
 2015-10-02 14:46:30 +02:00
Fabio Bas
74c58cc2b0 fix qt libraries bundling on osx 
fix #1547
 2015-10-01 23:35:54 +02:00
Psithief
ca9bfc9ff2 Revert focus policy change in tab_game 
Fixes #1529.

Completely untested, because I don't think this could possibly interfere with anything. It's a straight revert.
 2015-10-01 12:00:30 +08:00
Fabio Bas
a9f2cd73de Fix volume control 
fix #1528
 2015-09-28 12:24:22 +02:00
Zach
d5adec53a2 Revert "Reimplemented PictureLoader as a singleton" 2015-09-23 03:17:33 -04:00
Zach
064c89ba5c Merge pull request #1556 from ctrlaltca/carddatabase_changes 
Reimplemented PictureLoader as a singleton
 2015-09-23 01:21:37 -04:00
woogerboy21
62ffcde6bd Added logs tab to allow moderators the ability to review log history/details 2015-09-23 00:50:01 -04:00
Zach
e68b8b314a Merge pull request #1522 from woogerboy21/offical_warnings 
Added official warning messages moderators can use to inform users
 2015-09-22 23:29:12 -04:00
woogerboy21
6ad2a59367 Added official warning messages moderators can use to inform users 2015-09-22 22:27:46 -04:00
Fabio Bas
e0383af6dd workaround "Signals are protected in qt4" 2015-09-22 23:57:39 +02:00
Fabio Bas
ac16602f08 Fix crash on null pointer dereference 2015-09-22 23:46:41 +02:00
Fabio Bas
f6c7f3355f Reimplemented PictureLoader as a singleton 
* Removed remaining picture handling from card database and cardinfo
 * removed the “noCard object” hack
 2015-09-22 23:09:53 +02:00
Zach
3f70513096 Merge pull request #1555 from ctrlaltca/cards_crash 
Fix crash on loading invalid cards.xml
 2015-09-22 16:19:12 -04:00
Zach
8125358052 Merge pull request #1523 from marcofernandezheras/Restore-Shortcuts 
Restore shortcuts
 2015-09-22 16:00:49 -04:00
Fabio Bas
7a4bf9a313 Fix crash on loading invalid cards.xml 
Additionally, move the custom database load after the LoadStatus check,
so that they don't bring up the “fix your card database path” settings
dialog
 2015-09-22 21:56:02 +02:00
Zach
aacbe93d04 Merge pull request #1540 from ctrlaltca/remove_unused_sounds 
Removed unused sound names
 2015-09-22 15:51:05 -04:00
woogerboy21
cd7b25f712 Fix #1542 
This should fix #1542 (please test)
 2015-09-22 01:19:31 -04:00
Fabio Bas
2df50f5766 Removed unused sound names 2015-09-20 12:08:55 +02:00
marco
599ef0ae62 Confirmation to clear/restore shortcuts 2015-09-20 00:21:07 +02:00
Zach
1409b97490 Merge pull request #1530 from ZeldaZach/fix_1527 
Minors Fixes for #1527
 2015-09-18 10:18:12 -04:00