Commit graph

12 commits

Author SHA1 Message Date
Ilari Liusvaara
c5be74d063 Merge branch 'focus-fix' into rr1-maint
Conflicts:
	src/core/mainloop.cpp
	src/core/moviedata.cpp
	src/core/rom.cpp
2012-07-14 09:30:07 +03:00
Ilari Liusvaara
c6c640bdbc Allow binding methods in Lua classes 2012-07-11 15:17:12 +03:00
Ilari Liusvaara
1f631a8ad0 Librarify screen rendering 2012-06-20 17:40:27 +03:00
Ilari Liusvaara
3548315ccb Lua: Reset Lua VM function 2012-06-06 21:58:03 +03:00
Ilari Liusvaara
6f796f9601 Unsafe rewinding
Unsafe rewinding is unsafe, but in exchange, a lot faster than normal
save/load cycle.
2012-05-19 14:37:49 +03:00
Ilari Liusvaara
4c38e3784a Merge branch 'rr1-maint'
Conflicts:
	Makefile
	src/core/render.cpp
2012-03-07 21:12:14 +02:00
Ilari Liusvaara
72a8296eb9 Lock palettes to protect color array structure 2012-03-07 14:44:24 +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
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
d45b316380 Refactor makefile
Refactor the makefile and move some code files to more logical places.
2012-02-06 05:38:51 +02:00