Commit Graph

4525 Commits

Author SHA1 Message Date
lvlong 431378a41e commit for tony test 2014-06-24 14:10:03 +08:00
lvlong 2de28eea89 for tony 2014-06-24 13:40:04 +08:00
Huabing.Xu 740372ceb3 new version of rendering for tile map 2014-06-24 11:04:17 +08:00
minggo 76e2540fd7 Merge pull request #7163 from darkdukey/fixNodeReader
Fix NodeReader crash
2014-06-24 10:49:10 +08:00
minggo 4bb6545250 Merge pull request #7166 from boyu0/bug5541_rotation_action_for_physics
closed #5541: Add rotation action support for physics.
2014-06-24 10:46:10 +08:00
CocosRobot 879862b993 [AUTO]: updating luabinding automatically 2014-06-24 02:35:55 +00:00
boyu0 f2ecb31958 closed #5541: add more warning for unsupported functions. 2014-06-24 10:33:21 +08:00
minggo 66763bd400 Merge pull request #7180 from MSOpenTech/wp8-v3
WP8 v3 broken build fix
2014-06-24 10:31:56 +08:00
andyque 199ad9c623 issue #5161, replace deprecated methods 2014-06-24 10:18:01 +08:00
samuele3hu e34fcf05f6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix 2014-06-24 10:14:53 +08:00
samuele3hu 50f82ce1d0 Fix compile error for lua bindings in the different platforms 2014-06-24 10:12:32 +08:00
Zhou Yuntao 50a1449af9 fix a bug that Node::setScale(float) may not work properly if (_scaleX != _scaleY || _scaleX != _scaleZ) 2014-06-24 10:05:52 +08:00
andyque 312ab4f396 Merge branch 'v3' into feature5161
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
2014-06-24 09:51:18 +08:00
yangxiao ace56df74d batch sprite3D rendering 2014-06-24 09:27:10 +08:00
yangxiao c03ac80700 Sprite3D render batch, not finished 2014-06-23 23:58:45 +08:00
Dale Stammen 44d6248056 added missing cocoloader files 2014-06-23 08:31:29 -07:00
yangxiao c65e5d6872 simplify shader, bath sprite3D render 2014-06-23 19:08:26 +08:00
minggo fc7b42c0e5 Merge pull request #7157 from 2youyouo2/v3
update action timeline
2014-06-23 18:38:46 +08:00
andyque 7eae7625c1 Merge branch 'v3' into cleanupBinaryLoader 2014-06-23 18:30:03 +08:00
andyque d2680f2884 fix windows compile error 2014-06-23 18:29:23 +08:00
samuele3hu a339afb2c0 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix 2014-06-23 17:53:41 +08:00
samuele3hu b23e1384f6 Update the implementation of Lua bindings for `lua_cocos2dx_ListView_addScrollViewEventListener` 2014-06-23 17:42:04 +08:00
samuele3hu 9126608138 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_bug_fix 2014-06-23 17:30:24 +08:00
samuele3hu dce4c8a0a8 Add Lua bindings for `addScrollViewEventListener` of `ui.ListView` and related test cases 2014-06-23 17:29:56 +08:00
minggo 7ef217ee4d Merge pull request #7168 from andyque/fixListView
fix addEventListener hidden problem
2014-06-23 17:20:56 +08:00
andyque 3e5ab0ec8e fix linux compile error 2014-06-23 17:09:54 +08:00
andyque dcc650a6f8 fix android compile error 2014-06-23 17:04:59 +08:00
andyque ce58c2ddd6 remove unused header file 2014-06-23 16:53:06 +08:00
samuele3hu 0d7c453878 Fix the error that lua binding for create function of Sequence would lead to endless loop 2014-06-23 16:38:35 +08:00
andyque 808c4bd763 remove unused override method 2014-06-23 15:46:07 +08:00
andyque 93319f3a3b fix lua ui binding compile error 2014-06-23 14:56:41 +08:00
boyu0 c40c461848 closed #5541: add warning code and comment. 2014-06-23 13:55:52 +08:00
andyque c9bcbfb265 fix addEventListener hidden problem 2014-06-23 12:09:49 +08:00
lvlong e48982aeaa unsigned int -> size_t 2014-06-23 11:12:08 +08:00
lvlong 0ac6b8c96d 1.delete write function from bundle reader.
2.unsigned int -> size_t.
2014-06-23 11:10:03 +08:00
andyque 87455b0ecb add constness to some function 2014-06-23 10:12:54 +08:00
andyque 8a463e7964 remove Hungry style 2014-06-23 10:02:09 +08:00
andyque 5624da5448 Merge branch 'v3' into cleanupBinaryLoader
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.h
	cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
