mirror of
https://github.com/TombEngine/TombEngine.git
synced 2025-04-28 15:57:59 +03:00
Merge branch 'develop' into develop_60fps
# Conflicts: # TombEngine/Game/control/control.cpp # TombEngine/Game/gui.cpp # TombEngine/Renderer/RendererDrawMenu.cpp # TombEngine/Scripting/Internal/TEN/Flow/FlowHandler.cpp
This commit is contained in:
commit
3a345e9ccb
254 changed files with 6549 additions and 5267 deletions
|
@ -51,7 +51,8 @@ local strings =
|
|||
ammo_used = { "Ammo Used" },
|
||||
antialiasing = { "Antialiasing" },
|
||||
apply = { "Apply" },
|
||||
automatic_targeting = { "Automatic Targeting" },
|
||||
auto_monkey_swing_jump = { "Auto Monkey Jump" },
|
||||
auto_targeting = { "Auto Targeting" },
|
||||
back = { "Back" },
|
||||
cancel = { "Cancel" },
|
||||
caustics = { "Underwater Caustics" },
|
||||
|
@ -79,8 +80,11 @@ local strings =
|
|||
low = { "Low" },
|
||||
medium = { "Medium" },
|
||||
menu_actions = { "Menu Actions" },
|
||||
menu_option_looping = { "Menu Option Looping" },
|
||||
menu_option_looping_all_menus = { "All Menus" },
|
||||
menu_option_looping_disabled = { "Disabled" },
|
||||
menu_option_looping_save_load_only = { "Save/Load Only" },
|
||||
mouse_sensitivity = { "Mouse Sensitivity" },
|
||||
mouse_smoothing = { "Mouse Smoothing" },
|
||||
music_volume = { "Music Volume" },
|
||||
new_game = { "New Game" },
|
||||
none = { "None" },
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue