Merge branch 'master' into server

gframe/deck_con.cpp

@@ -144,8 +144,8 @@ inline void ShowBigCard(int code, float zoom) {
 inline void ZoomBigCard(s32 centerx = -1, s32 centery = -1) {
 	if(mainGame->deckBuilder.bigcard_zoom >= 4)
 		mainGame->deckBuilder.bigcard_zoom = 4;
-	if(mainGame->deckBuilder.bigcard_zoom <= 0.2)
-		mainGame->deckBuilder.bigcard_zoom = 0.2;
+	if(mainGame->deckBuilder.bigcard_zoom <= 0.2f)
+		mainGame->deckBuilder.bigcard_zoom = 0.2f;
 	ITexture* img = imageManager.GetBigPicture(mainGame->deckBuilder.bigcard_code, mainGame->deckBuilder.bigcard_zoom);
 	mainGame->imgBigCard->setImage(img);
 	auto size = img->getSize();
@@ -810,12 +810,12 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				break;
 			}
 			case BUTTON_BIG_CARD_ZOOM_IN: {
-				bigcard_zoom += 0.2;
+				bigcard_zoom += 0.2f;
 				ZoomBigCard();
 				break;
 			}
 			case BUTTON_BIG_CARD_ZOOM_OUT: {
-				bigcard_zoom -= 0.2;
+				bigcard_zoom -= 0.2f;
 				ZoomBigCard();
 				break;
 			}

ocgcore @ 02547161

-Subproject commit 6cfabcaed2fa4743c0197085ae710627ad9131dd
+Subproject commit 025471613b00c46df9a1bf686e25197ec24e5450

script @ ef626d74

-Subproject commit a12f29bf382defb21043e2b8de967f867477192b
+Subproject commit ef626d741fd328abf5b8c67be3cedcc9a72febab

strings.conf

@@ -635,6 +635,7 @@
 !counter 0x58 指示物（祢须三破鸣比）
 !counter 0x59 落魂指示物
 !counter 0x5a 指示物（岩战之试炼）
+!counter 0x5b 指示物（北极天熊北斗星）
 #setnames, using tab for comment
 !setname 0x1 正义盟军	A・O・J
 !setname 0x2 次世代	ジェネクス
@@ -1095,3 +1096,6 @@
 !setname 0x15e 降阶魔法	RDM
 !setname 0x15f 岩战	War Rock
 !setname 0x160 源质兽	Materiactor
+!setname 0x161 溟界
+!setname 0x162 七音服	ドレミコード
+!setname 0x163 北极天熊	ベアルクティ