Commit graph

3101 commits

Author SHA1 Message Date
Zach
b8732a54bb Merge pull request #1550 from Cockatrice/server_mess_i_pm
Fix #1542
2015-09-22 15:50:26 -04:00
woogerboy21
cd7b25f712 Fix #1542
This should fix #1542 (please test)
2015-09-22 01:19:31 -04:00
Zach
1409b97490 Merge pull request #1530 from ZeldaZach/fix_1527
Minors Fixes for #1527
2015-09-18 10:18:12 -04:00
Zach
1182ee191c Merge pull request #1516 from ctrlaltca/default_shortcuts
Changed problematic shortcuts
2015-09-18 10:05:24 -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
Zach
ead6ab3ad6 Merge pull request #1527 from woogerboy21/ban_mod_notify
Moderator ban notifications + Server PM functionality
2015-09-17 22:53:07 -04: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
Zach
afc425e6a5 Merge pull request #1524 from tooomm/Update-README.md
readme / added license badge + link
2015-09-16 08:49:38 -04:00
tooomm
0dc8fe9e73 added licence badge + link 2015-09-16 13:35:40 +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
Zach
04a96e96bb Merge pull request #1492 from tooomm/patch-1
shortcut text adjustments
2015-09-15 13:11:16 -04: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
Zach
f97a7e8370 Merge pull request #1512 from ctrlaltca/sound_themes
sound themes
2015-09-13 15:37:00 -04:00
Fabio Bas
6257ea701e Revert "remove qtmobility from apt packages"
This reverts commit 669568b918.
2015-09-13 19:44:37 +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
Zach
59da62d240 Merge pull request #1502 from woogerboy21/fix_ban_crash
Fix server crash on banning
2015-09-13 01:12:29 -04: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
ctrlaltca
d5afd97ff4 Merge pull request #1509 from Fizztastic/1505_fix
Fix library, grave, exile crash on windows
2015-09-12 23:38:22 +02:00
Jeff
32df2c29ed Fix library, grave, exile crash on windows 2015-09-12 17:24:36 -04:00
Jeff
73677e16f6 Merge remote-tracking branch 'Cockatrice/master' into 1505_fix 2015-09-12 17:23:40 -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
Zach
e4470acb84 Merge pull request #1497 from ctrlaltca/settings_icons
fix settings icon spacing
2015-09-10 21:33:43 -04:00
Fabio Bas
669568b918 remove qtmobility from apt packages 2015-09-11 00:45:35 +02:00
Fabio Bas
a06c7b2f9d Rework the sound engine to use QSound
plus misc fixes
2015-09-11 00:43:22 +02:00
Fabio Bas
6d56e0dfd6 fix wav file names 2015-09-11 00:42:50 +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
Zach
3bc61eb2e9 Merge pull request #1473 from woogerboy21/user_stats_table
Added user analytics table to database
2015-09-09 08:46:52 -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
d7d50def51 Added user analytics table to database 2015-09-08 14:56:10 -04:00
woogerboy21
7bfea03af8 Do not close message tabs on disconnect 2015-09-08 14:38:48 -04:00