2014-06-23 09:37:39 +08:00
yangxiao c92ba3f3dc Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-23 09:32:59 +08:00
lvlong 75f1ef5288 modify warning 2014-06-23 09:23:09 +08:00
yangxiao 92da41694d Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-23 09:05:03 +08:00
Timur Losev 196a924f89 - Due to the fact that map::insert doesn't allow to insert an element by existing key, I suggest to use operator []. It allows to change the
cached value, very helpful on Android platform: when context is lost, the application will reset - rebuild - recache all it's shaders.
2014-06-22 20:53:01 +03:00
lite3 e3eb5aeddd put duplicate code to processResponse 2014-06-22 12:37:23 +08:00
lite3 ebbcb3ea33 change immediateSend to sendImmediate 2014-06-22 11:39:39 +08:00
lite3 cb42f549ce fix: request will be delete in thread. 2014-06-22 00:08:02 +08:00
lite3 758a1f5dc4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-21 17:34:11 +08:00
Nite Luo 21330860a9 Fix NodeReader will crash when encountered unknown NodeType 2014-06-20 17:24:34 -07:00
Dale Stammen 5e1f0b5799 added missing files and tests that broke wp8 build 2014-06-20 09:07:51 -07:00
Dale Stammen 83c5b7bdb0 updated wp8 precompiled shaders 2014-06-20 09:07:29 -07:00
yangxiao 2a6dfaf91b Merge branch 'newcode' into v3 2014-06-20 22:55:27 +08:00
yangxiao 1e319bc1f8 fix compile bug 2014-06-20 22:38:09 +08:00
yangxiao 1581396810 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-20 18:54:34 +08:00
yangxiao 3096979b1f rename createSubAnimate3D to create 2014-06-20 18:54:09 +08:00
XiaoYang 2371e8e6ae Merge pull request #38 from lvlonggame/v3
binary loader
2014-06-20 18:46:52 +08:00
boyu0 2fc8889791 issue #5541: change RotateTo/RotateBy for Physics. 2014-06-20 18:40:21 +08:00
Huabing.Xu bb4128036c use quad command for tile map rendering 2014-06-20 18:10:18 +08:00
yangxiao c5e562106f Animate3D support spawn 2014-06-20 17:55:25 +08:00
lvlong 478ea8949a Merge branch 'v3' of https://github.com/lvlonggame/cocos2d-x into v3
Conflicts:
	tools/bindings-generator
	tools/cocos2d-console
2014-06-20 16:14:46 +08:00
lvlong 69436ddd65 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Conflicts:
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
	cocos/3d/CCBundle3DData.h
2014-06-20 16:02:22 +08:00
lvlong e4bbfad773 1. binary loader is OK.
2. add some comment.
2014-06-20 15:30:08 +08:00
andyque 9b945683b5 fix contentSize not set properly problem 2014-06-20 14:55:42 +08:00
andyque 5f5b705bee refactor setSize to setContentSize and deprecated the old interface 2014-06-20 14:03:33 +08:00
yangxiao f633c6a8c2 create sub Animate3D 2014-06-20 12:01:54 +08:00
yinkaile 1aa07906a1 add new line at the end of the file 2014-06-20 11:36:48 +08:00
yinkaile aac4ded898 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-20 11:24:12 +08:00
yinkaile 510bc23b16 1.fixed action may shake a little
2.fixed frame event will emit even they do not in current play section
2014-06-20 11:23:26 +08:00
andyque 4ca184b58a issue #5161, deprecated getSize 2014-06-20 11:18:53 +08:00
yinkaile 043c640037 fixed warning and logic error 2014-06-20 10:52:14 +08:00
zhangbin ec62f05b12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-20 10:51:13 +08:00
zhangbin 0019d9a061 Optimize the win32 projects configuration. 2014-06-20 10:50:43 +08:00
andyque 585ccf2c71 issue #5161, replace all _size to _contentSize 2014-06-20 10:40:16 +08:00
Mazyad Alabduljaleel 433dc140cd CCLOGINFO compilation fix 2014-06-19 20:59:08 +04:00
minggo 9f0a566b8a Merge pull request #6945 from John-He-928/mingw-build
Fix MinGW build
2014-06-19 22:08:28 +08:00
lite3 77210d60ae fix: can not create networkThread at second create HttpClient. 2014-06-19 22:07:24 +08:00
minggo e374bd67c7 Merge pull request #6946 from hanjukim/skip-utf8-bom
Skip UTF8 BOM if it exists and bug fix for unterminated string
2014-06-19 22:02:38 +08:00
CocosRobot a3bee308f6 [AUTO]: updating luabinding automatically 2014-06-19 13:24:36 +00:00
minggo 0d07e19cd1 Merge pull request #7054 from 2youyouo2/v3
add TimelineAction
2014-06-19 21:05:15 +08:00
minggo 190d6d4859 Merge pull request #7136 from CocosRobot/update_lua_bindings_1403162482
[AUTO]: updating luabinding automatically
2014-06-19 20:56:10 +08:00
minggo cdbd3508d4 Merge pull request #7139 from zawasp/uniform_struct
fix warning Uniform is struct, not class.
2014-06-19 20:55:37 +08:00
lite3 05df5b8e14 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-19 19:54:09 +08:00
gin0606 79f82b00bc Add new line at the end of a file to *.mm 2014-06-19 20:48:50 +09:00
gin0606 3ae8e29ce5 Add new line at the end of a file to *.h 2014-06-19 20:45:49 +09:00
gin0606 bf4f30d14b Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
Huabing.Xu f82be936b5 Merge branch 'fast_tmx_copy' into fast_tmx
Conflicts:
	cocos/2d/CCFastTMXLayer.cpp
