Skip to content

Y
ygopro
Commit a60283b2 authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents 5e3edeac 3669fe9f
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 deletions
gframe/game.h
View file @ a60283b2
......@@ -511,6 +511,13 @@ public:
irr::gui::IGUIButton* btnSideSort;
irr::gui::IGUIButton* btnSideReload;
irr::gui::IGUIEditBox* ebDeckname;
irr::gui::IGUIButton* btnRenameDeck;
//deck rename
irr::gui::IGUIWindow* wRenameDeck;
irr::gui::IGUIEditBox* ebREName;
irr::gui::IGUIButton* btnREYes;
irr::gui::IGUIButton* btnRENo;
//
irr::gui::IGUIStaticText* stBanlist;
irr::gui::IGUIStaticText* stDeck;
irr::gui::IGUIStaticText* stCategory;
......@@ -522,12 +529,6 @@ public:
irr::gui::IGUIStaticText* stStar;
irr::gui::IGUIStaticText* stSearch;
irr::gui::IGUIStaticText* stScale;
irr::gui::IGUIButton* btnRenameDeck;
//deck rename
irr::gui::IGUIWindow* wRenameDeck;
irr::gui::IGUIEditBox* ebREName;
irr::gui::IGUIButton* btnREYes;
irr::gui::IGUIButton* btnRENo;
//filter
irr::gui::IGUIStaticText* wFilter;
irr::gui::IGUIScrollBar* scrFilter;
......
ocgcore @ b941bfea
Subproject commit 96821733e00b1dae57a2e60fffa99db84ff311bd
Subproject commit b941bfea3568d46f780d5e3900a09ff0ff5aee50
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment