Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various bug fixes #114

Merged
merged 3 commits into from
Aug 8, 2015
Merged

Various bug fixes #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
940e9ba
Correct detection of GLSL version for curve rendering
mad-s Aug 8, 2015
110e54e
Fix crash on pressing extra mouse buttons
mad-s Aug 8, 2015
b537b83
Game doesn't crash when being unable to go to the github repo page
mad-s Aug 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/itdelatrisu/opsu/objects/curves/Curve.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public static void init(int width, int height, float circleSize, Color borderCol
Curve.borderColor = borderColor;

ContextCapabilities capabilities = GLContext.getCapabilities();
mmsliderSupported = capabilities.GL_EXT_framebuffer_object && capabilities.OpenGL30;
mmsliderSupported = capabilities.GL_EXT_framebuffer_object && capabilities.OpenGL33;
if (mmsliderSupported)
CurveRenderState.init(width, height, circleSize);
else {
Expand Down
2 changes: 1 addition & 1 deletion src/itdelatrisu/opsu/states/MainMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ else if (downloadsButton.contains(x, y)) {
else if (repoButton != null && repoButton.contains(x, y)) {
try {
Desktop.getDesktop().browse(Options.REPOSITORY_URI);
} catch (IOException e) {
} catch (IOException | UnsupportedOperationException e) {
ErrorHandler.error("Could not browse to repository URI.", e, false);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/org/newdawn/slick/Input.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1233,7 +1233,7 @@ public void poll(int width, int height) {
}

while (Mouse.next()) {
if (Mouse.getEventButton() >= 0) {
if (Mouse.getEventButton() >= 0 && Mouse.getEventButton() < mousePressed.length) {
if (Mouse.getEventButtonState()) {
consumed = false;
mousePressed[Mouse.getEventButton()] = true;
Expand Down