13 Commits

Author	SHA1	Message	Date
Dale Stammen	7623ee390b	disable CURL and AssetsManager for Windows 10 UWP	2015-05-28 13:32:08 -07:00
samuele3hu	c3ad458a26	Update comment for Lua	2015-03-30 15:47:47 +08:00
minggo	3679d66c8e	remove unneeded includes	2014-08-29 15:39:52 +08:00
Huabing.Xu	c7bfc934fd	windows works now	2014-07-24 12:57:39 +08:00
minggo	c78ce63f14	use ThreadHelper::runOnGLThread() in AssetsManager	2013-11-28 11:06:08 +08:00
minggo	38eabaf315	fix warning	2013-11-14 14:09:12 +08:00
boyu0	fb04c9e574	issue #2770: fix some warning	2013-11-13 11:22:34 +08:00
James Chen	394f4e703b	Reverting AssetsManager::update.	2013-11-11 17:06:32 +08:00
boyu0	6c1144ee79	issue #2770: fix some warning	2013-11-11 12:49:38 +08:00
samuele3	790be0decc	issue #3037:Modify vs2012 config	2013-11-04 14:43:22 +08:00
samuelhu	be1f17ca0f	issue #3037:Add assetsmananger lua binding and a releated test sample	2013-10-22 16:14:49 +08:00
minggo	8f7a489a4d	issue #2905:make cocostudio and gui flat	2013-10-16 16:48:39 +08:00
minggo	f3f24e3bbd	issue #2905:use - to connect multiple words	2013-10-12 13:54:16 +08:00