8 Commits

Author	SHA1	Message	Date
Ricardo Quesada	33a2d0451c	Code conforms with the cocos2d-x c++ guidelines	2014-11-25 17:53:52 -08:00
Ricardo Quesada	50dcae4bef	fixes compiler warnings	2014-11-14 13:07:34 -08:00
Ricardo Quesada	342d934a0e	scheduler and macro fixes ... * kRepeatForever -> CC_REPEAT_FOREVER * schedule_selector -> CC_SCHEDULE_SELECTOR * [new] Node::schedule(const std::function<>& callback, const std::string &key) Updates all smaples	2014-10-03 09:38:36 -07:00
Dhilan007	02fcb6488a	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32 ... Conflicts: cocos/2d/libcocos2d.vcxproj.filters tests/cpp-tests/proj.win32/cpp-tests.vcxproj	2014-09-30 14:19:27 +08:00
minggo	804b26344e	fix warnings	2014-09-30 11:58:38 +08:00
Dhilan007	db45794625	fix macro	2014-09-30 09:57:28 +08:00
Dhilan007	7ebe4a5548	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32 ... Conflicts: cocos/audio/AudioEngine.cpp cocos/audio/apple/AudioPlayer.h cocos/audio/include/AudioEngine.h tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h	2014-09-30 09:45:47 +08:00
Ricardo Quesada	7a1dac5aa6	Fixes audio issues when using CMake on Mac	2014-09-29 14:07:11 -03:00