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,678 Commits 53 Branches 176 Tags
1811bad835f46eb65f73fec785e10bc20e89c72d
Commit Graph
3678 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
tooommandGitHub 2fb2481211 updated badges 2017-05-07 12:45:53 +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
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
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
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
ctrlaltcaandGitHub 29904c49da Specify reason when on game leave; fix #2624 (#2633) 
* fix #2624

* feedback++
 2017-04-24 22:20:08 +02:00
Fabio Bas 38ad71b06a fix ox compilation 2017-04-24 21:59:09 +02:00
Fabio Bas 7f057612bf possibily fix osx shortcut problem 2017-04-24 20:39:11 +02:00
ctrlaltcaandGitHub 9d2494e6e2 Update README.md adding link to guidelines; fix #2627 (#2635) 2017-04-24 15:52:30 +02:00
tritochandZach H 23d27cff77 Handle 'aftermath' cards like 'split' cards (#2626) 2017-04-22 14:36:22 -04:00
Zach Handctrlaltca 176ea444ba revert clear focus (#2619) 2017-04-21 17:52:14 +02:00
ctrlaltcaandGitHub 3e12a5f67f Update CONTRIBUTING.md (#2613) 
* Update CONTRIBUTING.md

* Update CONTRIBUTING.md

"wait for CI upload" should be "wait for CI to upload"
"update again the version number" should be "update the version number again"
 2017-04-21 14:26:55 +02:00
ctrlaltcaandGitHub 3356b2ede7 Change version in about window and installer name (#2570) 
* Change version in about window and installer name

* Change version in about window and installer name

* Cmake get version updates

* dev snapshot format changed

* alignment changes
 2017-04-20 13:41:18 +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
skwerlmanandZach H dd36187864 fix header markdown in TODO.md (#2592) 2017-04-16 21:38:55 -04:00
Zach HandGitHub dc6c375220 clear focus when changing phases (#2583) 2017-04-15-Release-2.3.16 2017-04-15 14:37:01 -04:00
tritochandZach H 2e9a0bdd4d Fix Pre-release / Dev build link (#2584) 2017-04-11 18:06:13 -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