Commit Graph

23428 Commits

Author SHA1 Message Date
liuliang 06dfaf9db5 Modify change interface 2014-08-19 14:21:48 +08:00
liuliang 9d3bab3810 Modification is compatible with the old model 2014-08-19 14:03:41 +08:00
yangxiao 5cf30a363c remove unused code 2014-08-19 13:54:06 +08:00
yangxiao 289b04a2ae merge cocos2d 2014-08-19 13:19:42 +08:00
yangxiao b2d43a4167 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-08-19 11:56:21 +08:00
yangxiao f2729c7ef2 cache work 2014-08-19 11:56:09 +08:00
xiangxw bef6a2a7f1 fix sendPrompt()
a extra '\0' will be sent when sizeof() is used
2014-08-19 11:46:30 +08:00
andyque 8d1c422ac5 merge extension EditBox to ui module 2014-08-19 10:28:24 +08:00
minggo de004e80c2 [ci skip] 2014-08-19 09:53:18 +08:00
minggo dd1bc70cde Merge pull request #7271 from newnon/v3_getPreviousLocation_fix
bug on began touch - prevpoint
2014-08-19 09:49:01 +08:00
minggo b25ddb8935 Merge pull request #7814 from Teivaz/v3
Fixed WP8 cocos library project and profiling macros
2014-08-19 09:31:20 +08:00
teivaz ebb0876d29 * [WP8] Fixed resource search path in template 2014-08-19 21:44:46 +03:00
teivaz 5cdbf4c04c * [WP8] Fixed paths in template 2014-08-19 19:57:06 +03:00
teivaz db805ee2c8 * Fixed WP8 cocos library project
* Fixed profiling macros
2014-08-19 19:24:56 +03:00
minggo b45c2e9b12 Merge pull request #7813 from CocosRobot/update_lua_bindings_1408375483
[AUTO]: updating luabinding automatically
2014-08-18 23:28:32 +08:00
CocosRobot 4236e89245 [AUTO]: updating luabinding automatically 2014-08-18 15:26:32 +00:00
minggo 38fdef614a Merge pull request #7797 from andyque/addOptionsForWidgetEventHandling
add swallow touch and propagation to parent widgets customization
2014-08-18 23:16:22 +08:00
minggo 02593a0efe Merge pull request #7812 from CocosRobot/update_cocosfiles_1408373738
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-18 22:57:33 +08:00
minggo 36113c65ac [ci skip] 2014-08-18 22:56:47 +08:00
CocosRobot 218cee5e05 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-18 14:55:40 +00:00
minggo fae0ba41ec Merge pull request #7811 from CocosRobot/update_lua_bindings_1408373119
[AUTO]: updating luabinding automatically
2014-08-18 22:50:13 +08:00
minggo ea5c07fba4 Merge pull request #7810 from CocosRobot/update_cocosfiles_1408373019
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-18 22:48:27 +08:00
CocosRobot 85d505b427 [AUTO]: updating luabinding automatically 2014-08-18 14:47:35 +00:00
CocosRobot 94b45d55ef [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-18 14:43:41 +00:00
minggo 22fa650bbf Merge pull request #7807 from samuele3hu/v3_3_3d_module
Split 3d module from cocos2d and adjust related cpp and Lua project setting on the different platforms except wp8
2014-08-18 22:38:58 +08:00
XiaoYang 638e8e7f5a Merge pull request #103 from lvlonggame/merge-bundle
Merge bundle
2014-08-18 20:30:17 +08:00
lvlong 43bc54b134 delete empty line 2014-08-18 20:28:59 +08:00
lvlong 2b70cf3dd8 Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle 2014-08-18 20:22:56 +08:00
lvlong 9c25139895 animation & animations 2014-08-18 20:22:18 +08:00
samuele3hu f36e7c6617 Add register_cocos3d_module for lua template 2014-08-18 19:46:11 +08:00
samuele3hu 22a48fb760 Update cpp and lua template to support cocos3d lib 2014-08-18 19:23:03 +08:00
yangxiao d5df1f3ab2 forget return true 2014-08-18 18:56:01 +08:00
yangxiao d6ed1af1f7 compute submesh aabb error 2014-08-18 18:34:18 +08:00
minggo 2f2ee43b21 Merge pull request #7808 from 2youyouo2/v3
fixed ArmatureAnimation::setSpeedScale
2014-08-18 18:19:23 +08:00
lvlong da26fa3ca5 Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle 2014-08-18 18:04:44 +08:00
lvlong 7311d5139b add VERTEX_ATTRIB_TEX_COORD1 2014-08-18 18:02:58 +08:00
yangxiao 3fd122391c reset sprite3dtest 2014-08-18 18:01:57 +08:00
yangxiao b9c28dd8d7 return true 2014-08-18 17:57:14 +08:00
yangxiao 2f600f8af4 fix bundle mac 2014-08-18 17:52:27 +08:00
XiaoYang 62cc890abe Merge pull request #102 from liuliang2004/Meshv3
Modified binary load model, compatible with the old format
2014-08-18 17:39:48 +08:00
liuliang ee4e4ca455 Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3
Conflicts:
	cocos/3d/CCBundle3D.cpp
2014-08-18 17:39:28 +08:00
liuliang e151b207a4 Modified binary load model, compatible with the old format 2014-08-18 17:31:04 +08:00
yangxiao 01c1691a4f deal aabb 2014-08-18 17:02:13 +08:00
minggo e2829cd68a Merge pull request #7802 from SmartCat/v3
- added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32
2014-08-18 16:56:15 +08:00
kaile.yin 6abaf27b14 fixed ArmatureAnimation::setSpeedScale 2014-08-18 16:19:54 +08:00
samuele3hu 91fd40dd3a Add a newline for some files 2014-08-18 15:27:54 +08:00
samuele3hu cb3f20ed47 Remove lib search paths for libcocos3d 2014-08-18 15:16:57 +08:00
samuele3hu 2d8ae3a917 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_3d_module 2014-08-18 15:08:04 +08:00
samuele3hu e0168c373c Add manual lua bindings for 3d and adjust related test case on different platform 2014-08-18 15:04:32 +08:00
samuele3hu e3149ce41a Split lua bindings for 3D from cocos2d 2014-08-18 15:00:40 +08:00