Skip to content

Commit

Permalink
Merge branch 'master' into master-NathanSweet
Browse files Browse the repository at this point in the history
  • Loading branch information
NathanSweet committed Dec 18, 2020
2 parents 5cfa7cc + f63c2af commit 466947e
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 329 deletions.
3 changes: 2 additions & 1 deletion CHANGES
@@ -1,10 +1,11 @@
[1.9.13]
- [BREAKING CHANGE] TexturePacker writes using a new format (TextureAtlas can still read old format). See #6316.
- [BREAKING CHANGE] Fixed keycode representations for ESCAPE, END, INSERT and F1 to F12. These keys are working on Android now, but if you hardcoded or saved the values you might need to migrate.
- GWT: Key codes set with Gdx.input.setCatchKey prevent default browser behaviour
- Added Scaling.contain mode: Scales the source to fit the target while keeping the same aspect ratio, but the source is not scaled at all if smaller in both directions.
- API Addition: Added hasContents() to Clipboard interface, to reduce clipboard notifications on iOS 14
- TOOLS Features: Blending mode can be changed in Flame particle 3D editor.
- Input Keycodes added: CAPS_LOCK, PAUSE (aka Break), PRINT_SCREEN, SCROLL_LOCK, F13 to F24, NUMPAD_DIVIDE, NUMPAD_MULTIPLY, NUMPAD_SUBTRACT, NUMPAD_ADD, NUMPAD_DOT, NUMPAD_COMMA, NUMPAD_ENTER, NUMPAD_EQUALS, NUMPAD_LEFT_PAREN, NUMPAD_RIGHT_PAREN, NUM_LOCK.
- Input Keycodes added: CAPS_LOCK, PAUSE (aka Break), PRINT_SCREEN, SCROLL_LOCK, F13 to F24, NUMPAD_DIVIDE, NUMPAD_MULTIPLY, NUMPAD_SUBTRACT, NUMPAD_ADD, NUMPAD_DOT, NUMPAD_COMMA, NUMPAD_ENTER, NUMPAD_EQUALS, NUMPAD_LEFT_PAREN, NUMPAD_RIGHT_PAREN, NUM_LOCK.
Following changes might be done depending on platform: Keys.STAR to Keys.NUMPAD_MULTIPLY, Keys.SLASH to Keys.NUMPAD_DIVIDE, Keys.NUM to Keys.NUM_LOCK, Keys.COMMA to Keys.NUMPAD_COMMA, Keys.PERIOD to Keys.NUMPAD_DOT, Keys.COMMA to Keys.NUMPAD_COMMA, Keys.ENTER to Keys.NUMPAD_ENTER, Keys.PLUS to Keys.NUMPAD_ADD, Keys.MINUS to Keys.NUMPAD_SUBTRACT
- Added a QuadFloatTree class.
- Desktop: Cubemap Seamless feature is now enabled by default when supported, can be changed via backend specific methods, see supportsCubeMapSeamless and enableCubeMapSeamless in both LwjglGraphics and Lwjgl3Graphics.
Expand Down

This file was deleted.

30 changes: 15 additions & 15 deletions gdx/src/com/badlogic/gdx/Input.java
Expand Up @@ -178,9 +178,9 @@ static public class Keys {
public static final int META_SYM_ON = 4;
public static final int CONTROL_LEFT = 129;
public static final int CONTROL_RIGHT = 130;
public static final int ESCAPE = 131;
public static final int END = 132;
public static final int INSERT = 133;
public static final int ESCAPE = 111;
public static final int END = 123;
public static final int INSERT = 124;
public static final int PAGE_UP = 92;
public static final int PAGE_DOWN = 93;
public static final int PICTSYMBOLS = 94;
Expand Down Expand Up @@ -244,18 +244,18 @@ static public class Keys {
// ! | VK_EXCLAMATION
// ? | VK_QUESTION
public static final int COLON = 243;
public static final int F1 = 244;
public static final int F2 = 245;
public static final int F3 = 246;
public static final int F4 = 247;
public static final int F5 = 248;
public static final int F6 = 249;
public static final int F7 = 250;
public static final int F8 = 251;
public static final int F9 = 252;
public static final int F10 = 253;
public static final int F11 = 254;
public static final int F12 = 255;
public static final int F1 = 131;
public static final int F2 = 132;
public static final int F3 = 133;
public static final int F4 = 134;
public static final int F5 = 135;
public static final int F6 = 136;
public static final int F7 = 137;
public static final int F8 = 138;
public static final int F9 = 139;
public static final int F10 = 140;
public static final int F11 = 141;
public static final int F12 = 142;
public static final int F13 = 183;
public static final int F14 = 184;
public static final int F15 = 185;
Expand Down

0 comments on commit 466947e

Please sign in to comment.