gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-30 23:50:19 -07:00
Code Issues Packages Projects Releases Wiki Activity
3,209 Commits 53 Branches 176 Tags
f568a4e865beed1b68ae64aa6e124fd19734ebf6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ctrlaltca c917a6c272 Merge pull request #1722 from ctrlaltca/rev-related 
Implement reverse-related tag for cards
 2015-12-27 18:44:05 +01:00
ctrlaltca 04797eaf48 Merge pull request #1724 from ctrlaltca/windows_merda 
Fix win32 package creation
 2015-12-27 18:04:10 +01:00
Fabio Bas 49b22b7d2f Try to fix package creation 2015-12-27 16:03:32 +01:00
Fabio Bas 4b1c59424e Implement reverse-related tag for cards 2015-12-26 19:57:20 +01:00
ctrlaltca f03051b6cf Merge pull request #1642 from ctrlaltca/dont_merge_this_yet 
Split PictureLoader out of CardDatabase
 2015-12-26 17:13:21 +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
ctrlaltca aebc18fc3f Merge pull request #1717 from ctrlaltca/fix_1716 
Possibly fix server crash #1716
 2015-12-26 16:24:10 +01:00
ctrlaltca 4e17014ebf Merge pull request #1714 from ctrlaltca/fix_1598 
Possible fix for server crash
 2015-12-20 14:45:06 +01:00
Fabio Bas 81cad7cefd Possibly fix #1716 2015-12-20 14:38:27 +01:00
ctrlaltca 0e1c26a071 Merge pull request #1715 from ctrlaltca/pr_1668 
Add gear icon to settings menu entry
 2015-12-19 14:21:32 +01:00
Fabio Bas 696ae7e85f Add gear icon to settings menu entry 2015-12-19 11:48:54 +01:00
Fabio Bas 25d77fb64a Possibly fix #1598 2015-12-15 16:58:44 +01:00
ctrlaltca 7e6972a358 Merge pull request #1713 from ctrlaltca/translations 
Small typos + reextracted strings
 2015-12-15 16:32:16 +01:00
Fabio Bas 5093ea4170 Small typos + reextracted strings 2015-12-15 16:31:58 +01:00
ctrlaltca f5749886ee Merge pull request #1712 from ctrlaltca/translations 
Extracted new translation strings
 2015-12-15 15:59:39 +01:00
Fabio Bas 2712dd4248 Extracted new translation strings 2015-12-15 15:59:20 +01:00
ctrlaltca ade0a4b7e2 Merge pull request #1708 from ctrlaltca/appveyor_deploy 
Deploy from Appveyor to Bintray
 2015-12-14 16:29:36 +01:00
Fabio Bas 5636b43e67 Test appveyor deploy 2015-12-14 15:06:16 +01:00
ctrlaltca db8548521c Merge pull request #1707 from ctrlaltca/fix_1703 
Add correct encrypted api key to deploy to bintray
 2015-12-14 09:53:21 +01:00
Fabio Bas 1a6a1171e6 Add bintray badges 2015-12-14 09:47:03 +01:00
Fabio Bas a637ff7cfa Add correct encrypted api key to deploy to bintray 2015-12-14 09:32:31 +01:00
ctrlaltca 0e229ad1fd Merge pull request #1705 from ctrlaltca/fix_1683 
Add .txt to the common deck file types
 2015-12-13 12:10:15 +01:00
Fabio Bas ed4149fa7b Add .txt to the common deck file types 
fix #1683
 2015-12-13 12:00:39 +01:00
ctrlaltca ea7db15597 Merge pull request #1704 from ctrlaltca/fix_1670 
Whoops: Fix db schema number
 2015-12-13 11:54:07 +01:00
Fabio Bas 53191fcb99 Whoops: Fix db schema number 2015-12-13 11:53:30 +01:00
ctrlaltca ce6c97bcef Merge pull request #1670 from jedinerd/sql_fix_for_token_disabled_option 
Having token set to not null breaks the use of requireemail=false
 2015-12-13 11:46:23 +01:00
ctrlaltca a17c300a41 Merge pull request #1688 from Cockatrice/check-schema-ver 
Add script to validate schema changes.
 2015-12-13 11:04:02 +01:00
