213 Commits

Author	SHA1	Message	Date
samuele3hu	7ca207f993	Replace `LabelTTF` and `LabelBMFont` with `Label` for cocosbuild proxy and fix the error that ControlSwitch:create raised.	2014-03-28 17:18:41 +08:00
andyque	57d8f155df	issue #4401. resolve conflicts	2014-03-26 14:54:50 +08:00
minggo	dfb3b6719c	Merge pull request #5818 from boyu0/support_for_xcode_iphone_64bit_simulator ... build lua.a for arm64bit and iOS simulator 64 bit architectures, change ...	2014-03-15 01:22:28 +08:00
boyu0	f23db68151	build lua.a for arm64bit and iOS simulator 64 bit architectures, change .ma3 files to .caf files.	2014-03-15 01:19:06 +08:00
samuele3hu	a05d6a55e2	fix: Make Close Menu invisible for iOS platform	2014-03-14 17:38:58 +08:00
samuele3hu	4aef65d4b7	fix the error that AssetManager test case can’t find correct resource path	2014-03-14 09:48:48 +08:00
samuele3hu	9713a246ee	Replace cc.LabelBMFont:create with cc.Label:createBMFont	2014-03-12 18:33:28 +08:00
samuele3hu	1c32c6d96f	Replace cc.LabelTTF:create with cc.Label:create	2014-03-12 17:51:34 +08:00
samuele3hu	d06bb83f19	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix ... Conflicts: tests/lua-tests/src/CocoStudioTest/CocoStudioArmatureTest/CocoStudioArmatureTest.lua	2014-03-12 14:33:39 +08:00
samuele3hu	9c95c1e456	Replace cc.LabelTTF:create with cc.Label:create	2014-03-12 14:27:52 +08:00
James Chen	4a55e98adf	[lua] Reverts 'removing tolua.cast in test case, I don't know why it was re-added.	2014-03-12 14:06:57 +08:00
andyque	0634a1accd	fix lua resource path	2014-03-12 10:19:41 +08:00
James Chen	b88de91a15	Renames 'samples' folder to 'tests', ouch....	2014-03-11 19:10:34 +08:00