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,812 Commits 53 Branches 176 Tags
e127cb74b6d3611a70cb642efc72e1ef0202be17
Commit Graph
94 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Zach HandGitHub fab3d24757 Travis/Appveyor publish to GitHub Releases (#2550) 2017-03-28 13:37:59 -04:00
Zach HandGitHub 87ebea7b0f fix memory leak (#2549) 2017-03-28 13:13:42 -04:00
Zach HandGavin Bisesi 06c3edf4c6 cancel downloads from updater (#2534) 
* cancel downloads from updater - fix #2534

* fix double popup
 2017-03-25 16:35:43 -04:00
Zach HandGitHub b3563a897e Update README.md 
Remove bintray
 2017-03-24 16:40:08 -04:00
Zach H 559d4bd47f use list over vector 2017-03-23 00:45:52 -04:00
Zach HandGitHub 317ac05919 logbuffer crash fix (#2524) 2017-03-22 21:39:16 -04:00
Zach HandGitHub f688c046ab Size constraints for Settings Dialog (#2513) 2017-03-22 21:25:40 -04:00
Zach HandGitHub 141e6df50a Updater dialog changes (#2504) 2017-03-22 21:23:25 -04:00
Zach HandGitHub 85985a9433 Add support for multi-selection in set editor (#2441) 2017-03-22 15:49:38 -04:00
Zach HandGitHub 5ebc9ca360 allow auto connect (#2522) 2017-03-20 18:21:20 -04:00
Zach HandGitHub 4feb43cdcc changes to connection dialog (#2503) 2017-03-19 20:24:58 -04:00
Zach HandGitHub b5b9527c13 Font size defaults (#2521) 2017-03-19 20:20:06 -04:00
Zach HandGitHub a2a7561613 allow max font size to be defined by user (#2488) 2017-03-19 14:13:20 -04:00
Zach HandGitHub 2d401e4aba remove bintray deploy (#2511) 2017-03-19 12:56:16 -04:00
Zach HandGitHub 0da2bdd7aa additional null checks in player, gameselector, remoteclient, log (#2514) 2017-03-19 12:55:55 -04:00
Zach HandGitHub 212a7d00db better null checking decklist (#2510) 2017-03-18 20:56:49 -04:00
Zach HandGitHub 3b2eff2551 file filenames so window updater works (#2500) 
* file filenames so window updater works
 2017-03-18 18:48:40 -04:00
Zach HandGitHub fb194db766 additional null checks & parsing (#2506) 
* additional null checks & parsing
 2017-03-18 18:48:23 -04:00
Zach HandGitHub 127a91147c rename from update to check (#2505) 2017-03-18 18:46:19 -04:00
Zach HandGavin Bisesi 2048aac387 STDout debugging (#2499) 2017-03-17 20:45:13 -04:00
Zach HandGitHub a8a4557738 auto_connect toggle fix (#2485) 2017-03-16 16:59:48 -04:00
Zach HandGitHub a7dbc2e1f6 Fix token window resize (#2480) 2017-03-15 15:53:57 -04:00
Zach HandGavin Bisesi 4cfcca33db Server Connect Remade (#2452) 
* Save multiple server configurations
* Each server has its own password/port storage

Close #2452
 2017-03-14 17:51:51 -04:00
Zach HandGitHub 37b43f9916 make settings size vary based on sizeHint() (#2472) 2017-03-14 17:48:02 -04:00
Zach Handctrlaltca bd850fa3ff create related token if you press the 'Token:' button (#2455) 
* create related token if you press the 'Token:' button

* function set
 2017-03-12 11:51:59 +01:00
Zach HandGitHub b2f2e9db8a make sure xml file is uploaded (#2440) 2017-03-07 12:48:07 -05:00
Zach HandGitHub 638c5e25fa temp fix to downloading folders (#2442) 2017-03-04 22:36:35 -05:00
Zach HandGitHub c850ae98d8 add player numbers to in game (#2435) 2017-03-04 11:03:39 -05:00
Zach HandGitHub 12539026c5 Webtrice set targets (#2439) 2017-03-04 11:03:22 -05:00
Zach HandGitHub 18b8a0ef5c fix folder names (#2432) 2017-03-04 00:49:09 -05:00
Zach HandGitHub 6619612c30 fix buddy checkbox bug (#2434) 2017-03-04 00:48:16 -05:00
Zach HandGitHub b8334d0cd5 fix incorrect pawn icons (#2436) 
* fix incorrect pawn icons
 2017-03-02 22:26:10 -05:00
Zach HandGitHub cf08d1d267 Revert "Condensed Card Counter Context Menu" (#2433) 2017-03-02 17:47:15 -05:00
Zach HandGitHub 2bad56f6b6 removal of p server (#2438) 2017-03-02 16:41:08 -05:00
Zach Handctrlaltca 47cafde521 fix lowercase (#2419) 
* fix lowercase

* fix changes

* fix .desktop

* servatrice .desktop
 2017-02-23 08:53:18 +01:00
Zach Handctrlaltca 172fc79327 fix crash if no trayicon found (#2415) 2017-02-19 14:52:44 +01:00
Zach HandGitHub 3d0600b516 Tokens in sub menu (#2320) 2016-12-17 13:05:29 -05:00
Zach Handctrlaltca 04779c2a77 protobuf warnings fixed (#2313) 2016-12-11 19:22:39 +01:00
Zach Handctrlaltca e0636db60d Recursively search CUSTOM folder for images (i.e. subdirectories) (#2251) 2016-12-08 11:00:44 +01:00
Zach Handctrlaltca 9ebbd0c3ca travis osx 10.10 min (#2252) 2016-10-31 10:45:52 +01:00
Zach HandGitHub 3498b16e01 update wordings (#2246) 2016-10-30 03:54:43 -04:00