Commit graph

2042 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
Fabio Bas
fddcbb8296 Lazy loading of card database view => faster startup times 2015-12-28 15:26:10 +01: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
Zach H
ccc8ac4826 minor fixes 2015-09-18 09:56:32 -04:00
Fabio Bas
2a20b6028e Changed problematic shortcuts 2015-09-18 08:38:54 +02:00
woogerboy21
b0693299c7 Added server private message functionality to allow server based PM notifications.
Ban based notification to other online moderators is the first form implemented by this PR.
2015-09-17 22:40:29 -04:00
marco
0ce38ea88e Reset & Clear all shortcuts
This closes #1517
2015-09-16 13:35:26 +02:00
marco
8eacd85d68 Link to wiki: how to set shortcuts 2015-09-16 12:30:32 +02:00
ctrlaltca
c7c84bca8f Merge pull request #1521 from tooomm/patch-2
remove debug code; fix #1520
2015-09-16 08:42:48 +02:00
tooomm
1bec6dc37a shortcut tabs adjustments
- `|` over `/` to make `P/T` better readable
- Game play --> Gameplay
- Player - Playing Area
2015-09-15 18:56:53 +02:00
tooomm
814553dae6 remove debug code
fixes #1520
2015-09-15 18:53:06 +02:00
Zach
385455e77c Merge pull request #1510 from woogerboy21/room_message_history
Added chat history to a room that is displayed on join
2015-09-15 12:10:37 -04:00
woogerboy21
87a64da1bc Added chat history to a room that is displayed on join.
With this update a new chat history definition is added on a per
room bases which allows operators to specify the number of chat
messages to store and present to the user on join.  Please see
the sample ini for room definitions.
2015-09-14 17:54:04 -04:00
Zach
3412ce2f7d Merge pull request #1501 from marcofernandezheras/Fix-Shortcut-Detection
Fix shortcuts detection on settings & game
2015-09-14 16:02:45 -04:00
marco
4c6b543cbe Fix shortcuts detection on settings & game
Fix #1499, Fix #1493, Fix #1477
Fix typo
2015-09-14 16:56:51 +02:00
Fabio Bas
a6bc709583 merged master 2015-09-13 19:39:42 +02:00
Fabio Bas
5aaae5279c revert to using QAudioOutput 2015-09-13 19:37:49 +02:00
Zach
f2864ce569 Merge pull request #1511 from ctrlaltca/theme_extensions
Themes: don't use hardcoded extensions on images
2015-09-13 13:26:12 -04:00
Fabio Bas
f78c01fa88 Avoid multiple sounds playing at the same time 2015-09-13 17:22:58 +02:00
woogerboy21
46f78fcead Fix server crash on banning 2015-09-13 00:52:52 -04:00
Fabio Bas
85aa866e02 sound themes 2015-09-13 02:01:50 +02:00
Fabio Bas
28df389ea6 Fixed flags size: they're not squared 2015-09-13 00:53:11 +02:00
Fabio Bas
dfe9719637 Removed unused parameter 2015-09-13 00:26:28 +02:00
Fabio Bas
00e3e63f41 Themes: remove all hardcoded extensions 2015-09-13 00:14:36 +02:00
Jeff
32df2c29ed Fix library, grave, exile crash on windows 2015-09-12 17:24:36 -04:00
Zach
226a8cc017 Merge pull request #1498 from ctrlaltca/sound_whatever
Reworked SoundEngine overhaul
2015-09-12 00:35:20 -04:00
Zach
4c9555bb59 Merge pull request #1496 from ctrlaltca/clamp_zoneview
Clamp zone view widget's titlebar inside the viewable area
2015-09-12 00:34:12 -04:00
Zach
29446d80d4 Merge pull request #1469 from woogerboy21/request_ban
Added the ability or moderation staff to request user ban history
2015-09-10 21:34:16 -04:00
Fabio Bas
a06c7b2f9d Rework the sound engine to use QSound
plus misc fixes
2015-09-11 00:43:22 +02:00
Fabio Bas
0b072e2d60 Remove dependency to qt multimedia/mobility under qt4 and unused phonon plugins 2015-09-11 00:42:37 +02:00
Fabio Bas
b2f855aeb0 fix settings icon spacing 2015-09-10 23:37:16 +02:00
Fabio Bas
a7616835e3 Clamp zone view widget's titlebar inside the viewable area 2015-09-10 23:29:01 +02:00
woogerboy21
90cb890cc2 Added the ability or moderation staff to request user ban history 2015-09-10 16:02:45 -04:00
Jeff
badbcf2753 Fix sound test button 2015-09-09 16:47:09 -04:00
Jeff
d6398477ae SoundEngine overhaul 2015-09-09 02:24:02 -04:00
Zach
05aa8b2c92 Merge pull request #1474 from woogerboy21/no_tab_close
Do not close message tabs on disconnect
2015-09-09 00:04:06 -04:00
woogerboy21
7bfea03af8 Do not close message tabs on disconnect 2015-09-08 14:38:48 -04:00
ctrlaltca
c984a7c962 Merge pull request #1488 from ctrlaltca/translations
Translations update
2015-09-08 19:25:34 +02:00
Fabio Bas
fcc5370082 Fetched new translations 2015-09-08 19:12:41 +02:00
Fabio Bas
5951c95e81 extracted new translatable strings 2015-09-08 19:10:57 +02:00
Fabio Bas
c214234bb2 fix typo 2015-09-08 19:08:34 +02:00
Zach
aac980a8cb Merge pull request #1485 from ctrlaltca/fix_notification_click
Don't change window maximized state when clicking a notification
2015-09-08 12:49:00 -04:00
Zach
601ada8473 Merge pull request #1484 from ctrlaltca/fix_f12
Fix loading of "increase life counter" shortcut in settings
2015-09-08 12:43:27 -04:00
Zach
b47aa86c84 Merge pull request #1483 from ctrlaltca/deckeditor_filter_buttons
Add back "remove" buttons to deck editor's filter
2015-09-08 12:33:15 -04:00
Zach
73f2d2b0e5 Merge pull request #1478 from ctrlaltca/fix_replay_crash
Fix replay crash due to completer
2015-09-08 12:31:59 -04:00
Fabio Bas
4ee12f0b69 Don't change window maximized state when clicking a notification 2015-09-08 17:49:31 +02:00
Fabio Bas
db18c7da10 Fix loading of "increase life counter" shortcut in settings 2015-09-08 17:13:47 +02:00
Fabio Bas
3be1bcd356 Add back "remove" buttons to deck editor's filter 2015-09-08 10:25:33 +02:00
Fabio Bas
50aa6e3a4d Fix autoconnect 2015-09-08 08:37:19 +02:00
Fabio Bas
f14ebb0028 Fix replay crash due to completer 2015-09-08 08:12:00 +02:00
marco
36f19be06a Fix thememanager on portable build 2015-09-06 18:29:48 +02:00
Fabio Bas
e50d0c6db2 get cardback image from theme 2015-09-06 11:44:19 +02:00