diff options
| author | skidau <skidau@gmail.com> | 2014-11-17 13:03:23 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2014-11-17 13:03:23 +1100 |
| commit | 5143adac0ebe30c862b18db000b7e6dccd770aaf (patch) | |
| tree | 9e267425c761bab394a6531468df52631c962a99 /Source/Core | |
| parent | aa2fc1f66b768420fcb6958948572f0faa89986d (diff) | |
| parent | 92d4e382676d1e11826ef9e307e9ab094de422db (diff) | |
Merge pull request #1306 from i418c/freelook_fixes
Freelook fixes
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 7 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/VideoConfigDiag.cpp | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index e2e0651cab..0a00ea0b71 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1170,10 +1170,10 @@ void CFrame::OnKeyDown(wxKeyEvent& event) static float debugSpeed = 1.0f; switch (event.GetKeyCode()) { - case '9': + case '1': debugSpeed /= 2.0f; break; - case '0': + case '2': debugSpeed *= 2.0f; break; case 'W': @@ -1197,6 +1197,9 @@ void CFrame::OnKeyDown(wxKeyEvent& event) case 'R': VertexShaderManager::ResetView(); break; + case 'F': + debugSpeed = 1.0f; + break; default: break; } diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp index bbf1eae04c..454fbb5cd5 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp @@ -144,7 +144,7 @@ static wxString dump_efb_desc = wxTRANSLATE("Dump the contents of EFB copies to #if !defined WIN32 && defined HAVE_LIBAV static wxString use_ffv1_desc = wxTRANSLATE("Encode frame dumps using the FFV1 codec.\n\nIf unsure, leave this unchecked."); #endif -static wxString free_look_desc = wxTRANSLATE("This feature allows you to change the game's camera.\nMove the mouse while holding the right mouse button to pan and while holding the middle button to move.\nHold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n\nIf unsure, leave this unchecked."); +static wxString free_look_desc = wxTRANSLATE("This feature allows you to change the game's camera.\nMove the mouse while holding the right mouse button to pan and while holding the middle button to move.\nHold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+2 to move faster and SHIFT+1 to move slower). Press SHIFT+R to reset the camera and SHIFT+F to reset the speed.\n\nIf unsure, leave this unchecked."); static wxString crop_desc = wxTRANSLATE("Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n\nIf unsure, leave this unchecked."); static wxString ppshader_desc = wxTRANSLATE("Apply a post-processing effect after finishing a frame.\n\nIf unsure, select (off)."); static wxString cache_efb_copies_desc = wxTRANSLATE("Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\nSometimes also increases visual quality.\nIf you're experiencing any issues, try raising texture cache accuracy or disable this option.\n\nIf unsure, leave this unchecked."); |