Commit graph

96 commits

Author SHA1 Message Date
Ilari Liusvaara
96cd83d1b2 Merge branch 'rr1-maint' 2012-04-19 12:47:30 +03:00
Ilari Liusvaara
4a8da706c7 Wxwidgets: Add option to prompt for key in key select dialogs 2012-04-19 12:35:25 +03:00
Ilari Liusvaara
6cd922305c Make settings threadsafe
Yet more removing of runemufn calls...
2012-04-16 13:54:22 +03:00
Ilari Liusvaara
2176427609 Make keymapper threadsafe
The keymapper is now threadsafe, instead of being only called from the
emulation thread.
2012-04-16 12:12:30 +03:00
Ilari Liusvaara
8a6e7e7da2 MAX_ANALOG is no longer used, remove it 2012-04-15 16:19:37 +03:00
Ilari Liusvaara
07ecfd7dc4 Refactor internal interfaces to support arbitrary number of controllers 2012-04-15 15:10:15 +03:00
Ilari Liusvaara
4f9dfd513c Refactor ROM slots handling
Refactor ROM slot behaviour to bsnes-specific code
2012-04-15 09:52:00 +03:00
Ilari Liusvaara
6f229e6a93 Merge branch 'rr1-maint' 2012-04-13 17:05:19 +03:00
Ilari Liusvaara
e9fa95f34c Refactor joystick support more 2012-04-13 11:15:00 +03:00
Ilari Liusvaara
9bffe5c504 Merge branch 'rr1-maint' 2012-04-09 13:25:27 +03:00
Ilari Liusvaara
46b00159fe Wxwidgets: Disable clear buttons on nonclearable settings 2012-04-09 13:24:37 +03:00
Ilari Liusvaara
4b352d57ae Merge branch 'rr1-maint' 2012-04-08 16:06:15 +03:00
Ilari Liusvaara
976ab9a878 Refactor path handling 2012-04-08 15:44:03 +03:00
Ilari Liusvaara
b05b31a538 Rework jukebox
- Remove explicit setting for jukebox names
- Add setting for number of saves in jukebox
- Add path for save slots.
2012-04-07 19:12:14 +03:00
Ilari Liusvaara
29a1edd3e0 Internally classify keys
This is useful later to split down that massive key list into more
logical chunks.
2012-04-07 18:07:33 +03:00
Ilari Liusvaara
906f3caa43 Merge branch 'rr1-maint'
Conflicts:
	src/video/sdmp.cpp
2012-04-07 15:43:35 +03:00
Ilari Liusvaara
1974362569 Split cases for prefix and special for dumper targets 2012-04-06 14:35:56 +03:00
Ilari Liusvaara
1ae101ab44 Merge commit '2cc7666398bf05d2bc702efe99338a5bba75b21c' into rr1-maint
Merge most of the devbranch work (up until splitting the core starts)
into rr1-maint.

This is mostly to make maintenance easier, even if it introduces some
changes that could be bit big into maint branch.

Conflicts:
	src/platform/wxwidgets/mainwindow.cpp
2012-04-05 10:48:29 +03:00
Ilari Liusvaara
bab1ffece9 Merge branch 'rr1-maint'
Conflicts:
	src/platform/wxwidgets/mainwindow.cpp
2012-03-27 12:12:03 +03:00
Ilari Liusvaara
6fe83abc29 Speed and volume adjustment 2012-03-26 21:55:02 +03:00
Ilari Liusvaara
aebb6c8c6d Merge branch 'rr1-maint'
Conflicts:
	src/core/rom.cpp
	src/platform/wxwidgets/romselect.cpp
2012-03-18 17:31:52 +02:00
Ilari Liusvaara
cf4175312c Built-in ROM patcher
Implement built-in ROM patcher instead of relying upon nall to perform
the patching.
2012-03-18 17:29:02 +02:00
Ilari Liusvaara
b846bb0911 Move core save/load routines to bsnes.cpp 2012-03-16 13:05:09 +02:00
Ilari Liusvaara
a59650b11d Split VMA handling
Move VMA handling from memorymanip.cpp to bsnes.cpp
2012-03-16 12:44:00 +02:00
Ilari Liusvaara
0fe0e6c147 Fix saving of movie data for port2 2012-03-13 06:36:48 +02:00
Ilari Liusvaara
8e75080526 Refactor SNES::system_*pu_frequency() calls to interface/bsnes.cpp 2012-03-12 11:02:55 +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
94cb7ac097 Merge branch 'rr1-maint' 2012-03-07 14:00:08 +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
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
44233e3897 Lua: Add on_idle() and on_timer() 2012-03-06 13:48:39 +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
9405c809e0 Debug multithreading-related errors 2012-03-04 15:41:06 +02:00
Ilari Liusvaara
e646c60600 Merge branch 'rr1-maint'
Conflicts:
	include/core/render.hpp
2012-03-03 11:31:44 +02:00
Ilari Liusvaara
0514dd989e Lua class system 2012-03-03 11:26:49 +02:00
Ilari Liusvaara
58c7860d83 Premultiplied_color default constructor (transparent color) 2012-03-03 11:26:20 +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
325935258d Get rid of setting::print_all() 2012-02-27 22:32:26 +02:00
Ilari Liusvaara
0f56afbffd Merge branch 'rr1-maint' 2012-02-27 07:41:33 +02:00
Ilari Liusvaara
ccde3f21be Fix generic_port_read()
Generic_port_read() was returning undefined values if read with out of
bounds control index. This was breaking everything on certain builds.
2012-02-27 07:40:44 +02:00
Ilari Liusvaara
e4e3874007 Fix compilation (missing header) 2012-02-23 23:05:48 +02:00
Ilari Liusvaara
30360a86d8 Merge branch 'rr1-maint'
Conflicts:
	Makefile
	include/library/minmax.hpp
	src/core/avidump-control.cpp
	src/core/rom.cpp
2012-02-23 17:44:28 +02:00
Ilari Liusvaara
e88023a17f Code cleanup WIP 2012-02-23 16:48:56 +02:00
Ilari Liusvaara
b3e81054f3 Merge remote-tracking branch 'origin/rr1-maint' into rr1-maint 2012-02-20 21:21:03 +02:00
Ilari Liusvaara
7d19748ed2 Merge branch 'rr1-maint'
Conflicts:
	src/platform/wxwidgets/mainwindow.cpp
2012-02-20 21:19:53 +02:00
Ilari Liusvaara
1b464b9e6b wxwidgets: Hotkey configuration
Allow configuring hotkeys, not just keybindings (more usable).
2012-02-20 21:15:51 +02:00