Fabio Bas 93566840b9 install bc package on linux for the check_schema_version script 2015-12-13 10:48:45 +01:00
ctrlaltca 586d580864 Merge pull request #1650 from ctrlaltca/test_travis_deploy 
Travis updates
 2015-12-13 10:39:10 +01:00
ctrlaltca 8167448284 Merge pull request #1654 from ctrlaltca/facedown 
Server-size fixes for card stacking
 2015-12-13 10:37:47 +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
ctrlaltca 7e63f44c04 Merge pull request #1700 from ctrlaltca/fix_1675 
Avoid crash on dereferencing null pointer
 2015-12-12 09:14:24 +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
ctrlaltca 0286cd3df0 Merge pull request #1697 from ctrlaltca/fix_1695 
Fix velvet marble theme
 2015-12-11 17:55:13 +01:00
Fabio Bas 91bb2b2954 Fix velvet marble theme 
fix #1695
 2015-12-11 16:34:46 +01:00
Fabio Bas ea5666c443 fix #1652 ; fix #467 2015-10-20 19:29:04 +02:00
Fabio Bas fc8aa32d7f Bintray package updates 2015-10-19 22:09:24 +02:00
Fabio Bas 8001b05ce7 Travis - deploy to bintray 2015-10-18 16:58:07 +02:00
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 8f674bd18c Updated to qt 5.4.2 2015-10-14 18:45:10 +02:00
Fabio Bas 4dba476ab6 modernize bash dialect 2015-10-14 15:45:54 +02:00
Fabio Bas bab4a51ebb CPack: Debian package 2015-10-13 22:16:00 +02:00
ctrlaltca 0c67cb6cb3 Merge pull request #1641 from ctrlaltca/pr_1600 
CMake: Add "test" target
 2015-10-09 18:53:01 +02:00
Fabio Bas 5fed8d04d6 Updated docs 2015-10-09 18:51:30 +02:00
Fabio Bas b63475829b Revert option from WITH_TESTS to TEST 2015-10-09 15:47:34 +02:00
Fabio Bas 7fe60279de Fix PR #1600 2015-10-09 14:59:42 +02:00
Fabio Bas 784148e158 try fixing appveyor 
dropping jom and using plain nmake
 2015-10-02 18:14:54 +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
ctrlaltca 9d4882415a Merge pull request #1618 from ctrlaltca/fix_artifacts 
Appveyor: fix artifact names
 2015-10-01 15:08:45 +02:00
Fabio Bas 3e9610a084 Fix artifact names 2015-10-01 10:14:50 +02:00
ctrlaltca 6a869906d9 Merge pull request #1589 from ctrlaltca/appveyor 
Added appveyor script
 2015-09-30 09:46:35 +02:00
Fabio Bas 35815a894a Make travis build a package 2015-09-29 23:38:30 +02:00
Fabio Bas a9f2cd73de Fix volume control 
fix #1528
 2015-09-28 12:24:22 +02:00
Fabio Bas 8e348455f9 Added appveyor script 2015-09-27 10:36:53 +02: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
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
Fabio Bas 2df50f5766 Removed unused sound names 2015-09-20 12:08:55 +02:00
Fabio Bas 2a20b6028e Changed problematic shortcuts 2015-09-18 08:38:54 +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
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
Fabio Bas f78c01fa88 Avoid multiple sounds playing at the same time 2015-09-13 17:22:58 +02: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
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
ctrlaltca c984a7c962 Merge pull request #1488 from ctrlaltca/translations 
Translations update
 2015-09-08 19:25:34 +02:00
Fabio Bas fcc5370082 Fetched new translations 2015-09-08 19:12:41 +02:00
Fabio Bas 5951c95e81 extracted new translatable strings 2015-09-08 19:10:57 +02:00
Fabio Bas c214234bb2 fix typo 2015-09-08 19:08:34 +02:00
Fabio Bas 09b926a7ac Added transifex cli configuration 2015-09-08 19:08:04 +02: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
Fabio Bas e50d0c6db2 get cardback image from theme 2015-09-06 11:44:19 +02:00
ctrlaltca 0a9057d1b8 Merge pull request #1451 from ctrlaltca/fix_1449 
Let git track the empty dir "themes/Default"
 2015-09-01 10:29:35 +02:00
Fabio Bas d9ecb5db8b Let git track this empty dir 2015-09-01 08:57:30 +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