woogerboy21
7d7151135e
Removed mod notification code that causes crashes
2015-09-26 23:19:49 -04:00
woogerboy21
c1663d578a
Merge pull request #1588 from Cockatrice/servatrice.sql_warntable_syntaxfix
...
Corrected mod_name column syntax in warnings table
2015-09-25 18:40:09 -04:00
woogerboy21
7a4cabaf67
Corrected mod_name column syntax in warnings table
...
It was missing a comma at the end of the line.
2015-09-25 18:19:44 -04:00
woogerboy21
291b262b64
Merge pull request #1569 from woogerboy21/correct_warn_schema
...
Updated cockatrice_warnings table to use id column as primary key
2015-09-25 08:09:56 -04:00
woogerboy21
b65882f7ce
Updated cockatrice_warnings table to use id column as primary key
2015-09-25 07:35:23 -04:00
Zach
d55e44ea60
Merge pull request #1558 from Cockatrice/revert-1556-carddatabase_changes
...
Revert "Reimplemented PictureLoader as a singleton"
2015-09-23 03:17:49 -04: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
Zach
ad55c3e198
Merge pull request #1541 from woogerboy21/log_tab
...
Added logs tab to allow moderators the ability to review log history
2015-09-23 01:01:20 -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
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
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
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
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
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
