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
