Commit Graph

23479 Commits

Author SHA1 Message Date
yangxiao 6f0fc48e8e merge cocos2d 2014-08-15 16:36:17 +08:00
andyque 0517ceb0dc add scrollView nested tests 2014-08-15 16:21:27 +08:00
minggo 6d21420755 [ci skip] 2014-08-15 16:05:12 +08:00
yangxiao e2312bd353 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-08-15 15:55:32 +08:00
yangxiao 42916bcbe6 newmodel 2014-08-15 15:55:21 +08:00
XiaoYang 590fc0f160 Merge pull request #91 from liuliang2004/Meshv3
Modify the binary parsing
2014-08-15 15:50:39 +08:00
CocosRobot bdfc48b127 [AUTO]: updating luabinding automatically 2014-08-15 07:44:57 +00:00
minggo 725d935567 Merge pull request #7800 from CocosRobot/update_cocosfiles_1408088472
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-15 15:41:51 +08:00
CocosRobot 128d06076a [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-15 07:41:13 +00:00
CocosRobot 5cdccac843 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-15 07:36:03 +00:00
liuliang 4c8b24d113 Modify the binary parsing 2014-08-15 15:32:15 +08:00
minggo f2f8035724 Merge pull request #7708 from super626/obb
AABB, OBB
2014-08-15 15:32:14 +08:00
andyque 0e637b4d9f add swallow touch and propagation customization to UIWidgets 2014-08-15 15:28:28 +08:00
andyque cf8e40f8ce deprecated UICheckBox setSelectedState/getSelectedState, use isSelected/setSelected instead 2014-08-15 15:26:19 +08:00
minggo b842c57954 Merge pull request #7794 from minggo/seperate-jpg-tiff-webp
Seperate jpg tiff webp
2014-08-15 15:24:09 +08:00
minggo 2ad232795d Merge pull request #7796 from CocosRobot/update_lua_bindings_1408087287
[AUTO]: updating luabinding automatically
2014-08-15 15:23:38 +08:00
CocosRobot 24f0e8aada [AUTO]: updating luabinding automatically 2014-08-15 07:23:17 +00:00
minggo 8d69d4b05c [ci skip] 2014-08-15 15:20:05 +08:00
minggo 8364e179a4 Merge pull request #7780 from andyque/addOptionsForHardCodedValue
add customization to UIButton and UIPageView
2014-08-15 15:16:12 +08:00
minggo 965f4f8ef4 Merge pull request #7791 from xiangxw/fix_replaceAll
fix replaceAll()
2014-08-15 15:03:06 +08:00
minggo 64f6b9a8cc [ci skip] 2014-08-15 15:02:09 +08:00
minggo e59283343a Merge pull request #7751 from zawasp/win32_minimize
add minimize / restore for desktop (win32, linux, mac)
2014-08-15 15:00:13 +08:00
yangxiao 88bb1482e3 newmodel 2014-08-15 14:58:30 +08:00
minggo 11b4793d75 Merge pull request #7793 from dabingnn/v3_fixRandomCrashForPrimitive
fix android background and foreground crash for primitive
2014-08-15 14:56:49 +08:00
minggo 408472625c add CCModuleManager into CMakeLists.txt 2014-08-15 14:46:21 +08:00
minggo aa052eb1c1 add CCModuleManager into vs project 2014-08-15 14:39:15 +08:00
minggo bf75e9996a separate jpeg, tiff and webp 2014-08-15 14:29:10 +08:00
Huabing.Xu 5e7b75c5c7 fix android background and foreground crash for primitive 2014-08-15 14:05:17 +08:00
minggo 34ac767dc1 [ci skip] 2014-08-15 13:41:11 +08:00
minggo bcbb589cfb Merge pull request #7784 from Teivaz/v3
Fixed WP8 compilation errors
2014-08-15 13:39:05 +08:00
minggo 38fb58cf29 Merge pull request #7792 from minggo/fix-warning
fix warnings
2014-08-15 13:33:08 +08:00
minggo 3321d7ebf9 Merge pull request #7787 from samuele3hu/v3_3_module
Rename folder names of cpp-template ,adjust the template project except wp8 and add modules register functions for lua-template-runtime
2014-08-15 13:32:40 +08:00
yangxiao fdcec51cf4 struct for newmodel 2014-08-15 13:03:53 +08:00
minggo db17084b6d fix warnings 2014-08-15 12:06:16 +08:00
xiangxw 8b83419a32 fix replaceAll()
This function will never return if new_value contains old_value.
For example, old_value = "'", new_value = "''".
2014-08-15 11:48:33 +08:00
samuele3hu 76a9382a91 Rename folder names of cpp-template: ‘Classes’—>’src’ ,’Resource’—>’res’ and adjust the template project except wp8 2014-08-15 00:08:15 +08:00
samuele3hu 55180c63e4 Add modules register functions for lua-template-runtime on android 2014-08-14 23:22:24 +08:00
samuele3hu ef482037ff Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_module 2014-08-14 22:00:30 +08:00
samuele3hu 97d8d27eec Add LOCAL_WHOLE_STATIC_LIBRARIES for lua-template-runtime on android 2014-08-14 21:58:40 +08:00
minggo b3ceddcf8b Merge pull request #7786 from samuele3hu/v3_3_module
Make lua-template-default support all modules
2014-08-14 21:43:58 +08:00
samuele3hu 1976b66ab8 Make lua-template-default support all modules 2014-08-14 21:27:02 +08:00
teivaz 90e5870499 * Fixed WP compilation errors (added CCPrimitive, CCPrimitiveCommand, CCVertexIndexBuffer and CCVertexIndexData to the project) 2014-08-14 15:35:36 +03:00
teivaz 885fd16b9e * Fixed WP8 compilation error (Added missing files CCCamera.h/cpp to the project) 2014-08-14 15:20:48 +03:00
teivaz e9563696db * Fixed WP8 compilation errors (added path to CCGLView.h)
- Modified filters for CCCamera.h/cpp
2014-08-14 15:14:25 +03:00
yangxiao a508477eda remove unused code 2014-08-14 19:07:40 +08:00
yangxiao 2786e63824 Merge branch 'newcode' into obb 2014-08-14 18:58:46 +08:00
minggo 226ef019db Merge pull request #7783 from CocosRobot/update_cocosfiles_1408012564
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-14 18:44:26 +08:00
CocosRobot 2d4f23d9e8 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-14 10:36:05 +00:00
minggo 3f2fccb999 Merge pull request #7771 from samuele3hu/v3_3_module
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
2014-08-14 18:33:53 +08:00
minggo 1643c29a00 Merge pull request #7782 from liang8305/v3
mLastTickInNanoSeconds is the renderStart
2014-08-14 18:11:41 +08:00