2014-06-19 18:10:44 +08:00
Huabing.Xu e03c412e71 refactor fast tmx rendering 2014-06-19 18:05:21 +08:00
andyque 4d64b166cc refactor - replace magic string with const string 2014-06-19 17:04:14 +08:00
Mircea Rila 69f1bb6193 fix warning Uniform is struct, not class. 2014-06-19 11:46:00 +03:00
boyu0 5f10ff2c29 issue #4437: change name TMXLayer2 and TMXTiledMap2 to FastTMXLayer and FastTMXTiledMap, change Point to Vec2 2014-06-19 15:57:13 +08:00
lvlong 8493c4579b before switch branch save 2014-06-19 15:43:02 +08:00
CocosRobot c638cb8816 [AUTO]: updating luabinding automatically 2014-06-19 07:22:49 +00:00
andyque a26ef87783 cleanup reader code 2014-06-19 15:16:56 +08:00
minggo 136033c282 not set _orderOfArrival to 0 after visit 2014-06-19 15:09:27 +08:00
andyque 515de9eda5 remove magic string of widget json reader 2014-06-19 14:40:24 +08:00
2youyou2 0ce51162af support Label widget 2014-06-19 14:11:37 +08:00
yangxiao c5bb10e5f4 add comments 2014-06-19 14:11:14 +08:00
samuele3hu 3a350e11ae Add Lua binding for Animation3D and Animate3D ,and add related test case 2014-06-19 14:05:38 +08:00
子龙山人 e1095c4f09 Merge pull request #9 from geron-cn/guanghuiv3
Guanghuiv3
2014-06-19 13:38:53 +08:00
yangxiao 4db0bea73f bone original pose 2014-06-19 12:01:03 +08:00
minggo e60e3c217d Merge pull request #7046 from Dhilan007/v3-label-improve
1.Support setting up the line height and additional kerning of label.
2014-06-19 09:44:51 +08:00
geron-cn 6abc9aba0e add binary read to test-cpp 2014-06-18 20:09:12 +08:00
andyque b55b95adc3 fix linux compile error 2014-06-18 18:28:31 +08:00
andyque 20b41d2886 fix android compile error 2014-06-18 18:25:31 +08:00
boyu0 d89c2176c3 issue #4437: add vertex z support, fix some bugs. 2014-06-18 18:19:13 +08:00
Dhilan007 9351172baf add test case for new API of Label. 2014-06-18 18:01:55 +08:00
geron-cn 5cfbd3a2bd add binary decode to armature 2014-06-18 17:43:13 +08:00
yangxiao 9eaff7465d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-18 17:17:33 +08:00
yangxiao 052b4fa1ce bone origin matrix 2014-06-18 17:16:54 +08:00
zhangbin 1b056b6c49 Remove the debug symbols for release mode in xcode projects.
Modify the template of lua runtime.
2014-06-18 17:06:56 +08:00
andyque 9398395de8 fix custom property 2014-06-18 16:19:24 +08:00
andyque 1533374bd1 add ui animation for binary parsing 2014-06-18 15:55:01 +08:00
andyque aa5df68b96 Merge branch 'v3' into cleanupBinaryLoader
Conflicts:
	cocos/3d/CCAnimationCurve.h
	cocos/3d/CCAnimationCurve.inl
