Skip to content
This repository has been archived by the owner on Nov 20, 2021. It is now read-only.

Commit

Permalink
iron bar,pause screen
Browse files Browse the repository at this point in the history
  • Loading branch information
McbeEringi committed Jul 22, 2021
1 parent 8cd55c4 commit af9f83c
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 14 deletions.
3 changes: 2 additions & 1 deletion ESBE_3G/shaders/glsl/terrain.vsh
Expand Up @@ -99,9 +99,10 @@ float nether=
POS4 pos=WORLDVIEW*worldPos;
pos=PROJ*pos;
#ifdef ALPHA_TEST
vec2 hgd=abs(fract(frp.xz*16.)-.5);
if((max(max(color.r,color.g),color.b)-min(min(color.r,color.g),color.b)>.01&&frp.y!=.015625)||
(frp.y==.9375&&(frp.x==0.||frp.z==0.))||
((frp.y==0.||frp.y>.6)&&(fract(frp.x*16.)!=0. && fract(frp.z*16.)!=0.)))pos.x+=wav*.016*rand*sun*PROJ[0].x;
((frp.y==0.||frp.y>.6)&&hgd.x<.48&&hgd.y<.48))pos.x+=wav*.016*rand*sun*PROJ[0].x;
#endif
#endif
gl_Position=pos;
Expand Down
8 changes: 4 additions & 4 deletions ESBE_3G/texts/en_US.lang
Expand Up @@ -3,7 +3,7 @@ esbe.c0=Added shading for entity
esbe.c1=Added shading for sun & moon(auto switch to texture mode)
esbe.c2=Added wet effect
esbe.c3=Improved clouds when its rain
esbe.c4=Improved reflection on water
esbe.c5=Fixed noise issue on water surface
esbe.c6=Fixed bug that A10 device not shows water surface
esbe.c7=Fixed bug that candle waving
esbe.c4=Fixed noise issue and improved reflection on water surface
esbe.c5=Fixed bug that A10 device not shows water surface
esbe.c6=Fixed bug that candle and iron bars waving
esbe.c7=UI tweaks
8 changes: 4 additions & 4 deletions ESBE_3G/texts/ja_JP.lang
Expand Up @@ -2,7 +2,7 @@ esbe.c0=エンティティのシェーディングの追加
esbe.c1=太陽及び月のシェーディングの追加(テクスチャ自動切り替え)
esbe.c2=雨天時の地面のエフェクトの追加
esbe.c3=雨天時の雲の描写の改良
esbe.c4=水面の反射の改良
esbe.c5=水面にノイズが出る問題の修正
esbe.c6=水面がA10デバイスで表示されない問題の修正
esbe.c7=蝋燭が揺れる問題の修正
esbe.c4=水面にノイズが出る問題の修正及び反射の改良
esbe.c5=水面がA10デバイスで表示されない問題の修正
esbe.c6=蝋燭と鉄格子が揺れる問題の修正
esbe.c7=UIの調整
1 change: 1 addition & 0 deletions ESBE_3G/ui/pause_screen.json
@@ -0,0 +1 @@
{"namespace":"pause","skin_panel_interior":{"modifications":[{"array_name":"controls","operation":"insert_back","value":[{"c":{"type":"panel","size":["100%","100%c"],"controls":[{"esbe@start.esbe_btn":{}}]}}]}]}}
9 changes: 4 additions & 5 deletions ESBE_3G/ui/start_screen.json
@@ -1,6 +1,5 @@
{
"namespace":"start",

"esbe_panel":{
"type":"stack_panel","orientation":"vertical",
"controls":[
Expand All @@ -9,9 +8,9 @@
{"4":{"type":"label","text":"esbe.c4"}},{"5":{"type":"label","text":"esbe.c5"}},{"6":{"type":"label","text":"esbe.c6"}},{"7":{"type":"label","text":"esbe.c7"}}
]
},
"esbe_scroll@common.scrolling_panel":{"$show_background":false,"$scrolling_content":"start.esbe_panel"},"esbe_fsc@common.fullscreen_header":{"$back_button_has_title":true,"$button_text":"ESBE info","$child_control":"start.esbe_scroll"},
"esbe_scr@common.scrolling_panel":{"$show_background":false,"$scrolling_content":"start.esbe_panel"},"esbe_fsc@common.fullscreen_header":{"$back_button_has_title":true,"$button_text":"ESBE info","$child_control":"start.esbe_scr"},
"esbe_main@common.base_screen":{"button_mappings":[{"from_button_id":"button.menu_cancel","to_button_id":"button.menu_exit","mapping_type":"global"}],"$screen_bg_content":"persona.persona_screen_background_content","$screen_content":"start.esbe_fsc"},

"esbe_start":{"type":"image","texture":"button","size":[43,16]},
"copyright@common_buttons.light_content_button":{"anchor_from":"bottom_left","anchor_to":"bottom_left","size":[49,22],"$pressed_button_name":"button.menu_buy_game","$button_content":"start.esbe_start","$default_button_alpha":0.5,"$default_hover_alpha":0.5}
"esbe_img":{"type":"image","texture":"button","size":[43,16]},
"esbe_btn@common_buttons.light_content_button":{"size":[49,22],"$pressed_button_name":"button.menu_buy_game","$button_content":"start.esbe_img","$default_button_alpha":0.5,"$default_hover_alpha":0.5},
"copyright@start.esbe_btn":{"anchor_from":"bottom_left","anchor_to":"bottom_left"}
}

0 comments on commit af9f83c

Please sign in to comment.