10 Commits

Author	SHA1	Message	Date
Ricardo Quesada	81c2d92355	yeah... love in includes ... <3	2014-04-26 10:35:57 -07:00
andyque	57d8f155df	issue #4401. resolve conflicts	2014-03-26 14:54:50 +08:00
Dale Stammen	44e6efea64	#pragma mark for ios and mac only	2014-03-22 06:08:05 -07:00
James Chen	e6d2c4ec73	Refactors Scheduler class. ... * Timer is an abstract class now. * Adds three new timers ( `TimerTargetSelector`, `TimerTargetCallback`, `TimerScriptHandler`) which are inherited from Timer. * Adds new API 'scheduleCallback` / `unscheduleCallbackForKey', and callback's target could be any classes since we're using `void*` to identify target. * `Scheduler::scheduleCallback` use `std::function`, therefore, it supports passing `lambda`, `member_function` and `global_function`. * The old selector API is still kept since it's very useful when schedule callback is a member function, it doesn't need a `key` to identify the callback function. (+1 squashed commit) * Adds relevant test cases.	2014-03-01 14:09:09 +08:00
James Chen	68eaa746ea	closed #2535: TouchScriptHandlerEntry will release twice lua reference	2014-02-20 21:58:20 +08:00
James Chen	0d8846d876	closed #4097: Adds a macro to disable inserting script binding relevant codes.	2014-02-20 16:40:46 +08:00
chuanweizhang2013	e9dd3d828a	issue #3498: commit jsruntime	2014-02-10 18:15:30 +08:00
walzer	64af0de648	update copyrights for 2014, in cocos/2d/ folder	2014-01-07 11:25:07 +08:00
boyu0	e07c4ffec1	Change NULL to nullptr, edit hungarian notation.	2013-12-18 17:47:20 +08:00
minggo	49d7bbd600	issue #2905: remove sub folders except platform	2013-10-12 15:41:45 +08:00