diff --git a/CHANGELOG.md b/CHANGELOG.md index 9193d39db..4aafd8018 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ - added `/nextlevel` alias to `/endlevel` console command - added `/quit` alias to `/exit` console command - changed the easter egg console command to pack more punch +- changed `/set` console command to do fuzzy matching (LostArtefacts/libtrx#38) - fixed console caret position off by a couple of pixels (regression from 3.0) - fixed holding a key when closing the console registering as a game input (regression from 3.0) - fixed ability to crash the game with extreme FOV values (regression from 0.9) diff --git a/data/ship/cfg/TR1X_gameflow.json5 b/data/ship/cfg/TR1X_gameflow.json5 index 4f253c58e..64d3e0291 100644 --- a/data/ship/cfg/TR1X_gameflow.json5 +++ b/data/ship/cfg/TR1X_gameflow.json5 @@ -695,6 +695,8 @@ "MISC_EMPTY_SLOT_FMT": "- EMPTY SLOT %d -", "MISC_OFF": "Off", "MISC_ON": "On", + "OSD_AMBIGUOUS_INPUT_2": "Ambiguous input: %s and %s", + "OSD_AMBIGUOUS_INPUT_3": "Ambiguous input: %s, %s, ...", "OSD_COMMAND_BAD_INVOCATION": "Invalid invocation: %s", "OSD_COMMAND_UNAVAILABLE": "This command is not currently available", "OSD_COMPLETE_LEVEL": "Level complete!", diff --git a/data/ship/cfg/TR1X_gameflow_demo_pc.json5 b/data/ship/cfg/TR1X_gameflow_demo_pc.json5 index a072ac89e..29c22f82f 100644 --- a/data/ship/cfg/TR1X_gameflow_demo_pc.json5 +++ b/data/ship/cfg/TR1X_gameflow_demo_pc.json5 @@ -188,6 +188,8 @@ "MISC_EMPTY_SLOT_FMT": "- EMPTY SLOT %d -", "MISC_OFF": "Off", "MISC_ON": "On", + "OSD_AMBIGUOUS_INPUT_2": "Ambiguous input: %s and %s", + "OSD_AMBIGUOUS_INPUT_3": "Ambiguous input: %s, %s, ...", "OSD_COMMAND_BAD_INVOCATION": "Invalid invocation: %s", "OSD_COMMAND_UNAVAILABLE": "This command is not currently available", "OSD_COMPLETE_LEVEL": "Level complete!", diff --git a/data/ship/cfg/TR1X_gameflow_ub.json5 b/data/ship/cfg/TR1X_gameflow_ub.json5 index 395c727ea..cfcfc7708 100644 --- a/data/ship/cfg/TR1X_gameflow_ub.json5 +++ b/data/ship/cfg/TR1X_gameflow_ub.json5 @@ -260,6 +260,8 @@ "MISC_EMPTY_SLOT_FMT": "- EMPTY SLOT %d -", "MISC_OFF": "Off", "MISC_ON": "On", + "OSD_AMBIGUOUS_INPUT_2": "Ambiguous input: %s and %s", + "OSD_AMBIGUOUS_INPUT_3": "Ambiguous input: %s, %s, ...", "OSD_COMMAND_BAD_INVOCATION": "Invalid invocation: %s", "OSD_COMMAND_UNAVAILABLE": "This command is not currently available", "OSD_COMPLETE_LEVEL": "Level complete!", diff --git a/subprojects/libtrx b/subprojects/libtrx index 1a70b8c9b..ee2f6107f 160000 --- a/subprojects/libtrx +++ b/subprojects/libtrx @@ -1 +1 @@ -Subproject commit 1a70b8c9b67da61af432d06edd6ea8f00f996662 +Subproject commit ee2f6107f96c31607d2347e24f6813792c39707f