Merge branch 'master' into another

b4239fc1 · nanahira · 9de65e2a · 22c0da77 · b4239fc1 · b4239fc1
Commit b4239fc1 authored Oct 02, 2019 by nanahira
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 195 additions and 25 deletions

gframe/event_handler.cpp gframe/event_handler.cpp +1 -0

lflist.conf lflist.conf +192 -23

ocgcore ocgcore +1 -1

script script +1 -1

No files found.
--- a/gframe/event_handler.cpp
+++ b/gframe/event_handler.cpp
@@ -2481,6 +2481,7 @@ void ClientField::CancelOrFinish() {
 		if(selected_cards.size() == 0) {
 			if(select_cancelable) {
 				DuelClient::SetResponseI(-1);
+				ShowCancelOrFinishButton(0);
 				if(mainGame->wCardSelect->isVisible())
 					mainGame->HideElement(mainGame->wCardSelect, true);
 				else

--- a/lflist.conf
+++ b/lflist.conf
--- a/ocgcore @ e18df9cd
+++ b/ocgcore @ e18df9cd
-Subproject commit c2ae89c1807d024023fd7108b2e48c60ab9ac2db
+Subproject commit e18df9cd2f2af54026d0a48a607d0db83b54310c
--- a/script @ f6d075ba
+++ b/script @ f6d075ba
-Subproject commit 50aeaa40625f81bae169553ca053ad0f76612235
+Subproject commit f6d075baab757900f16210b77e47149319c4fc4e