28 Commits

Author	SHA1	Message	Date
James Chen	dc7fcce0fe	Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum ... Conflicts: scripting/javascript/bindings/generated scripting/lua/cocos2dx_support/LuaCocos2d.cpp	2013-07-26 21:22:16 +08:00
James Chen	a73a4b9837	Merge pull request #3276 from dumganhar/constants-refactor ... Enumeration refactoring	2013-07-26 05:36:16 -07:00
Éloi Rivard	3ffc026c6c	Added some guards in file utils.	2013-07-26 14:19:20 +02:00
James Chen	2f8d3587bd	Platform::LINUX --> Platform::OS_LINUX, Platform::ANDROID --> Platform::OS_ANDROID. ANDROID is defined by ndk.	2013-07-26 18:17:30 +08:00
James Chen	ad1d8b667d	enum class for LanguageType, Application::Platform	2013-07-26 17:29:06 +08:00
minggo	0870581623	fix warnings	2013-07-26 15:22:45 +08:00
minggo	b36a4f1df0	issue #2430:use upper letters for enum item in Image	2013-07-25 23:09:18 +08:00
James Chen	35dec5d71e	More CCLog --> log.	2013-07-24 10:46:13 +08:00
James Chen	7bc6abfac7	Compilation error fixes, since CCLog has been renamed to 'log', all platforms should implement it.	2013-07-24 10:14:42 +08:00
James Chen	3bdf6b9c69	issue #2397: Mark Application::sharedApplication as deprecated function.	2013-07-15 16:37:38 +08:00
James Chen	759831c1d8	issue #2397: Application::sharedApplication --> Application::getInstance.	2013-07-15 16:24:42 +08:00
James Chen	d1527f39f5	issue #2397: FileUtils::sharedFileUtils() is not needed to be defined in CCFileUtilsXXX.cpp	2013-07-12 15:00:10 +08:00
James Chen	2c1b26acf8	issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance()	2013-07-12 13:11:21 +08:00
James Chen	a678d12615	issue #2397: FileUtils::sharedFileUtils --> FileUtils::getInstance() for all platforms	2013-07-12 12:03:39 +08:00
James Chen	88a28b041e	issue #2397: Director::sharedDirector --> Director::getInstance() for all files.	2013-07-12 11:50:36 +08:00
Sam Clegg	b5a509e65e	[NaCl] Don't cache font size ... This avoids churn of the cached font when different sizes of the same font are requested sequentially. Review URL: https://codereview.chromium.org/14308007	2013-06-20 12:56:13 -07:00
Sam Clegg	47878c1855	[NaCl] Remove legacy nacl_mounts usage. ... Also add nacl SDK version check to ensure the SDK contains a recent version of nacl_io.	2013-06-20 12:56:12 -07:00
Sam Clegg	40766006bd	[NaCl] Fix NaCl build which had been disabled. ... Since switching to C++11 the NaCL build was disabled. This re-enables the ARM configuration which uses a more recent version of gcc. This means that that NaCl code paths will at least be test until we can find a way to re-enable the X86 build.	2013-06-20 12:56:12 -07:00
James Chen	93b6328303	issue #2129: Removing CC prefix for cocos2dx module.	2013-06-20 14:13:12 +08:00
minggo	ccbd0a831d	issue #2304:use function to simplify acceremeter call back	2013-06-19 16:10:53 +08:00
James Chen	c0d44cb2e4	fixed #2129: Rename m_iVar to _var, remove CC prefixes.	2013-06-15 14:03:30 +08:00
James Chen	23f23be681	Bug fixes for Nacl port.	2013-05-10 16:02:12 +08:00
minggo	80dfd4d493	Merge pull request #2407 from sergey-shambir/attribute_format ... Added __attribute__(__format__()) for CCLog and CCString	2013-05-06 20:06:52 -07:00
James Chen	93a8b60111	If file path is an empty string, return false directly in CCFileUtils::isFileExist.	2013-04-25 21:51:13 +08:00
Sergey Shambir	e5b2f300f9	Added CC_FORMAT_PRINTF(x,y) macro to warn on CCLog() format errors ... Uses printf format. Enabled for GCC and clang.	2013-04-19 11:54:08 +04:00
Sam Clegg	04c1a863a0	Remove tailing newlines from CCLog messaages. ... Some CCLog message contained trailing newlines which made the logs hard to read on many platforms. The solution here is to stip trailing newlines on those platforms, and also to remove the newlines from the existing log messages.	2013-03-16 09:01:21 -07:00
Sam Clegg	4d0aa01c4b	Fix all gcc warnings in NaCl build.	2013-03-05 17:01:40 -08:00
Sam Clegg	33c422d1d5	Add new port: Native Client	2013-03-02 12:15:24 -08:00