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
4,162 Commits 53 Branches 176 Tags
ca618c6cc1df4c6ea915301f505d0273d64b4b63
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ZeldaZach 568a4973fa make sh executable 2020-03-19 11:52:09 -04:00
ZeldaZach 71dd6b8a30 Fix missing QDate 
Signed-off-by: ZeldaZach <zahalpern+github@gmail.com>
 2020-03-18 17:57:40 -04:00
ZeldaZach e84409c0cf Translation Updates 2020-03-16 22:01:57 -04:00
Zach HandGitHub 8fb0baa449 Trim tokens as this is our most common issue (#3870) 
Signed-off-by: ZeldaZach <zahalpern+github@gmail.com>
 2019-11-23 14:18:28 -05:00
Zach HandGitHub e690b45f27 Create FUNDING.yml 2019-11-02 23:52:14 -04:00
ZeldaZach 096a472ed0 translations 2019-10-21 19:09:28 -04:00
Zach HandGitHub 53728598fe translation updates (#3804) 2019-08-31 21:36:13 -04:00
Zach HandGitHub 22e2e442f5 updated translations for 2.7.1 (#3750) 2019-06-08 12:38:59 -04:00
Zach HandGitHub 0380de9571 add trans strings for upstream (#3745) 2019-06-04 17:41:58 -04:00
Zach Halpern 81059fa3d8 translations 2019-03-04 01:49:43 -05:00
Zach Halpern 9f856acba0 revert 
Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>
 2019-03-04 01:34:13 -05:00
Zach Halpern 69474bad22 revision version 2019-03-04 01:33:49 -05:00
Zach HandGitHub 754b9bdc5a Won't change if autoconnect enabled (#3602) 
* Only will auto-select RR if autoconnect is not checked off.

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>

* Only will auto-select RR if autoconnect is not checked off.

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>

* On disconnect, un-check autoconnect. Better naming.

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>
 2019-03-03 21:57:48 -05:00
Zach Halpern 18ad3cf4a5 Disable auto connect when updating 2019-03-03 16:14:08 -05:00
Zach Halpern 4427ad1451 Don't use hardcoded index 
Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>
 2019-02-28 00:34:12 -05:00
Zach HandGitHub e77e439c4b Minor cleanup & set RR default for new clients (#3591) 
* Minor cleanup & set RR default for new clients

* Handle case of no entries

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>

* Use RR as default on rebuilds

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>
 2019-02-28 00:10:10 -05:00
Zach Halpern c2150fd9bd Update translations 
Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>
 2019-02-22 16:49:06 -05:00
Zach HandGitHub 294b4332cc zach deployment key (#3575) 2019-02-10 15:57:53 -05:00
Zach HandGitHub 6d6b7b4537 Merge pull request #3574 from Cockatrice/tooomm-patch-2 2019-02-10 14:46:30 -05:00
Zach HandGitHub 78c18b7db6 new translations (#3573) 2019-02-08 21:03:03 -05:00
Zach HandGitHub 5a4f020196 Merge pull request #3550 from ctrlaltca/fix_hghlight 2019-02-03 13:35:30 -05:00
Zach HandGitHub 1ace060e34 zach's turn to run the show (#3521) 2019-01-25 13:36:43 -05:00
Zach HandGitHub 41bfbf2e83 Force Oracle run on new install/update (#3497) 
* Force Oracle run on new install/update

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>

* Add settings option to disable such a check

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>
 2019-01-14 01:11:05 -05:00
Zach HandGitHub b0e643ecc0 Several download URLs have arrived! (#3494) 
* Cockatrice Picture loader uses better defined URLs now
URLs are defined on the Card Management tab
Instead of Primary/Backup, you can now define a list of URLs
List of URLs can be drag/dropped for priority ordering
Oracle now uses scryfallId > mtgjsonUUID for !uuid!

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>

* Simplify to QStringList and remove metacall

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>

* fix issues brought up by Dae. Also fix how the defaults load to account for first time users.

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>

* clangify

* Fix save settings on row moved (#3495)

* merge model fix, and reclangify

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>

* Sources > Resources

Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>
 2019-01-08 15:18:06 -05:00
Zach HandGitHub ab1c4cb1d7 Use scryfall urls (#3474) 2018-12-20 18:49:53 -05:00
Zach Halpern 4616dd47bc preferences sym not dir 2018-12-20 18:26:46 -05:00
Zach HandGitHub 94fe64c6c1 Update translations (#3475) 
Signed-off-by: Zach Halpern <ZaHalpern+github@gmail.com>
 2018-12-20 18:26:00 -05:00
Zach HandGitHub af2bce7141 add token creations from graveyard/exile (#3445) 2018-11-21 03:53:35 -05:00
Zach HandGitHub e341337ce0 Revert "[WIP] Fallback on 404" (#3364) 2018-08-11 09:06:18 -04:00
Zach HandGitHub e09ea1e683 Merge pull request #3363 from andrewzwicky/fallback_on_404 2018-08-11 09:05:21 -04:00
Zach HandGitHub aa308717de translation pulls (#3335) 2018-07-17 20:19:40 -04:00
Zach HandGitHub 3ae363cf4b force 2.6.1 (#3316) 2018-07-02 21:49:24 -04:00
Zach HandGitHub c7072cd543 translations push (#3291) 2018-06-17 18:23:05 -04:00
Zach HandGitHub 5e0bfc3193 translations (#3290) 2018-06-17 18:13:02 -04:00
Zach HandGitHub e147bd6cea add feature list requirement (#3287) 
* add feature list requirement

* version update

* version bump
 2018-06-17 18:06:12 -04:00
Zach HandGitHub 2520d07ef2 log moderation stats in the uptime table (#3215) 2018-05-02 17:31:54 -04:00
Zach HandGitHub 1fbdea0f35 translation updates (#3200) 2018-04-16 02:42:58 -04:00
Zach HandGitHub 61e509585f Server List from JSON (#3165) 2018-04-09 22:38:21 -04:00
Zach HandGitHub ca2e05952e add rooster ranges, remove woogerworks (#3163) 2018-04-03 18:41:10 -04:00
Zach HandGitHub 5859fa2f20 translation updates (#3124) 2018-03-02 16:50:10 -05:00
Zach HandGitHub 66958b5975 clangify only the different files (#3122) 2018-02-28 13:20:53 -05:00
Zach HandGitHub 019295931a Merge pull request #3109 from Vafthrudnir/hotfix/oracle_button_text_correction 2018-02-13 20:50:30 -05:00
Zach HandGitHub 35159ef61a Clang script (#3085) 2018-02-06 08:45:13 -05:00
Zach HandGitHub fcfb2b12b7 remove extra copies (#3081) 2018-02-06 05:06:51 -05:00
Zach Handtooomm b58aa459a4 change file names to end with win32/64 instead of x86/x86_64 (#3079) 2018-02-05 23:39:55 +01:00
Zach HandGitHub 8a8b580501 translations (#3078) 2018-02-05 12:22:49 -05:00
Zach HandGitHub c9525af624 this is backwards (#3077) 2018-02-05 11:39:10 -05:00
Zach HandGitHub 261d3ac591 better null check (#3036) 2018-01-20 14:54:34 -05:00
Zach HandGitHub bc52882ac4 Fix Bad Gameplay (#3034) 2018-01-19 20:34:14 -05:00
Zach HandGitHub d1b95aad16 move to slot (#3032) 2018-01-19 19:04:48 -05:00
Zach HandGitHub 691bf36fbe Disable sideboard button w/o deck (#3025) 2018-01-19 10:50:18 -05:00
Zach HandGitHub 5a823becf1 Contributing Doc Updates (#3009) 2018-01-19 08:38:37 -05:00
Zach HandGitHub feeaba1d62 2.4.1 beta -> 2.5.0 beta (#3024) 
Big changes so we will go to 2.5.0 for next release
 2018-01-18 19:28:51 -05:00
Zach HandGitHub ebec30dd1c Add No annotations export option w/ shortcut (#3013) 2018-01-18 19:25:30 -05:00
Zach HandGitHub 5757d60b1d Smarter Mana Cost sorting & small cleanup (#3008) 2018-01-18 19:25:10 -05:00
Zach HandGitHub 34bec90193 Fix deck loader with spaces (#3007) 2018-01-18 19:23:13 -05:00
Zach HandGitHub dcc632e0d4 Fix a crash (#3011) 2018-01-18 11:53:57 -05:00
Zach Handctrlaltca 7a150c558d Trim all inputs (except password) (#3018) 
* Trim all inputs (except password)

* missed )
 2018-01-17 18:57:13 +01:00
Zach HandGitHub 8825e2932a fix linux crash (#3014) 2018-01-13 04:20:12 -05:00
Zach HandGitHub d19744236e Automatic Spoiler Season (#2991) 
* oracle now can be run in spoiler or normal mode

* tests for travis

* only run on relaunch

* spoilers in client (not oracle now) and tray icon shows when done

* spoiler status will be checked before downloading spoiler file

* only download if they care about spoilers

* reload db on spoiler download

* manual update button, code cleanup, and fix enabling sets when new

* cleanup, nullchecks, and fixes to spoiler

* reload DB even if not in spoiler season; necessary as we have a check elsewhere to prevent the reload if spoiler check happens

* Implement changes from 2991#issuecomment-356169374

* Change implicit nullptrs, alert on file deletion, minor changes

* make reload thread safe and minor changes from 2991#issuecomment-356450302

* Fix locking

* Disable update now button while process running
 2018-01-10 13:27:43 -05:00
Zach HandGitHub 87c978937d replace beta semvar correctly (#2980) 2017-12-28 21:30:17 -05:00
Zach HandGitHub b75882b6b9 Allow non-db cards to be moved around (#2960) 2017-12-18 14:17:54 -05:00
Zach HandGitHub 2abfd3b4a9 Update Rarity Filters & Refactoring (#2962) 2017-12-17 19:42:54 -05:00
Zach HandGitHub 014b9947fe clear search bar if all filters cleared (#2961) 2017-12-17 17:48:57 -05:00
Zach HandGitHub ec4e6d53df allow backspace button to remove a filter (#2959) 2017-12-17 17:39:41 -05:00
Zach HandGitHub 0eae4dbe54 add checkbox option to clear log (#2963) 2017-12-17 17:32:31 -05:00
Zach HandGitHub 297f1f2555 remove untap option, combine w/ tap (#2964) 2017-12-17 17:31:31 -05:00
Zach HandGitHub 96b30da492 fix deckstats.net regex (#2886) 2017-10-04 23:36:42 -04:00
Zach HandGitHub e8dbdc3c6d Add token creation for opponent board items (#2744) 2017-06-28 23:09:10 -04:00
Zach Handctrlaltca 9ddb18a35e Make deck list appear if deck loaded (#2745) 2017-06-12 12:25:52 +02:00
Zach HandGitHub 99e7458f9b make not set to untap normally more distinct (#2746) 2017-06-04 14:02:35 -04:00
Zach HandGitHub 0a57229886 keep client version persistant (#2750) 2017-06-04 13:59:37 -04:00
Zach HandGitHub f3f83882e0 Model col widths off deck editor & disable button if no tokens in deck (#2751) 2017-06-04 13:58:34 -04:00
Zach HandGitHub d970b9e50f fix card not showing correctly in games (#2752) 2017-06-04 13:57:47 -04:00
Zach HandGitHub b0d8a31a2e remove invalid connect (#2753) 2017-06-04 13:57:21 -04:00
Zach HandGitHub b53cd33eed Smarter Clipboard Pasting/Parsing (#2706) 2017-05-14 14:35:40 -04:00
Zach HandGitHub aca6917d42 Merge pull request #2672 from Cockatrice/tooomm-update_msg_rework 
update msg rework
 2017-05-13 16:06:53 -04:00
Zach HandGitHub f00bcc9179 Merge pull request #2691 from Cockatrice/tooomm-dl_badges 
github dl badges in README
 2017-05-10 14:23:33 -04:00
Zach HandGitHub d347e54526 Merge pull request #2688 from backendr/ignore_first_server_message 
Prevent emitting initial server message event
 2017-05-08 19:46:17 -04:00
Zach HandGitHub 5f4490ec4e Merge pull request #2695 from Cockatrice/tooomm-hq_badges 
updated badges (gitter+licence)
 2017-05-07 18:54:45 -04:00
Zach HandGitHub c745f41cb9 Merge pull request #2692 from Cockatrice/tooomm-cmake_2.3.18 
cmake - bump version number
 2017-05-06 12:54:50 -04:00
Zach HandGitHub a49373eded Merge pull request #2686 from backendr/log_changes 
Log Colors
 2017-05-05 21:48:02 -04:00
Zach HandGitHub c96f234b6d Merge pull request #2683 from ctrlaltca/fix_2682 
Remove unneeded debug
 2017-05-05 13:42:02 -04:00
Zach HandGitHub fd3d62284d Merge pull request #2670 from ctrlaltca/load_tokens 
Improved token loading, removed card price code
 2017-05-05 00:24:48 -04:00
Zach H 16bc8b764b remove all of pricing 2017-05-04 23:29:43 -04:00
Zach HandGavin Bisesi 12c9e4b81a allow placement below top X cards (#2666) 
Close #2666
 2017-04-27 20:32:24 -04:00
Zach HandGitHub 7c1a18da5e Add "Random card from graveyard" (#2652) 2017-04-26 18:12:56 -04:00
Zach HandGitHub 62d8f5a039 change cards from sb<->mb with double-click (#2606) 2017-04-25 14:05:25 -04:00
Zach Handctrlaltca 176ea444ba revert clear focus (#2619) 2017-04-21 17:52:14 +02:00
Zach HandGitHub 5f3a3f535a clear focus only if needed (#2604) 2017-04-20 05:21:30 -04:00
Zach HandGitHub e2e9c5ab96 disable join if spec disabled (#2605) 2017-04-20 03:01:28 -04:00
Zach HandGitHub dc6c375220 clear focus when changing phases (#2583) 2017-04-15 14:37:01 -04:00
Zach HandGavin Bisesi 1413337b24 Add CONTRIBUTING note on making prereleases (#2576) 2017-04-07 20:59:06 -04:00
Zach Handctrlaltca 3b7990b569 fix travis build (#2575) 
* fix travis build

* rename dir
 2017-04-07 14:41:33 +02:00
Zach HandGitHub 657e1ac9e6 fix c style casting (#2561) 2017-04-05 15:45:58 -04:00
Zach HandGitHub b3c1a87f60 better bool checking (#2564) 2017-04-01 21:29:23 -04:00
Zach HandGavin Bisesi ef7670a1e6 translation file updates (#2559) 
* translation file updates

* translation updates
 2017-03-31 15:29:43 -04:00
Zach HandGitHub d7e5b29d41 Dev channel to GitHub (#2557) 2017-03-31 14:47:49 -04:00
Zach HandGitHub 51230ade1a correct key (#2553) 2017-03-30 03:35:48 -04:00
Zach HandGitHub 56ec219808 appveyor key change (#2551) 2017-03-28 15:02:34 -04:00