Commit graph

1279 commits

Author SHA1 Message Date
Ilari Liusvaara
a1b1dd8d65 Movie editor: Show button/axis names in popup menu 2013-02-04 19:05:29 +02:00
Ilari Liusvaara
4e7d763abb Movie editor: Don't offer popup menu items that make no sense 2013-02-04 18:54:55 +02:00
Ilari Liusvaara
e032662a38 Merge branch 'rr1-maint' 2013-02-04 12:54:20 +02:00
Ilari Liusvaara
ccb4d67074 Movie editor: Popup menu 2013-02-04 12:53:46 +02:00
Ilari Liusvaara
e5b9a62194 Merge branch 'rr1-maint'
Conflicts:
	src/platform/wxwidgets/editor-movie.cpp
2013-02-04 12:13:55 +02:00
Ilari Liusvaara
124238cea7 Movie editor: Refactoring 2013-02-04 11:55:19 +02:00
Ilari Liusvaara
ea2042acfd Movie editor: Properly space in presence of axis fields 2013-02-04 08:43:36 +02:00
Ilari Liusvaara
e7fd247c07 Movie editor: Add space before axis fields 2013-02-03 20:50:00 +02:00
Ilari Liusvaara
5eaa80a5f2 Merge branch 'rr1-maint'
This merges the basic movie editor functionality
2013-02-03 17:41:09 +02:00
Ilari Liusvaara
ca63bd5bea Very basic movie editing support
This is still very incomplete. More features later.
2013-02-03 16:01:21 +02:00
Ilari Liusvaara
dfe18d2a4d lsnes rr1-Δ16ε1 2013-02-03 11:53:50 +02:00
Ilari Liusvaara
f9415b0154 Fix loading standard-mode movies
When not in extended mode, the checking for movie compatibility read past
the end of poll counter array, potentially leading to a hang.
2013-02-03 06:13:51 +02:00
Ilari Liusvaara
9560c66bf4 Oops, set the sound mode default to 2 not 3
The last merge was bad: Instead of mode 2 (round up to nearest integer)
the default got set to mode 3 (multiply rate).
2013-02-02 01:44:35 +02:00
Ilari Liusvaara
c3ae963cbe Merge branch 'rr1-maint'
Conflicts:
	src/video/avi.cpp
2013-02-02 01:39:55 +02:00
Ilari Liusvaara
3eea885a64 Change AVI default sound mode
Change AVI default sound mode to mode 2 (round up to nearest integer)
if built without SRC support and to mode 5 (high quality 48kHz) if built
with SRC.
2013-02-02 01:39:17 +02:00
Ilari Liusvaara
010c337fa9 Merge branch 'rr1-maint' 2013-02-02 01:23:41 +02:00
Ilari Liusvaara
3539fc508d Fix paths in bsnes patches 2013-02-02 01:23:34 +02:00
Ilari Liusvaara
1d6cf64908 Merge branch 'rr1-maint' 2013-02-01 23:14:25 +02:00
Ilari Liusvaara
8e88ad35b3 Fix rerecord count when loading movies 2013-02-01 23:14:00 +02:00
Ilari Liusvaara
bcdb9dd9f8 Merge branch 'rr1-maint'
Conflicts:
	include/lua/internal.hpp
	manual.txt
	src/lua/lua.cpp
	src/lua/memory.cpp
2013-02-01 22:26:22 +02:00
Ilari Liusvaara
8c346c0695 Lua: Fix bug with methods and resetting Lua VM 2013-02-01 22:10:01 +02:00
Ilari Liusvaara
531c0d0635 Merge branch 'rr1-maint'
Conflicts:
	manual.lyx
	manual.txt