2014-06-18 15:13:34 +08:00
子龙山人 0b677a86d7 Merge pull request #8 from geron-cn/guagnhuiv3
Guagnhuiv3
2014-06-18 14:47:11 +08:00
andyque 63475a6f81 refactor Loader 2014-06-18 14:44:00 +08:00
geron-cn 12bb7564cd fix cannot compile in windows 2014-06-18 14:35:43 +08:00
2youyou2 b323f5772e optimize frame 2014-06-18 14:21:33 +08:00
andyque 615995af54 add base property parser for WidgetReader 2014-06-18 14:15:11 +08:00
minggo a587931ce3 Merge pull request #7115 from minggo/windows-fix
fix compiling error on windows
2014-06-18 14:14:39 +08:00
CocosRobot 155638f2de [AUTO]: updating luabinding automatically 2014-06-18 06:10:38 +00:00
minggo d6776b664a fix compiling error on windows 2014-06-18 14:01:57 +08:00
minggo 08453b911d Merge pull request #7071 from pandamicro/Script_onEnter_fix
Fixed #5563: Wrap override onEnter function by script call detection code to solve bugs in JSB
2014-06-18 13:37:57 +08:00
pandamicro 950894de80 Fixed #5563: Fix include issue 2014-06-18 12:47:48 +08:00
andyque 95f1bd7e72 update loader 2014-06-18 11:54:25 +08:00
pandamicro 94fdff1da9 Fixed #5563: Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport 2014-06-18 11:51:52 +08:00
CocosRobot d58d36d1c8 [AUTO]: updating luabinding automatically 2014-06-18 03:44:06 +00:00
minggo 6ecca08340 Merge pull request #7039 from minggo/get-child-by-name
issue #4693: add getName(), setName() and getChildByName()
2014-06-18 11:30:14 +08:00
minggo 246d6f12c9 Merge pull request #7047 from samuele3hu/v3_keypad_fix
Resolve the compile warning for Lua bindings project
2014-06-18 11:29:54 +08:00
minggo bd499d4bd6 Merge pull request #7003 from andyque/back_compatible_fix
fix KeyCode back compatible
2014-06-18 11:29:02 +08:00
andyque 2cef0cb437 update ccs-res 2014-06-18 11:26:26 +08:00
2youyou2 719fdb712d add frame event test 2014-06-18 11:22:38 +08:00
andyque ca24ad6768 Merge branch 'v3' into cleanupBinaryLoader 2014-06-18 11:19:19 +08:00
minggo f05eb9532d fix compiling error 2014-06-18 11:11:08 +08:00
minggo 8a0a6a2ded Merge pull request #7064 from kyokomi/TextReader_filePath_fix
Fix bug for TextReader #setFontName.
2014-06-18 10:36:29 +08:00
minggo 7589bc7b40 Merge pull request #7068 from kyokomi/UIButton_ttfFont
Fix UIButton.cpp added TTFFont.
2014-06-18 10:32:46 +08:00
Dale Stammen da9a652868 added missing files to project 2014-06-17 09:27:36 -07:00
Dale Stammen 6fcf43e64d #undef NEAR reserved word for WP8 and WinRT 2014-06-17 09:27:19 -07:00
CocosRobot 22e1d69f9f [AUTO]: updating luabinding automatically 2014-06-17 13:24:08 +00:00
minggo 26cca348cb Merge pull request #7085 from super626/v3
Sprite3D animation
2014-06-17 21:05:58 +08:00
yangxiao 1ba59fba94 code adjustment according to minggo 2014-06-17 19:18:56 +08:00
minggo 552c3cbb2f [ci skip] 2014-06-17 18:42:10 +08:00
minggo 4da24dfade issue #4693: correct comment 2014-06-17 16:21:24 +08:00
kyokomi b6ed783b0b fix use raw char* to represent string. 2014-06-17 17:05:44 +09:00
2youyou2 806d74b6f9 add change play section test 2014-06-17 15:57:30 +08:00
2youyou2 c221a59954 fixed frame's value not right when enter frame 2014-06-17 15:57:06 +08:00
kyokomi 3f7cecaf8b fix move this enum class to private part and change `Type` to `FontType`. 2014-06-17 16:34:54 +09:00
yangxiao e1fb8c82f0 missing include 2014-06-17 15:31:45 +08:00
yangxiao 6c39dc0e18 adjust includes 2014-06-17 15:28:14 +08:00
lvlong c1fd9adebf Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-17 13:59:25 +08:00
lvlong ef32bffceb modify bundle3D load() 2014-06-17 13:59:03 +08:00
CocosRobot 657b90422d [AUTO]: updating luabinding automatically 2014-06-17 05:53:04 +00:00
yangxiao fd02a914f4 remove unused code 2014-06-17 13:50:58 +08:00