 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 |
|
|
Gavin Bisesi
|
bf42319296
|
Merge pull request #1820 from tooomm/patch-2
add template for issues
|
2016-02-20 07:45:08 -05:00 |
|
|
Gavin Bisesi
|
4f1d3c3269
|
Merge pull request #1821 from tooomm/patch-3
todo file - removed usermanual part
|
2016-02-20 07:44:26 -05: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 |
|
|
Gavin Bisesi
|
d2e731bb2b
|
Merge pull request #1766 from tooomm/patch-2
new description (match io page)
|
2016-01-20 21:05:28 -05:00 |
|
|
Gavin Bisesi
|
fc59a33b84
|
Merge pull request #1760 from Cockatrice/proto-syntax-marker-removal
Remove 'syntax = proto2' from .proto files.
|
2016-01-14 15:20:00 -05:00 |
|
|
Gavin Bisesi
|
5350302969
|
Merge pull request #1755 from tooomm/patch-2
Updated ToC with 'Downloads'
|
2016-01-11 08:27:57 -05:00 |
|
|
Gavin Bisesi
|
2bf998b7d3
|
Merge pull request #1728 from Cockatrice/leematos-hidpi-support
Enable HiDpiPixmaps for Qt5
|
2015-12-28 22:12:12 -05:00 |
|
|
Gavin Bisesi
|
a6ff54ae0e
|
Merge pull request #1682 from tooomm/patch-2
link renaming
|
2015-11-22 10:01:05 -05:00 |
|
|
Gavin Bisesi
|
dbbfa82977
|
Merge pull request #1456 from Cockatrice/restore-python-register-script
Restore register.py script removed in 5ace0dd892
|
2015-09-03 09:14:54 -04:00 |
|
|
Gavin Bisesi
|
c0a0775323
|
Merge pull request #1434 from Cockatrice/restore-xsd
Restore xsd files removed in #1428
|
2015-08-28 18:25:14 -04:00 |
|
|
Gavin Bisesi
|
0c0413f056
|
Merge pull request #1404 from Cockatrice/docker-tweak
Use servatrice as docker entrypoint
|
2015-08-22 09:57:10 -04:00 |
|
|
Gavin Bisesi
|
ea9e966330
|
Merge pull request #1353 from Cockatrice/revert-1352-nonreg_nodbserver_fix
Revert "#1351 Fix"
|
2015-08-09 15:52:42 -04:00 |
|
|
Gavin Bisesi
|
59568bf13c
|
Revert "#1351 Fix"
|
2015-08-09 15:52:32 -04:00 |
|
|
Gavin Bisesi
|
481a57edf6
|
Show more informative error on registration failure
|
2015-08-08 09:55:23 -04:00 |
|
|
Gavin Bisesi
|
bf7cf61b85
|
Add more informative message on unrecognized login response
When logging in and receiving a reply that isn't understood, show a more informative error message.
`tr() + tr()` for better translation flexibility.
|
2015-08-08 09:48:18 -04:00 |
|
|
Gavin Bisesi
|
bd63315752
|
Merge pull request #1193 from Cockatrice/doctoc
Add ToC to README
|
2015-07-03 17:29:42 -04:00 |
|
|
Gavin Bisesi
|
dfd5c5e050
|
Merge pull request #1191 from Cockatrice/docker
Dockerfile for servatrice
|
2015-07-03 00:02:18 -04:00 |
|
|
Gavin Bisesi
|
dddaec1344
|
Merge pull request #948 from ctrlaltca/fix_947
fix #947 : typo in servatrice install path under linux
|
2015-04-11 12:45:04 -04:00 |
|
|
Gavin Bisesi
|
48f88e117e
|
Merge pull request #895 from poixen/close_tray_icon
tray icon is now hidden and then removed
|
2015-04-01 06:17:37 -04:00 |
|
|
Gavin Bisesi
|
0e3711723d
|
Merge pull request #890 from ctrlaltca/fix_633
Fix 633
|
2015-03-29 16:45:19 -04:00 |
|
|
Gavin Bisesi
|
19cdc65cd8
|
Merge pull request #889 from ctrlaltca/fix_670
Fix #670
|
2015-03-29 16:43:39 -04:00 |
|
|
Gavin Bisesi
|
49c1eec345
|
Merge pull request #886 from ctrlaltca/serverdeck
fix server deck storage; fix #744
|
2015-03-29 09:05:24 -04:00 |
|
|
Gavin Bisesi
|
1cf7c71631
|
Merge pull request #881 from poixen/right_click_cast
Cast to target from hand
|
2015-03-29 09:03:16 -04:00 |
|
|
Gavin Bisesi
|
98c92733ac
|
Merge pull request #871 from tooomm/readme-ts
readme - match new ts handling
|
2015-03-23 19:26:48 -04:00 |
|
|
Gavin Bisesi
|
16f4e00486
|
Merge pull request #866 from Cockatrice/fix-#681
Update translations bits in CONTRIBUTING.md; fix #861
|
2015-03-22 09:19:14 -04:00 |
|
|
Gavin Bisesi
|
b96604d85d
|
Merge pull request #854 from ctrlaltca/pvtmsg_tab_name
Private Chat Tab Update
|
2015-03-21 08:54:59 -04:00 |
|
|
Gavin Bisesi
|
20123b2c7a
|
Merge pull request #721 from poixen/kick_message
Kick message no longer takes you to kicked tab
|
2015-03-18 20:54:27 -04:00 |
|
|
Gavin Bisesi
|
3cea29e390
|
Merge pull request #849 from poixen/filter_fix
Fix for filter
|
2015-03-18 20:27:22 -04:00 |
|
|
Gavin Bisesi
|
4d825fff4d
|
Merge pull request #848 from tooomm/contributing.md
updated contributing.md
|
2015-03-18 20:26:45 -04:00 |
|
|
Gavin Bisesi
|
5fa5c6b760
|
Merge pull request #787 from Cockatrice/woogerboy21-inactiveregcleanup
Cleanup script to delete unactivated user accounts
|
2015-03-06 21:09:20 -05:00 |
|
|
Gavin Bisesi
|
a984a9ea69
|
Merge pull request #773 from ctrlaltca/fix_754
Clamp the zoneviewwidget's topleft point to the scene view area; fix #754
|
2015-02-22 06:16:39 -05:00 |
|
|
Gavin Bisesi
|
06e5327595
|
Merge pull request #748 from kaiserfro/jo-full-word-card-color-filter
Add full and short name for card color filters.
|
2015-02-19 20:44:29 -05:00 |
|
|
Gavin Bisesi
|
648c5c488b
|
Merge pull request #751 from ctrlaltca/img_loading
Avoid loading the same card's picture twice; Fix #745
|
2015-02-19 20:44:00 -05:00 |
|
|
Gavin Bisesi
|
9d9ffd8a9a
|
Merge pull request #760 from poixen/updated_spec_svg
Updated spectator eye image
|
2015-02-19 20:43:50 -05:00 |
|
|
Gavin Bisesi
|
1c724e6fb1
|
Merge pull request #761 from poixen/updated_icon_player
Updated player fighting svg
|
2015-02-19 20:42:35 -05:00 |
|
|
Gavin Bisesi
|
98bf17bb9f
|
Merge pull request #755 from ctrlaltca/qt5_minversion
When compiling with qt5, require at least version 5.0.3, fix #741
|
2015-02-19 09:26:40 -05:00 |
|
|
Gavin Bisesi
|
62e0bc9bb1
|
Merge pull request #707 from ctrlaltca/servatrice_locking
Improvement to servatrice database interface
|
2015-02-18 13:16:48 -05:00 |
|
|
Gavin Bisesi
|
ef654341fa
|
Merge pull request #733 from poixen/alert_icon
New logo for changed tab
|
2015-02-14 17:18:10 -05:00 |
|
|
Gavin Bisesi
|
126c64d5f9
|
Merge pull request #735 from kaiserfro/jo-ctrl-add-to-selection
ctrl-click to add a card to a selection.
|
2015-02-14 08:10:15 -05:00 |
|
|
Gavin Bisesi
|
96af5bd09c
|
Merge pull request #726 from kaiserfro/jo-add-play-face-down-menu-item
Add a play face down context menu item when in the hand zone.
|
2015-02-14 08:09:44 -05:00 |
|
|
Gavin Bisesi
|
e0450d45c2
|
Merge pull request #732 from poixen/hq_images_default
Increased default pixmap cache
|
2015-02-13 20:12:03 -05:00 |
|
|
Gavin Bisesi
|
12fe0f5380
|
Merge pull request #727 from poixen/pm_macro
Added modifier key to quick PM
|
2015-02-11 22:19:09 -05:00 |
|
|
Gavin Bisesi
|
df911338df
|
Merge pull request #729 from poixen/hq_images_default
Set to download HQ images by default
|
2015-02-11 22:17:07 -05:00 |
|
|
Gavin Bisesi
|
59f5554d9d
|
Merge pull request #728 from tooomm/readme-translation2
more Translation Status Updates
|
2015-02-11 14:42:12 -05:00 |
|
|
Gavin Bisesi
|
dcc6c18965
|
Merge pull request #723 from tooomm/readme-translation
Translation Status Updates in Readme.md
|
2015-02-10 18:59:40 -05:00 |
|
|
Gavin Bisesi
|
b5a8f5a925
|
Merge pull request #717 from poixen/new_pawns
Refreshed the look of the default pawns
|
2015-02-10 09:33:24 -05:00 |
|
|
Gavin Bisesi
|
a5a5031679
|
Add translation status to readme
|
2015-02-10 09:17:53 -05:00 |
|
|
Gavin Bisesi
|
5f3f767178
|
Merge pull request #710 from ctrlaltca/pvt_filters
Disable filters in "show user's games" dialog
|
2015-02-08 17:28:18 -05:00 |
|
|
Gavin Bisesi
|
43a9ac61fb
|
Merge pull request #702 from ctrlaltca/osx_menubar
Osx menubar improvements; fix #659
|
2015-02-08 15:05:35 -05:00 |
|
|
Gavin Bisesi
|
adb259fdd6
|
Merge pull request #695 from Cockatrice/show-password-games-by-default
Show password games by default
|
2015-02-05 22:04:33 -05:00 |
|
|
Gavin Bisesi
|
f8bb295eef
|
Merge pull request #694 from ZeldaZach/flag_fix
Remove Blank Flag Notation
|
2015-02-05 19:39:49 -05:00 |
|
|
Gavin Bisesi
|
78aa291734
|
Merge pull request #687 from poixen/base_mention_color
Changed default mention/username color
|
2015-02-04 19:10:10 -05:00 |
|
|
Gavin Bisesi
|
6d499bdad2
|
Merge pull request #685 from poixen/mentions_in_om
Added click mentions to PMs
|
2015-02-04 18:18:08 -05:00 |
|
|
Gavin Bisesi
|
37a05eb731
|
Merge pull request #671 from kaiserfro/jo-reduce-whitespace-from-game-description
Reduce the game descriptions whitespace.
|
2015-02-04 10:18:23 -05:00 |
|
|
Gavin Bisesi
|
cb50fd0e2c
|
Merge pull request #679 from poixen/deckEditorButtons
Updated deck editor buttons
|
2015-02-03 18:00:13 -05:00 |
|
|
Gavin Bisesi
|
25cc695190
|
Merge pull request #672 from ctrlaltca/deckstats
Fixed "analyze on deckstats"; Fix #662
|
2015-02-03 10:30:28 -05:00 |
|
|
Gavin Bisesi
|
e7198edfc7
|
Merge pull request #676 from poixen/focus_chat
Chat has focus when starting game
|
2015-02-03 09:15:25 -05:00 |
|
|
Gavin Bisesi
|
eeed03b101
|
Merge pull request #656 from poixen/view_size_fix
Fixed pile view bug
|
2015-02-01 10:35:02 -05:00 |
|
|
Gavin Bisesi
|
6d4716b38f
|
Merge pull request #648 from poixen/menu_sep
Added separator
|
2015-01-30 10:07:00 -05:00 |
|
|
Gavin Bisesi
|
a8fcd9ec26
|
Merge pull request #623 from Cockatrice/country-code
Add country code to user info box.
|
2015-01-29 20:27:19 -05:00 |
|
|
Gavin Bisesi
|
8d0a5cf86a
|
Merge pull request #639 from tooomm/installer-add-oracle-text
add oracle name at the end of installer
|
2015-01-29 17:41:49 -05:00 |
|
|
Gavin Bisesi
|
fe7b976b79
|
Merge pull request #638 from Cockatrice/search-by-cmc
Search by cmc
|
2015-01-29 17:35:52 -05:00 |
|
|
Gavin Bisesi
|
dd426cbac9
|
Merge pull request #634 from Cockatrice/oracle-cmc
Parse cmc from json and store in cards.xml
|
2015-01-29 05:48:32 -05:00 |
|
|
Gavin Bisesi
|
971c7bce53
|
Merge pull request #636 from poixen/chat_mention_alert
Taskbar attention when mentioned
|
2015-01-29 05:46:44 -05:00 |
|
|
Gavin Bisesi
|
739ca6a02e
|
Merge pull request #607 from poixen/osx_fix
Refactor pileview sorting code
|
2015-01-27 20:10:54 -05:00 |
|
|
Gavin Bisesi
|
8be659ba47
|
Merge pull request #616 from ideocl4st/korean-translation-150128
Updated Korean Translation
|
2015-01-27 13:17:04 -05:00 |
|
|
Gavin Bisesi
|
c20b1747bd
|
Merge pull request #615 from ideocl4st/249-country-flags-svg
New flag images for 249 countries with ISO 3166 codes
|
2015-01-27 12:24:04 -05:00 |
|
|
Gavin Bisesi
|
93cf7dbaaf
|
Merge pull request #609 from poixen/chat_mention_fixes
Chat mention fixes
|
2015-01-27 06:30:20 -05:00 |
|
|
Gavin Bisesi
|
aa1814ef8f
|
Merge pull request #610 from Cockatrice/oracle-save-location
Inform user of cards.xml save location on success
|
2015-01-26 20:33:42 -05:00 |
|
|
Gavin Bisesi
|
62c4c0f4eb
|
Merge pull request #597 from ideocl4st/tweak-hand-context-menu
Submenus for moving all cards in a zone to another
|
2015-01-26 20:33:17 -05:00 |
|
|
Gavin Bisesi
|
f51e558e57
|
Merge pull request #605 from ZeldaZach/more_flags_time
Additional Flags
|
2015-01-26 15:21:25 -05:00 |
|
|
Gavin Bisesi
|
486690408d
|
Merge pull request #602 from tooomm/oracle-add-default-selection-info
Added text line about default sets selection in Oracle
|
2015-01-26 13:06:38 -05:00 |
|
|
Gavin Bisesi
|
ceead6b9e3
|
Merge pull request #593 from poixen/other_user_mention_option
Removed other user mention BG
|
2015-01-26 07:18:24 -05:00 |
|
|
Gavin Bisesi
|
c328f28cde
|
Merge pull request #600 from tooomm/readme-tweaks
2 changes
|
2015-01-25 15:33:00 -05:00 |
|
|
Gavin Bisesi
|
ffb5ac6b9a
|
Merge pull request #599 from poixen/removed_unused_connect
Removed a connection
|
2015-01-25 15:31:26 -05:00 |
|
|
Gavin Bisesi
|
2a6291dcde
|
Merge pull request #592 from poixen/tap_animation
Faster tapping speed
|
2015-01-24 21:21:31 -05:00 |
|
|
Gavin Bisesi
|
11bb32606b
|
Merge pull request #579 from tooomm/readme-fixed-url
fixed wooger link not working
|
2015-01-22 08:10:00 -05:00 |
|
|
Gavin Bisesi
|
8069eceea1
|
Merge pull request #572 from ideocl4st/korean-translation
Updated Korean Translation
|
2015-01-21 07:45:12 -05:00 |
|
|
Gavin Bisesi
|
d83987b2b7
|
Merge pull request #570 from poixen/move_ignore_users
Moved "Ignore messages from unregistered users"
|
2015-01-20 14:14:30 -05:00 |
|
|
Gavin Bisesi
|
6dfaa81a53
|
Merge pull request #561 from poixen/chatnamehighlight
Username block highlighting
|
2015-01-20 12:35:41 -05:00 |
|
|
Gavin Bisesi
|
fa8bcccaaa
|
Merge pull request #549 from poixen/cardviewlist
Sortable card views can now be split into pile types
|
2015-01-20 12:15:19 -05:00 |
|
|
Gavin Bisesi
|
8d768089de
|
Merge pull request #565 from ctrlaltca/deck_schema
Added xdd schema for "cod" decks; fix #545
|
2015-01-20 11:44:12 -05:00 |
|
|
Gavin Bisesi
|
931b420323
|
Merge pull request #556 from poixen/settings_dlg_refactorings
Refactored Settings Tab
|
2015-01-20 11:39:25 -05:00 |
|
|
Gavin Bisesi
|
10aa137475
|
Merge pull request #562 from poixen/chat_click_mentions
Click tag mentions
|
2015-01-20 10:06:04 -05:00 |
|
|
Gavin Bisesi
|
fe53d6d6cd
|
Merge pull request #567 from poixen/chat_cog
Added "Chat settings..." shortcut to chat cog
|
2015-01-20 10:01:05 -05:00 |
|
|
Gavin Bisesi
|
7ef5f2d3a4
|
Merge pull request #558 from ctrlaltca/memory_limit
Limit pixmap cache size to 2047MB; fix #555
|
2015-01-16 12:09:00 -05:00 |
|
|
Gavin Bisesi
|
8e396cadc2
|
Merge pull request #554 from poixen/chatsettingstab
Updated chat setting tab
|
2015-01-15 08:39:30 -05:00 |
|
|
Gavin Bisesi
|
d3a7320ce2
|
Readme links to install instructions wiki page
|
2015-01-14 17:00:05 -05:00 |
|
|
Gavin Bisesi
|
06ac74ec6b
|
Merge pull request #546 from ideocl4st/master
Added Korean flag and newly added strings' translations
|
2015-01-14 14:29:39 -05:00 |
|
|
Gavin Bisesi
|
ce2520d74f
|
Merge pull request #538 from poixen/settingscleanup
Realigned Icons
|
2015-01-14 07:38:23 -05:00 |
|
|
Gavin Bisesi
|
2ae9cd2c37
|
Merge pull request #543 from poixen/clearchat
Clear chat
|
2015-01-12 21:15:55 -05:00 |
|
|
Gavin Bisesi
|
69e6aa355f
|
Merge pull request #534 from poixen/accountage
Added account age to user info window
|
2015-01-11 21:37:07 -05:00 |
|
|
Gavin Bisesi
|
761d549f9a
|
Merge pull request #519 from ctrlaltca/message_log
Message log
|
2015-01-07 15:43:54 -05:00 |
|
|
Gavin Bisesi
|
37a4c0d0e6
|
Merge pull request #531 from mcallahan/resizing2
Resize player names in playerlistwidget properly.
|
2015-01-07 15:42:03 -05:00 |
|
|
Gavin Bisesi
|
621d33638f
|
Merge pull request #498 from ctrlaltca/pixmap_memory_2nd_attempt
Pixmap memory, 2nd attempt
|
2015-01-07 15:41:20 -05:00 |
|
|
Gavin Bisesi
|
c98a146746
|
Merge pull request #520 from mcallahan/always-reveal-top-master-master
Reset Always reveal top card when starting a new game.
|
2015-01-05 16:36:07 -05:00 |
|
|
Gavin Bisesi
|
fba60c20c0
|
Merge pull request #523 from kaiserfro/apply-filters-at-start2
Apply filters at start
|
2015-01-05 11:26:54 -05:00 |
|
|
Gavin Bisesi
|
094d6b6422
|
Merge pull request #527 from poixen/chattime
Added timestamps to in game chat
|
2015-01-05 11:22:32 -05:00 |
|
|
Gavin Bisesi
|
7476667b69
|
Merge pull request #524 from ideocl4st/korean-translation
Fixed a non-standard word in Korean Translation
|
2015-01-04 08:45:20 -05:00 |
|