2013-02-01 21:54:32 +02:00
Ilari Liusvaara
5d08c36390 Lua: Custom fonts support 2013-02-01 21:52:27 +02:00
Ilari Liusvaara
86d4f99da9 Oops, missing file. 2013-01-28 16:38:13 +02:00
Ilari Liusvaara
246f0e32b9 Dedicated sound devices dialog 2013-01-28 13:01:05 +02:00
Ilari Liusvaara
b928596e09 Support for hard resets and make some stuff movie settings 2013-01-27 13:57:33 +02:00
Ilari Liusvaara
0b45d38af1 Render queue documentation 2013-01-26 23:55:50 +02:00
Ilari Liusvaara
5171900b43 Lua: Render queues as objects 2013-01-26 23:42:08 +02:00
Ilari Liusvaara
33ad2fcc12 Merge branch 'rr1-maint'
Conflicts:
	include/platform/wxwidgets/platform.hpp
	src/platform/wxwidgets/mainwindow.cpp
2013-01-26 13:27:31 +02:00
Ilari Liusvaara
c065f0398f Wxwidgets: VU meters & volume adjustment window 2013-01-26 13:20:39 +02:00
Ilari Liusvaara
0fa3109116 Merge branch 'rr1-maint'
Conflicts:
	src/core/inthread.cpp
2013-01-25 20:15:07 +02:00
Ilari Liusvaara
c5d45840ed Allow setting stream gain 2013-01-25 20:14:11 +02:00
Ilari Liusvaara
23b5f9891e Merge branch 'rr1-maint' 2013-01-25 14:45:20 +02:00
Ilari Liusvaara
1297f683e0 Merge remote-tracking branch 'origin/rr1-maint' into rr1-maint 2013-01-25 12:35:01 +02:00
Ilari Liusvaara
a116622b32 Wxwidgets: Fix memory watch rendering 2013-01-25 12:33:55 +02:00
Ilari Liusvaara
ee3035cacc lsnes rr2-β2 2013-01-24 18:44:55 +02:00
Ilari Liusvaara
c168be8562 lsnes rr1-Δ16 2013-01-24 18:35:13 +02:00
Ilari Liusvaara
422e90b7d6 Split duplex support
This allows having sound I/O on Mac OS X (at least on Macbooks)
2013-01-24 18:26:37 +02:00
Ilari Liusvaara
ed77f5a4e0 Merge branch 'rr1-maint' 2013-01-24 18:26:26 +02:00
Ilari Liusvaara
2526414a53 Actually honor music volume setting 2013-01-24 18:26:03 +02:00
Ilari Liusvaara
bd14e31e57 Merge branch 'rr1-maint'
Conflicts:
	src/platform/wxwidgets/editor-subtitles.cpp
2013-01-24 04:22:24 +02:00
Ilari Liusvaara
5c3e48348b Live subtitle editing 2013-01-24 04:16:38 +02:00
Ilari Liusvaara
fa3211f87f Merge branch 'rr1-maint'
Conflicts:
	include/core/dispatch.hpp
	src/core/dispatch.cpp
	src/core/inthread.cpp
2013-01-24 02:14:12 +02:00
Ilari Liusvaara
ab204556da Real-time updates for voice streams in editor 2013-01-24 02:04:36 +02:00
Ilari Liusvaara
10bff4a0c3 Merge branch 'rr1-maint' 2013-01-23 08:48:48 +02:00
Ilari Liusvaara
242ce42bb7 Lua: bit.rflagdecode 2013-01-23 08:48:27 +02:00
Ilari Liusvaara
ecfec8a1f4 Lua: Backport new Lua functions from master and add bit.rflagdecode 2013-01-23 08:43:31 +02:00
Ilari Liusvaara
0763a00bef Emulate weak dummy driver in a way compatible with Win32
This is less performant than doing it with linker support, but that
doesn't matter because none of the functions is called very often.
2013-01-22 09:26:22 +02:00
Ilari Liusvaara
c9e038f902 Lua: bit.flagdecode 2013-01-21 23:57:19 +02:00
Ilari Liusvaara
bbe8f0b0fd Lua: bit.clshift / bit.crshift 2013-01-21 23:13:45 +02:00