Fabio Bas
af3b4ded22
Update translations
2016-04-25 18:45:24 +02:00
Lee Matos
c01d526161
make client gender neutral
2016-04-21 03:44:39 -04:00
Fabio Bas
a340d25077
Fix #1942
2016-04-14 14:36:46 +02:00
Fabio Bas
14d731da98
fix calculation of card info popup size
2016-04-11 17:07:07 +02:00
ctrlaltca
4f30b5cd31
Merge pull request #1921 from ctrlaltca/number
...
Implemented !setnumber!
2016-04-11 15:16:25 +02:00
ctrlaltca
73da10e485
Merge pull request #1919 from ctrlaltca/fix_1918
...
Fix english language in options
2016-04-11 15:16:02 +02:00
Fabio Bas
8c17e2d12a
Implemented !setnumber!
...
fix #1741
2016-04-08 22:22:22 +02:00
Fabio Bas
c7061523e6
fix #1915
2016-04-08 19:48:29 +02:00
Fabio Bas
2e7298d064
Fix english language in options
2016-04-08 19:34:28 +02:00
ctrlaltca
4691f3e2c5
Merge pull request #1906 from ctrlaltca/fix_1903
...
Token dialog: disable progressive loading
2016-04-05 08:30:32 +02:00
ctrlaltca
2b138cce93
Merge pull request #1900 from ctrlaltca/dbview
...
Save deck editor's database view columns state
2016-04-05 08:29:46 +02:00
Fabio Bas
2a3701b036
fix #1903
2016-04-03 18:33:10 +02:00
Fabio Bas
ce56e5f1a4
CardDb: be permissive when loading xmls
2016-04-03 11:15:16 +02:00
Fabio Bas
58f85e7ebd
Save deck editor's database view columns state
2016-04-02 09:38:34 +02:00
ctrlaltca
f217551f5f
Merge pull request #1877 from Psithief/patch-2
...
Prevent PTColumn from being the last column shown.
2016-03-30 22:55:49 +02:00
ctrlaltca
55f3e9314b
Merge pull request #1859 from ctrlaltca/carddb
...
Rework some parts of the card database
2016-03-30 22:55:36 +02:00
woogerboy21
44123b9b0b
Untabify
...
Yay! Figured out how to do this in VS2015!
2016-03-30 15:30:58 -04:00
woogerboy21
506ad91b03
Privatized Function
...
Moved the updated hashing function out of the settingscache and into the
remoteclient and privatized the function for proper use.
2016-03-29 22:00:42 -04:00
woogerboy21
ee849f6379
Updated ClientID Functionality
...
ClientID is now generated on startup and stored in settings cache. Then
upon connect there is a new SrvClientID generated from the ClientID +
servername being connected to
2016-03-29 17:05:25 -04:00
Fabio Bas
e94f59d7c2
Crash fix
2016-03-22 17:07:45 +01:00
Lee Matos
9f3b50086d
Remove "Ghost" Toolbar
...
I'm working on a theme and realized we have a toolbar that used to be used for price, which we no longer display. I removed the code (and the unused price code action) as we weren't using either.
2016-03-21 21:27:38 -04:00
Fabio Bas
18993b397b
First test for card database: loading and clear
2016-03-21 11:08:14 +01:00
Psithief
ba3a9f83bc
Prevent PTColumn from being the last column shown.
...
P/T column is really narrow. It should go before Card Type, so Card Type can expand into the remaining space.
Improves #1671 , assuming I got this correct.
Untested!
2016-03-19 19:55:57 +08:00
Fabio Bas
df393638ed
Small Fix
2016-03-18 21:18:48 +01:00
Zach H
27969b6752
prevent null crash
2016-03-18 14:25:29 -04:00
Fabio Bas
1e3fb6c6e1
Rework "paths" settings loading and card database loading
...
* main.cpp: removed path checking and db loading
* card database: merge card loading methods into a single one
* settings cache: take care of returning safe paths for decks,
replays, etc..
* main window: if db loading fails (eg. first run), propose to run
oracle
NSIS: propose to run cockatrice instead of oracle
Rework card database loading
* Move carddatabase-related method out of deckeditor tab
* Load cards in another thread and render them progressively
* Optimize database reload after enabled sets change
Fix deck editor column width
* removed the noCard hack.
* getCard() no more creates cards instead of just returning existing
ones
* Fix the “edit tokens” dialog.
* PictureLoader: avoid trying to download twice the same card
* PictureLoader: correct return of card background
* AbstractCardItem: avoid recalculating card color at every paint
Use a different file to save custom tokens
Misc required improvements
* Use nullptr;
* Refactor CardInfoWidget to use CardInfoPicture and CardInfoText
instead of duplicating code;
* Added CardInfo::getColorChar()
* Fixed some potential crashes
* removed dead code related to CardInfoWidget
* Don't require a restart after adding a new custom sets file
* Bump CMake requirements to 3.1
2016-03-15 22:27:55 +01:00
Gavin Bisesi
bc79d9e2f8
Merge pull request #1796 from zebington/feat/custom-set-import
...
Add "Import custom set" function
2016-02-24 09:12:31 -05:00
Zach
5b22187a3d
Merge pull request #1794 from zebington/master
...
Fixes for create game dialogue.
2016-02-16 17:07:28 -05:00
Fabio Bas
a8c723326d
Game tab: use short title for undocked wdgets
...
fix #1777
2016-02-12 14:49:37 +01:00
Fabio Bas
ae8296a50e
Game tab: reset docks sizes on "reset layout"
2016-02-11 18:29:50 +01:00
Ira Aspen
aa658f95f6
Gave error dlg a description of the error for the user.
2016-02-09 03:10:57 +00:00
Ira Aspen
d078cf52c9
Removed unnecessary confirmClose() call.
2016-02-09 02:57:23 +00:00
Ira Aspen
96fbad1f0c
Moved get next set index code to own function
2016-02-09 02:55:52 +00:00
Ira Aspen
829f84fe50
Moved from using hex QT version checks to QT_VERSION_CHECK().
2016-02-09 01:56:24 +00:00
Ira Aspen
0ef2b48902
Refactored DlgAddSet class/functions to DlgAddSetResult
2016-02-09 01:52:09 +00:00
Ira Aspen
5a975831d4
Renamed "dlg_add_set.*" to "dlg_add_set_result.*" and updated references.
2016-02-09 01:40:21 +00:00
Fabio Bas
058b913455
Game: save and restore dock sizes
2016-02-07 21:58:51 +01:00
Ira Aspen
9d3c4f20a1
Changed strings referencing a set to say sets/cards.
2016-02-07 01:41:35 +00:00
tooomm
802ccd7f14
shortcut tabs adjustments
...
- typo fix
- improved description of some shortcuts
2016-02-06 19:29:57 +01:00
Ira Aspen
b5363f47ab
Updated message.
2016-02-06 12:42:45 +00:00
Ira Aspen
927226633d
Moved menu item decleration to work on all OSs.
2016-02-06 02:37:34 +00:00
Ira Aspen
de388a74bd
Moved exec statement.
2016-02-06 02:32:04 +00:00
Ira Aspen
54a759497f
Added confirmation dialogue when set added.
2016-02-06 02:29:09 +00:00
Ira Aspen
c914395236
Finished add set functionality.
2016-02-06 01:33:43 +00:00
Ira Aspen
2960cba12b
Added a file picker to the add set menu item.
2016-02-05 21:09:24 +00:00
Ira Aspen
646c4b4197
Added functionless menu button for adding a set.
2016-02-05 20:32:40 +00:00
Ira Aspen
9846fb1d8e
Made reseting the create game dialogue box only select 'Only regeistered users' if player is a registered user.
2016-02-05 19:32:27 +00:00
Ira Aspen
154da4452d
Made create game box prevent only buddies can join being selected for unregistered users.
2016-02-05 19:29:19 +00:00
Gavin Bisesi
7de8e8a6a7
Merge pull request #1747 from tooomm/about_url
...
[WAIT] added webpage to about window
2016-01-28 18:02:37 -05:00
ctrlaltca
5dd20181fd
Merge pull request #1753 from ctrlaltca/pr_1544
...
Re-Dockified the game & replay review areas
2016-01-28 22:44:32 +01:00
ctrlaltca
14e94f1f8b
Merge pull request #1767 from Fizztastic/fix_1764
...
Sounds on buddy login & logout.
2016-01-28 22:33:10 +01:00
Fabio Bas
ee42d547bf
Disable downlod button when download starts
2016-01-28 22:27:14 +01:00
ctrlaltca
5577d618bd
Merge pull request #1727 from TMiguelT/target
...
Client update implementation
2016-01-28 22:25:54 +01:00
ctrlaltca
7ec3968c02
Merge pull request #1770 from ctrlaltca/fix_pixmaps
...
Fix pixmap usage in pictureloader
2016-01-23 18:23:55 +01:00
Fabio Bas
133693d9ce
Fix pixmap usage in pictureloader
...
fix #1765
2016-01-23 11:00:10 +01:00
Jeff
9767b1f69d
Fix #1764
...
Add Sounds on buddy login & logout.
Add Files: buddy_join.wav; buddy_leave.wav
2016-01-22 15:03:01 -05:00
Michael Milton
66fda086c3
Client update implementation
2016-01-20 22:26:17 +01:00
woogerboy21
f57e0454bb
Dockified the game & replay review areas
2016-01-16 00:54:14 +01:00
Zach
36c3536e0c
Merge pull request #1721 from ctrlaltca/speedup
...
Misc speedups in card database
2016-01-15 18:43:01 -05:00
Fabio Bas
3605cc55b7
fix replay progress bar
2016-01-13 00:17:02 +01:00
tooomm
953b183dab
added url to about
...
added gh pages url
2016-01-09 22:53:54 +01:00
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
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
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
ctrlaltca
b0e9e0fb3a
Merge pull request #1603 from ctrlaltca/fix_audio
...
Fix volume control
2015-10-02 14:46:30 +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
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
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
woogerboy21
9dc77d674f
Fix older gcc nested pre-def with portable builds
2015-09-05 17:44:51 -04:00
Zach
60ed9fd1ff
Add slash
2015-09-03 14:56:23 -04:00
marco
44fefc20c2
Fix portable on OSX
2015-09-03 19:47:07 +02:00
marco
b4c5729bf5
fix Decks, Pics replays & sounds paths on Portable build
2015-09-03 18:31:11 +02:00
Zach
f4ae08f8b1
Merge pull request #1439 from woogerboy21/feature_check
...
Added server/client feature set communication
2015-09-02 23:38:53 -04:00
woogerboy21
044c2356ff
Added server/client feature set communication
2015-09-02 17:54:06 -04:00
Zach
3188ef4cde
Merge pull request #1444 from woogerboy21/fix_blank_ban
...
Detect if a use is trying to place an invalid ban
2015-09-01 22:20:05 -04:00
marco
baa61d0571
Merge branch 'master' into Refactor-settings
...
Conflicts:
oracle/CMakeLists.txt
2015-09-01 21:28:53 +02:00
Fabio Bas
6d7baec37b
Merge with master
2015-08-31 22:55:46 +02:00
Fabio Bas
5cfb034452
merged with master
2015-08-31 22:48:14 +02:00
woogerboy21
66c19ab727
Detect if a use is trying to place an invalid ban
2015-08-31 01:00:13 -04:00
tooomm
83e9f9deba
typos resolved
...
@marcofernandezheras ok?
2015-08-26 15:33:05 +02:00
marco
4125d690fa
Fix merge & relative path for portable build
2015-08-25 20:22:31 +02:00
woogerboy21
364df4daf0
Extend the login protocol to send the client id (as optional)
2015-08-24 11:38:24 -04:00
Zach
324ddda4dd
Merge pull request #1416 from ZeldaZach/fix_1411
...
Define URLs
2015-08-23 23:00:22 -04:00
Zach
14da4efe6d
Merge pull request #1414 from ZeldaZach/fix_1412
...
Prevent bad flags
2015-08-23 17:59:52 -04:00
Zach H
a8727d5a50
define URLs
2015-08-23 17:57:26 -04:00
Zach
4d2fdaec08
Merge pull request #1407 from Fizztastic/fix_1396
...
Option to opt-out of remember game settings
2015-08-23 16:28:01 -04:00
Zach H
8ffe310855
prevent bad flags
2015-08-23 16:27:18 -04:00
marco
be7efa98cf
Fix relative path for image download & settings
2015-08-23 15:54:52 +02:00
marco
1e2d5b0693
Fix translate setting + Mod oracle to portable build
2015-08-23 14:14:11 +02:00
Jeff
ca82fd867a
Option to opt-out of remember game settings
2015-08-22 15:52:03 -04:00
woogerboy21
b0630b81ca
Log old session out of server if logging in from a second location
2015-08-22 13:41:02 -04:00
ctrlaltca
18ec8e20b6
Merge pull request #1381 from ZeldaZach/flags_to_lower
...
Country to lower (fix win bug)
2015-08-22 11:53:22 +02:00
Zach
e9156ecd62
Merge pull request #1391 from woogerboy21/admin_adjustmods
...
Allows admins to promote users to mod and demote mod to user
2015-08-22 00:03:46 -04:00
Gavin Bisesi
66f14c1168
Address PR feedback
2015-08-21 23:03:15 -04:00
Zach
a6a62b3334
Merge pull request #1354 from Cockatrice/fix-1351
...
Fix #1351 - Server ignores only-reg if in "none" auth mode.
2015-08-21 22:15:32 -04:00
Daenyth
6170c9037f
Fix #1351 - Server ignores only-reg if in "none" auth mode.
...
When in none auth mode, registered users don't exist; hence the setting
makes the game impossible to join.
Normally the setting would be greyed out when the user is unregistered,
but commit 475c54bf
2015-08-21 20:30:46 -04:00
Zach H
41b10308ba
country to lower (fix win bug)
2015-08-21 20:05:49 -04:00
marco
c8d59eec5e
Refactred settings to use settingscache & ini files
2015-08-22 01:05:15 +02:00
Jeff
50e0b6dd35
Merge lines
2015-08-20 23:33:06 -04:00
Jeff
97d0cfa3d9
Fix first word completion
2015-08-20 23:01:32 -04:00
woogerboy21
39fcabe921
Allows moderators to promote users to mod and demote mod to user
2015-08-20 22:42:10 -04:00
Jeff
05f2bc8392
Fix Conflicts
2015-08-20 22:27:46 -04:00
Jeff
e9bad2cacb
Merge branch 'master' into fix_1387
...
Conflicts:
cockatrice/CMakeLists.txt
cockatrice/src/tab_game.h
cockatrice/src/tab_room.cpp
2015-08-20 22:23:47 -04:00
Zach
b2ab2c6eba
Merge pull request #1382 from marcofernandezheras/Customizable-shortcuts
...
Customizable shortcuts
2015-08-20 21:44:05 -04:00
marco
c6aba5a6d0
Renamed file + reduced window size + resfresh on change
2015-08-20 20:23:08 +02:00
Jeff
a64ea17357
Add LineEditCompleter to Tab_Game
2015-08-19 18:46:08 -04:00
Zach
8c0722953f
Merge pull request #1386 from Fizztastic/fix_1383
...
Fix linked cardwidget not showing PT/Loyalty
2015-08-17 17:14:30 -04:00
Jeff
f3c43cb50f
Fix linked cardwidget not showing PT/Loyalty
2015-08-16 19:02:55 -04:00
marco
d3d6f70496
Removed 2nd arg from ShortcutsSettings::getShortcut
2015-08-16 21:53:59 +02:00
marco
1ca89e0b09
Moved counters to a new tab
2015-08-16 15:38:23 +02:00
marco
713a8148d3
Customizable shorcuts
2015-08-16 14:24:04 +02:00
marco
be82472f35
Merge branch 'master' into Customizable-shortcuts
2015-08-16 14:01:48 +02:00
marco
4cb53ccaed
Merge branch 'master' into Customizable-shortcuts
2015-08-16 13:52:34 +02:00
marco
beaa4e9383
Configurable shortcuts
2015-08-16 13:46:57 +02:00
woogerboy21
702f949196
Updated response block to look better
2015-08-15 21:17:32 -04:00
woogerboy21
3e94c9d283
Define permission levels for rooms
2015-08-15 21:00:51 -04:00
