Commit graph

267 commits

Author SHA1 Message Date
Ilari Liusvaara
229a121b97 Fix SRAM handling with Bsnes v087
Bsnes v087 changes the SRAM names. Map those to the old names to preserve
compatiblity.
2012-03-13 08:52:10 +02:00
Ilari Liusvaara
2cc7666398 Fix dumper modes and remove some dead code 2012-03-11 11:13:26 +02:00
Ilari Liusvaara
389a6eca43 Merge branch 'rr1-maint' 2012-03-10 21:23:24 +02:00
Ilari Liusvaara
8b78cd32e7 Actually fix the "on_input() not called after loadstate" correctly
Put the call where the keyboard controls are loaded.
2012-03-10 17:33:34 +02:00
Ilari Liusvaara
dbe5cc8cb8 Reread controls after loadstate
Without rereading the controls, Lua doesn't get called to input the
correct frame data.
2012-03-10 16:57:22 +02:00
Ilari Liusvaara
b3d3bc5afa Merge branch 'rr1-maint'
Conflicts:
	src/lua/input.cpp
2012-03-10 08:20:59 +02:00
Ilari Liusvaara
17d2d84d70 Movieinfo: Print port 2 type right 2012-03-09 21:39:34 +02:00
Ilari Liusvaara
b06c8cbc09 Lua: input.controllertype() 2012-03-08 15:28:42 +02:00
Ilari Liusvaara
66fca7925c Lua: bit.value 2012-03-08 08:00:19 +02:00
Ilari Liusvaara
4c38e3784a Merge branch 'rr1-maint'
Conflicts:
	Makefile
	src/core/render.cpp
2012-03-07 21:12:14 +02:00
Ilari Liusvaara
626ff5e200 Add patchseries for v087
Additionally, fix the mouse input craziness.
2012-03-07 17:12:42 +02:00
Ilari Liusvaara
afca090265 Special-case render object allocation
This is a slight optimization
2012-03-07 15:50:02 +02:00
Ilari Liusvaara
72a8296eb9 Lock palettes to protect color array structure 2012-03-07 14:44:24 +02:00
Ilari Liusvaara
94cb7ac097 Merge branch 'rr1-maint' 2012-03-07 14:00:08 +02:00
Ilari Liusvaara
1d2d806acc Allow optional initial fill color for bitmaps 2012-03-07 13:49:19 +02:00
Ilari Liusvaara
2fb19ea144 Refactor render queue management
This makes it easier to switch render queue object memory management
to internal implementation, speeding stuff up.
2012-03-07 13:33:54 +02:00
Ilari Liusvaara
1a33ad9dc2 Lua: bit.extract 2012-03-07 12:35:46 +02:00
Ilari Liusvaara
5d989b8929 Shorten maxwait from 5s to 0.1s 2012-03-07 12:33:02 +02:00
Ilari Liusvaara
c3dd13fb3f Merge remote-tracking branch 'origin/rr1-maint'
Conflicts:
	Makefile
	src/lua/core.cpp
	src/lua/lua.cpp
2012-03-07 06:19:06 +02:00
Ilari Liusvaara
923154bf5c Wxwidgets: Fix broken modifiers 2012-03-06 18:42:08 +02:00
Ilari Liusvaara
4012f9914a Wxwidgets: Fix the "internal focus lost" problem 2012-03-06 18:33:41 +02:00
Ilari Liusvaara
3907ded86c Fix compilation 2012-03-06 18:30:55 +02:00
Ilari Liusvaara
ec60e36c57 Lua: input.geta/input.seta 2012-03-06 14:33:08 +02:00
Ilari Liusvaara
b9e5d39743 Fix double-polling for real 2012-03-06 14:32:46 +02:00
Ilari Liusvaara
719247b444 Don't call subframe poll on first poll (only if needed) 2012-03-06 14:06:37 +02:00
Ilari Liusvaara
44233e3897 Lua: Add on_idle() and on_timer() 2012-03-06 13:48:39 +02:00
Ilari Liusvaara
528628b233 Lua: utime(): Microsecond-resolution time 2012-03-06 07:54:12 +02:00
Ilari Liusvaara
2124f3b9b6 Add emulator_ready() lua function
This function gives a flag telling if emulator has finished booting
up.
2012-03-06 05:24:43 +02:00
Ilari Liusvaara
b0bb6053a9 Add new lua hooks
Add new lua hooks:
- on_rewind
- on_frame_emulated

Additionally, on_paint now has a parameter.
2012-03-06 05:11:50 +02:00
Ilari Liusvaara
9bb2b2de05 Fix movie corruption in certain cases
Movie code corrupted the movie if movie length was integral multiple
of frames per page. Fix this.
2012-03-04 22:57:45 +02:00
Ilari Liusvaara
9405c809e0 Debug multithreading-related errors 2012-03-04 15:41:06 +02:00
Ilari Liusvaara
bd0ef203c1 Merge branch 'rr1-maint' 2012-03-03 13:32:09 +02:00
Ilari Liusvaara
e646c60600 Merge branch 'rr1-maint'
Conflicts:
	include/core/render.hpp
2012-03-03 11:31:44 +02:00
Ilari Liusvaara
d8319ef4a9 Lua Bitmap WIP 2012-03-03 11:27:26 +02:00
Ilari Liusvaara
5b38dad8fe Don't do anything undefined if Lua C function throws an exception 2012-03-03 11:25:59 +02:00
Ilari Liusvaara
6c35684a6a Some makefile fixes 2012-03-02 22:06:58 +02:00
Ilari Liusvaara
4fc30a3c4c Merge branch 'rr1-maint'
Conflicts:
	Makefile
	src/core/avidump-control.cpp
	src/core/jmd-control.cpp
	src/core/keymapper.cpp
	src/core/raw-control.cpp
	src/core/rom.cpp
2012-03-02 22:00:20 +02:00
Ilari Liusvaara
b1c2441da4 Refactor remaining tokensplitters
Also fixes some bugs with memory search.
2012-03-02 21:02:15 +02:00
Ilari Liusvaara
4cf07bd298 Refactor keymapper.cpp command parsing 2012-03-01 10:09:07 +02:00
Ilari Liusvaara
66ddf0bfc5 Fix a bug in extract_token()
Extract_token() misbehave in sequence=true case.
2012-03-01 10:08:54 +02:00
Ilari Liusvaara
c370a092f2 Refactor memory watch commands 2012-02-28 19:02:06 +02:00
Ilari Liusvaara
7ce1a5729d Refactor edit-author 2012-02-28 18:51:01 +02:00
Ilari Liusvaara
17e6bff6b2 Refactor some moviedata commands 2012-02-28 18:21:07 +02:00
Ilari Liusvaara
50d1a79814 Refactor ROM option parsing 2012-02-28 18:21:07 +02:00
Ilari Liusvaara
9b335bd3de Remove unnecressary conversions in dumper control 2012-02-28 18:21:07 +02:00
Ilari Liusvaara
580df3b973 Don't dump JMD at undefined compression level 2012-02-28 18:20:54 +02:00
Ilari Liusvaara
397b394dd5 Refactor settings commands 2012-02-27 22:34:45 +02:00
Ilari Liusvaara
e1ab1fd19a Refactor some generic platform code 2012-02-27 22:34:45 +02:00
Ilari Liusvaara
0e6a6b7804 Remove SHA-256 indices
Nothing uses this code
2012-02-27 22:34:45 +02:00
Ilari Liusvaara
fc10354bce Use standard boolean parser for parsing booleans 2012-02-27 22:34:45 +02:00