Merge branch 'rr1-maint'

This commit is contained in:
Ilari Liusvaara 2012-04-21 20:38:27 +03:00
commit 7bb8e7f1bc
4 changed files with 67 additions and 2 deletions

View file

@ -1 +1 @@
1-Δ6
1-Δ7

View file

@ -6135,5 +6135,46 @@ More save slots support
Wxwidgets (wxJoystick) joystick support
\end_layout
\begin_layout Subsection
rr1-delta7
\end_layout
\begin_layout Itemize
Lots of internal joystick refactoring
\end_layout
\begin_layout Itemize
Evdev: Add mapping for BTN_TOOL_QUINTTAP
\end_layout
\begin_layout Itemize
Wxwidgets: Settings mode (open settings without ROM)
\end_layout
\begin_layout Itemize
Wxwidgets: Prompt key to use option
\end_layout
\begin_layout Itemize
Wxwidgets: Fix crash if key goes away underneath
\end_layout
\begin_layout Itemize
Wxwidgets: Fix mouse position in presence of scaling
\end_layout
\begin_layout Itemize
AVI dumper: Mode 4 (high-quality resampling to common rate using SRC)
\end_layout
\begin_layout Itemize
Wxwidgets: Redesign hotkeys dialog to avoid tree control (tree control doesn't
seem to work well on WinXP)
\end_layout
\begin_layout Itemize
Start paused option.
\end_layout
\end_body
\end_document

View file

@ -3026,3 +3026,25 @@ set-axis joystick0axis19 disabled
• Wxwidgets (wxJoystick) joystick support
15.57 rr1-delta7
• Lots of internal joystick refactoring
• Evdev: Add mapping for BTN_TOOL_QUINTTAP
• Wxwidgets: Settings mode (open settings without ROM)
• Wxwidgets: Prompt key to use option
• Wxwidgets: Fix crash if key goes away underneath
• Wxwidgets: Fix mouse position in presence of scaling
• AVI dumper: Mode 4 (high-quality resampling to common rate
using SRC)
• Wxwidgets: Redesign hotkeys dialog to avoid tree control (tree
control doesn't seem to work well on WinXP)
• Start paused option.

View file

@ -972,7 +972,9 @@ void wxwin_project::on_load(wxCommandEvent& e)
mov.start_paused = start_pause->GetValue();
boot_emulator(*our_rom, mov);
} else {
boot_emulator(*our_rom, *new moviefile(make_movie()));
moviefile& mov = *new moviefile(make_movie());
mov.start_paused = start_pause->GetValue();
boot_emulator(*our_rom, mov);
}
Destroy();
} catch(std::exception& e) {