Commit graph

501 commits

Author SHA1 Message Date
Ilari Liusvaara
c11b6de9e1 Add some missing headers to fix compilation on Mac OS X 2013-05-13 13:25:13 +03:00
Ilari Liusvaara
fd16f6f6eb Lua: Don't crash if method execution throws 2013-05-12 15:02:38 +03:00
Ilari Liusvaara
2cf05458bc Lua: Fix lua_state::do_once() 2013-05-12 13:48:52 +03:00
Ilari Liusvaara
b0edee81c8 Projects support 2013-05-12 11:18:59 +03:00
Ilari Liusvaara
192ac85aa2 Lua: Move some stuff 2013-05-12 11:18:59 +03:00
Ilari Liusvaara
a2cbad39ab Merge branch 'rr1-maint' 2013-05-11 12:56:20 +03:00
Ilari Liusvaara
c725e4e874 wxwidgets: Refactor scrollbar handling 2013-05-11 12:52:43 +03:00
Ilari Liusvaara
6677ef19b1 Merge branch 'rr1-maint'
Conflicts:
	src/platform/wxwidgets/memorysearch.cpp
	src/platform/wxwidgets/status.cpp
	src/platform/wxwidgets/textrender.cpp
2013-05-11 02:35:11 +03:00
Ilari Liusvaara
9dc12ae746 Wxwidgets: Improve memory search and refactor text panel code 2013-05-11 02:19:49 +03:00
Ilari Liusvaara
d88cb4fb15 Merge branch 'rr1-maint'
Conflicts:
	src/core/memorymanip.cpp
	src/platform/wxwidgets/memorysearch.cpp
2013-05-10 13:34:12 +03:00
Ilari Liusvaara
acec789323 Autoupdate memory search by default 2013-05-10 12:55:05 +03:00
Ilari Liusvaara
30943200fe Commentary tracks: Remove support for old Opus format (use OggOpus) 2013-05-08 15:36:56 +03:00
Ilari Liusvaara
bce5e8a936 Movie editor: Backport UTF-32 stuff from master
Makes it easier to change the movie editor code by reducing
incompatiblities between rr1 and rr2.
2013-05-03 15:39:27 +03:00
Ilari Liusvaara
efbc60d494 Allow button display symbols to be Unicode characters 2013-05-01 18:06:24 +03:00
Ilari Liusvaara
04f32ca48a Cleanup port defintions
- Replace explicit display methods with data-driven stuff.
- Deduplicate the default system port types.
- Remove generic_port_* because those aren't used in more than one place.

Serialization/Deserialization can't be made data-driven due to performance
constraints (those things are still autogenerated).
2013-05-01 17:18:56 +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
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
4f92b11336 New settings framework 2013-04-13 17:55:33 +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
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
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
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
31e05b501d Lua: CUSTOMFONT: Allow painting with halo 2013-03-29 00:43:14 +02:00
Ilari Liusvaara
2e00c726f0 Move some info from status panel to statusbar 2013-03-28 11:33:25 +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
3e48ffcf98 Analog passthrough 2013-03-16 00:12:35 +02:00
Ilari Liusvaara
f38671a3e2 TAS input plugin 2013-03-15 18:48:39 +02:00
Ilari Liusvaara
dea02b366d Warn about nonexistent controller keys more aggressively 2013-03-15 18:48:39 +02:00
Ilari Liusvaara
67c78124d5 Support per-button autofire 2013-03-14 00:15:43 +02:00
Ilari Liusvaara
3b92a5eb72 Have dedicated window for autohold instead of menu
This comes handy for autofire later.
2013-03-13 23:01:33 +02:00
Ilari Liusvaara
8f57ae5834 Refactoring: copy_from_utf8() 2013-03-13 01:02:10 +02:00
Ilari Liusvaara
00f5754ef7 Allow on_input to veto/force system controls (including reset line) 2013-03-13 00:36:44 +02:00
Ilari Liusvaara
5d3b142d21 Multistream and demuxing fixes 2013-03-09 16:01:58 +02:00
Ilari Liusvaara
cfd129d86b Make opus_packet_tick_count a common function 2013-03-06 09:23:04 +02:00
Ilari Liusvaara
2fae20cdad Refactor Oggopus support 2013-03-04 22:20:10 +02:00
Ilari Liusvaara
efc06d1f10 Merge branch 'rr1-maint'
Conflicts:
	manual.txt
	src/core/controller.cpp
	src/lua/dummy.cpp
	src/lua/input.cpp
	src/lua/lua.cpp
	src/platform/wxwidgets/mainwindow.cpp
2013-03-03 09:37:52 +02:00
Ilari Liusvaara
dca767f650 Lua: on_button and input.veto_button 2013-03-03 09:09:41 +02:00
Ilari Liusvaara
5ec61c864f Some bizarre stuff... 2013-03-02 16:45:53 +02:00
Ilari Liusvaara
caa216c290 Fix reading of host-endian VMAs. 2013-03-01 00:48:13 +02:00