Commit graph

1468 commits

Author SHA1 Message Date
Ilari Liusvaara
c5a5a4059d Merge branch 'rr1-maint' 2013-04-16 13:56:21 +03:00
Ilari Liusvaara
485558d148 Merge remote-tracking branch 'origin/rr1-maint' into rr1-maint 2013-04-16 13:55:54 +03:00
Ilari Liusvaara
3c3d3051b3 Movie editor: Interpret ctrl+click as right click 2013-04-16 13:55:26 +03:00
Ilari Liusvaara
e8d32ed930 Merge branch 'rr1-maint'
Conflicts:
	src/core/movie.cpp
2013-04-16 04:02:55 +03:00
Ilari Liusvaara
3ab8f196ec Cap current_frame_first_subframe to movie size when recounting movie
The case where it is greater should never happen, but just check to be
sure.
2013-04-16 03:56:10 +03:00
Ilari Liusvaara
a85619270d Merge branch 'rr1-maint'
Conflicts:
	include/core/movie.hpp
	src/core/movie.cpp
2013-04-16 03:45:00 +03:00
Ilari Liusvaara
f1399d2f2e Movie editor: Fix bug if extending finished movie 2013-04-16 03:39:51 +03:00
Ilari Liusvaara
b7e3329db3 Merge branch 'rr1-maint'
Conflicts:
	src/platform/wxwidgets/settings.cpp
2013-04-14 21:32:47 +03:00
Ilari Liusvaara
81145d38ea Fix hotkeys stopping working after X-ing settings dialog 2013-04-14 21:29:22 +03:00
Ilari Liusvaara
4a482d22c1 Merge branch 'rr1-maint' 2013-04-14 20:43:46 +03:00
Ilari Liusvaara
c75596f7e4 Add snes9x fonts 2013-04-14 20:43:32 +03:00
Ilari Liusvaara
b53f647315 Fix race condition causing possible crash on startup 2013-04-14 20:11:14 +03:00
Ilari Liusvaara
99b666f790 Remove some unused leftover stuff 2013-04-13 23:38:18 +03:00
Ilari Liusvaara
e75667068a Merge branch 'rr1-maint'
Conflicts:
	src/core/mainloop.cpp
2013-04-13 22:20:00 +03:00
Ilari Liusvaara
b7dfe28ae1 Display current save slot information 2013-04-13 22:04:49 +03:00
Ilari Liusvaara
185085a019 Allow slowing down subframe advance (it used to always be very fast) 2013-04-13 21:31:56 +03:00
Ilari Liusvaara
4f92b11336 New settings framework 2013-04-13 17:55:33 +03:00
Ilari Liusvaara
6494536334 Merge branch 'rr1-maint' 2013-04-10 13:46:25 +03:00
Ilari Liusvaara
f32e593912 Merge remote-tracking branch 'origin/rr1-maint' into rr1-maint 2013-04-10 13:37:14 +03:00
Ilari Liusvaara
1d9fdedbb3 Merge branch 'rr1-maint' 2013-04-10 13:18:06 +03:00
Ilari Liusvaara
254e49c476 Offer lsmv.backup as file filter too for load lsmv 2013-04-10 13:17:34 +03:00
Ilari Liusvaara
fade785bc4 Fix print() after Lua VM reset 2013-04-10 02:33:12 +03:00
Ilari Liusvaara
7ee2c4ddb6 Fix subframe counter 2013-04-09 22:38:28 +03:00
Ilari Liusvaara
7d0acfbaec Merge branch 'rr1-maint'
Conflicts:
	src/core/mainloop.cpp
2013-04-05 20:09:31 +03:00
Ilari Liusvaara
bfaf627c66 Show effects of Lua in input display 2013-04-05 20:06:00 +03:00
Ilari Liusvaara
bd39b322ce Autofire: Fix false status indications 2013-04-05 15:48:08 +03:00
Ilari Liusvaara
53d436f399 Merge branch 'rr1-maint' 2013-04-03 18:42:07 +03:00
Ilari Liusvaara
f7b6602f10 Actually fix the statuspane/movie-editor flicker 2013-04-03 18:37:15 +03:00
Ilari Liusvaara
e60af4d32c Merge branch 'rr1-maint'
Conflicts:
	src/platform/wxwidgets/status.cpp
2013-04-03 10:39:18 +03:00
Ilari Liusvaara
cf19dc3335 Fix status panel (and movie editor) flicker 2013-04-03 10:38:11 +03:00
Ilari Liusvaara
65218e0894 lsnes rr2-β5 2013-04-01 15:14:16 +03:00
Ilari Liusvaara
31434a691d lsnes rr1-Δ17ε2 2013-04-01 15:05:41 +03:00
Ilari Liusvaara
3ae089cf05 Merge branch 'rr1-maint' 2013-04-01 14:08:44 +03:00
Ilari Liusvaara
03c03fc4c1 Fix value search to work with byte types 2013-04-01 14:08:24 +03:00
Ilari Liusvaara
ccf3ca8ba9 Merge branch 'rr1-maint' 2013-03-29 17:20:54 +02:00
Ilari Liusvaara
e27a06f7c3 Lua: CUSTOMFONT: Allow painting with halo
Conflicts:

	manual.txt
	src/lua/gui-text-cf.cpp
2013-03-29 17:15:28 +02:00
Ilari Liusvaara
3e1836453b data/verysmall.font is mising glyph 70 (F) 2013-03-29 17:13:01 +02:00
Ilari Liusvaara
31e05b501d Lua: CUSTOMFONT: Allow painting with halo 2013-03-29 00:43:14 +02:00
Ilari Liusvaara
d0858038fd data/verysmall.font is mising glyph 70 (F) 2013-03-29 00:41:27 +02:00
Ilari Liusvaara
2e00c726f0 Move some info from status panel to statusbar 2013-03-28 11:33:25 +02:00
Ilari Liusvaara
145b7e3dbe Fix undefined return value from port unserialization 2013-03-28 05:54:10 +02:00
Ilari Liusvaara
73fd1d4737 Merge branch 'rr1-maint'
Conflicts:
	include/core/loadlib.hpp
	src/core/loadlib.cpp
	src/platform/wxwidgets/mainwindow.cpp
2013-03-25 11:35:41 +02:00
Ilari Liusvaara
3e8f02fcaf Wxwidgets: Filter filenames in load/save dialogs, autoappend extensions 2013-03-25 11:28:06 +02:00
Ilari Liusvaara
5b0f5b25f9 Movie editor: Use UTF-32 internally 2013-03-25 10:58:06 +02:00
Ilari Liusvaara
92adf8519c Use std::u32string instead of std::vector<uint32_t> for UTF-32 strings
This also uncovered a bug in copy_from_utf8.
2013-03-25 00:29:48 +02:00
Ilari Liusvaara
3c2aefdc06 Add missing $(CROSS_PREFIX) to pkg-config for libopus 2013-03-24 20:17:00 +02:00
Ilari Liusvaara
8bbf432ada Autohold/Autofire: Try fix the "ga" bug 2013-03-23 21:09:28 +02:00
Ilari Liusvaara
cc366d3de0 Merge branch 'rr1-maint' 2013-03-22 22:03:56 +02:00
Ilari Liusvaara
ba6efda53e Fix mouse movement 2013-03-22 22:03:38 +02:00
Ilari Liusvaara
688f75e261 Don't crash if somebody calls audioapi_get_voice with samples=NULL 2013-03-22 17:26:39 +02:00