Skip to content

Commit 1569ea7

Browse files
committed
remove rtex fix as its in geode v5 now
1 parent a47bcb8 commit 1569ea7

File tree

10 files changed

+10
-30
lines changed

10 files changed

+10
-30
lines changed

changelog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
- Fixed Input Fields not working with Show Touches enabled
1616
- Fixed Noclip not working in editor
1717
- Fixed Noclip tint overlay not working when shaders are enabled
18+
- Updated button to colour the white circle outline pastel in sync with the icon
19+
- Fixed language select menu scrolling down too far
1820
- Improved Show Hitboxes
1921
-- Uses custom node to draw hitboxes
2022
-- Hitbox outlines now draw inside the bounds of the object
5.67 KB
Loading
3.13 KB
Loading

resources/translations

src/Client/ButtonModule.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ void ButtonModule::onKeybindActivated(KeyState state)
1616

1717
std::string ButtonModule::getNotificationString()
1818
{
19-
return utils::string::replace(LocalisationManager::get()->getLocalisedString("ui/button-pressed"), "%s", getName());
19+
return utils::string::replace(LocalisationManager::get()->getLocalisedString("ui/notification-button-pressed"), "%s", getName());
2020
}

src/GUI/AndroidUI.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ bool AndroidUI::setup()
2020

2121
rt = CCRenderTexture::create(getContentWidth(), getContentHeight(), kCCTexture2DPixelFormat_RGBA8888, GL_DEPTH24_STENCIL8);
2222
rt->getSprite()->setBlendFunc(this->getBlendFunc());
23+
rt->getSprite()->getTexture()->setAntiAliasTexParameters();
2324

2425
drawOpacity = CCLayerColor::create();
2526
drawOpacity->setOpacity(255);
@@ -230,6 +231,7 @@ void AndroidUI::runAnimation(MenuAnimation anim)
230231
m_mainLayer->stopAllActions();
231232
m_mainLayer->setPosition(ccp(winSize.width / 2, winSize.height / 2));
232233
m_mainLayer->setScale(1.0f);
234+
drawOpacity->setOpacity(255);
233235
backBtn->setOpacity(255);
234236
bottomLeft->setOpacity(150);
235237
bottomRight->setOpacity(150);

src/GUI/BoundingBoxClipNode.cpp

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,4 @@ void BoundingBoxClipNode::visit()
2929
CCNode::visit();
3030

3131
glDisable(0xc11);
32-
}
33-
34-
#ifdef GEODE_IS_WINDOWS
35-
36-
class $modify (CCEGLView)
37-
{
38-
virtual void setScissorInPoints(float x , float y , float w , float h)
39-
{
40-
GLint viewport[4];
41-
glGetIntegerv(GL_VIEWPORT, viewport);
42-
43-
float zoomFactor = m_fFrameZoomFactor;
44-
45-
float multWidth = viewport[2] / (m_obScreenSize.width * zoomFactor);
46-
float multHeight = viewport[3] / (m_obScreenSize.height * zoomFactor);
47-
48-
x *= multWidth;
49-
y *= multHeight;
50-
w *= multWidth;
51-
h *= multHeight;
52-
53-
CCEGLView::setScissorInPoints(x, y, w, h);
54-
}
55-
};
56-
57-
#endif
32+
}

src/GUI/Categories/LanguageNode.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ bool LanguageNodeUI::init()
1010
return false;
1111

1212
auto langs = LocalisationManager::get()->getAllLanguageFiles();
13-
float height = (std::ceil((langs.size() / 2) / 2) * 2) * 2 * (60 + 2.5f);
13+
float height = std::ceil(langs.size() / 2) * (60 + 2.5f);
1414

1515
int x = 0;
1616
int y = 0;

src/Localisation/UI/LanguageNode.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ void LanguageNode::onMissingTranslations(CCObject* sender)
119119
{
120120
debugStr.append(fmt::format("\"{}\": \"{}\"\n", key.first, utils::string::replace(key.second, "\n", "\\n")));
121121
ss.append(key.first);
122-
ss.append("\n");
122+
ss.append("\n\n");
123123
}
124124

125125
auto alert = geode::MDPopup::create(true, "Missing Keys", ss, "OK", "Copy Strings", [this, debugStr](bool btn2)

src/Notifications/Modules/Modules.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ class NotificationsBlur : public Module
6262
{
6363
setID("notifications/blur");
6464
setPriority(4);
65+
setDefaultEnabled(true);
6566

6667
if (!BlurAPI::willLoad())
6768
{

0 commit comments

Comments
 (0)