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,993 Commits 53 Branches 176 Tags
0dcf97d29d272b5cfd13f55ea1d9bbaa794be806
Commit Graph
3993 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
skwerlmanandctrlaltca b47e262e7f limit gitlab builds to master (#2711) 2017-05-10 08:53:11 +02:00
woogerboy21andGitHub 1811bad835 Fix room chat history (#2698) 
Looks like an addition to the table shifted things.  We probably  should look into some how use the actual column names (if it can be done).  But for now this should fix the server room chat history.
 2017-05-09 23:22:48 -04:00
tooommandGitHub 41ebf7a9ad space 2017-05-09 12:47:19 +02:00
tooommandGitHub 7f01f921f7 added dl count for latest release 2017-05-09 12:46:41 +02: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
tooommandGitHub 256e40a9ee Merge branch 'master' into tooomm-dl_badges 2017-05-08 10:05:24 +02: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
tooommandGitHub 2fb2481211 updated badges 2017-05-07 12:45:53 +02:00
tooommandGitHub d585b9f1d6 http --> https 2017-05-06 21:47:22 +02: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
tooommandGitHub 5b07f6d6d8 bump version number 2017-05-06 18:21:31 +02:00
tooommandGitHub 39779be7bb add alltime dl count 2017-05-06 16:03:27 +02:00
tooommandGitHub 70f1c97a27 github dl badges 2017-05-06 15:46:11 +02:00
Zach HandGitHub a49373eded Merge pull request #2686 from backendr/log_changes 
Log Colors
 2017-05-05 21:48:02 -04:00
backendr 55dcf4a845 Log refresh 2017-05-06 00:40:41 +02:00
backendr b140721d50 Add flag for checking inital server message 2017-05-06 00:18:49 +02:00
Zach HandGitHub c96f234b6d Merge pull request #2683 from ctrlaltca/fix_2682 
Remove unneeded debug
2017-05-05-Release-2.3.17 		2017-05-05 13:42:02 -04:00
Fabio Bas a4e78bbfa2 remove debug 2017-05-05 15:23:59 +02: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
Fabio BasandZach H 36f6907fa3 Improved token loading 2017-05-04 23:28:51 -04:00
tooommandGitHub 339945e089 fix custom build + displaying name (#2668) 
* fix custom build name

* remove html and argument from tr()
 2017-04-30 16:20:29 +02:00
tooommandGitHub faeb3f8daf fix 2017-04-30 15:17:03 +02:00
tooommandGitHub e04010f00b further tweaks and uniform style 2017-04-30 15:06:32 +02:00
tooommandZach H cbd9d2c4fc better wording (#2674) 2017-04-29 22:15:43 -04:00
tooommandZach H fdc82708c6 extend updater description in menu (#2673) 2017-04-29 20:13:33 -04:00
tooommandGitHub 8f7691b47a next round 2017-04-29 22:55:49 +02:00
tooommandGitHub ca2e3e5eab trial_error 2017-04-29 22:45:25 +02:00
tooommandGitHub da42d9e049 fix 2017-04-29 22:32:07 +02:00
tooommandGitHub f18679bfff fix attempt 2017-04-29 22:06:53 +02:00
tooommandGitHub 970b67cdb6 update message rework 2017-04-29 20:57:52 +02:00
ctrlaltcaandGitHub 3c5e38bd14 Hide some icons for spectators; fix #2589 (#2656) 
* fix #2589

* Additional fix
 2017-04-29 15:06:30 +02:00
ctrlaltcaandGitHub b20c60e603 fix #2332 (#2650) 2017-04-29 12:21:37 +02: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
ctrlaltcaandZach H df211748ca Add clear button to deck editor (#2654) 2017-04-26 15:20:35 -04:00
ctrlaltcaandZach H ce77d51a8f Fix crash on logger; make log window modalless (#2659) 2017-04-26 15:05:24 -04:00
tooommandZach H 9dd3a04a08 improve provided info in "edit sets" (#2641) 2017-04-25 15:46:37 -04:00
Zach HandGitHub 62d8f5a039 change cards from sb<->mb with double-click (#2606) 2017-04-25 14:05:25 -04:00
Fabio Bas 2c551bdd35 Revert "fix #2332" 
This reverts commit 0fd77346df.
 2017-04-25 19:35:07 +02:00
Fabio Bas 0fd77346df fix #2332 2017-04-25 18:58:01 +02:00
ctrlaltcaandGitHub a46c7156dd fix_crash (#2649) 2017-04-25 18:13:45 +02:00
ctrlaltcaandZach H 3c54499a40 sort edit sets better (#2648) 2017-04-25 11:40:47 -04:00
ctrlaltcaandZach H 160d66d890 show tokens all sets (#2646) 2017-04-25 11:32:51 -04:00
ctrlaltcaandZach H 3f3839d70a fix deck card backs (#2645) 2017-04-25 11:32:00 -04:00
ctrlaltcaandZach H ab94d2c91d Token Dialog Revamp (#2639) 2017-04-25 00:29:57 -04:00
ctrlaltcaandZach H 8ad448a23c fix #2600 (#2638) 2017-04-25 00:29:32 -04:00
ctrlaltcaandGitHub acb40bc738 Fix #2608; fix #2609; fix #2611 (#2636) 2017-04-24 22:20:44 +02:00
ctrlaltcaandGitHub f2a887a6a4 fix #2623 (#2634) 2017-04-24 22:20:19 +02:00