minggo f63fad3e27 Merge branch 'v3.14' into merge-v314		2017-01-04 09:49:22 +08:00
..
project	Fixes broken of JS AssetsManagerTest. And updates https configuration of cpp-tests, js-tests for macOS. (#16970)	2016-12-08 10:40:22 +08:00
resjs	Fix tests for v3.12 web	2016-06-22 17:39:38 +08:00
src	Merge branch 'v3.14' into merge-v314	2017-01-04 09:49:22 +08:00
.cocos-project.json	…
TestCase.html	…
index.html	Fix tests for v3.12 web	2016-06-22 17:39:38 +08:00
main.js	Fix style issue in html page	2016-06-28 21:59:37 +08:00
mobilePage.html	Add js test case for fix, improve template	2015-12-03 16:55:15 +08:00
project.json	Adding performance.now() to cocos2d-js. (#16766)	2016-11-04 11:58:48 +08:00
style.css	Fix JS AssetsManagerTest and Improve scheduler wrapper (#16605)	2016-09-26 14:44:32 +08:00