Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,519 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

4195 Commits

Author SHA1 Message Date
pandamicro b9968a9dca Merge pull request #13038 from ZhangMenghe/shaderTestCase 
Fix OpenGL testcase 'center' uniform error
 2015-07-28 09:34:09 +08:00
jianglong0156 cb2b427eed add Physics3DRigidBodyDes support new , add new file jsb_cocos2dx_3d_conversions.h and jsb_cocos2dx_3d_conversions.cpp 2015-07-27 18:19:10 +08:00
jianglong0156 9c6b5730d0 add Physics3DPointToPointConstraint support new 2015-07-27 16:02:13 +08:00
Zhang Menghe a96ea2342a Update OpenGLTest.js 2015-07-27 15:53:48 +08:00
pandamicro 3cc039b063 Merge pull request #13036 from fusijie/fix_12505 
fix shader-basic testcase 'center' uniform error.
 2015-07-27 15:40:44 +08:00
ZhangMenghe 232f738bf7 Fix OpenGL testcase 'center' uniform error 2015-07-27 15:08:07 +08:00
jianglong0156 1be5981d6a add Physics3DComponent support new 2015-07-27 14:26:50 +08:00
fusijie f8de67a0c4 fix shader-basic testcase 'center' uniform error. 2015-07-27 14:18:17 +08:00
子龙山人 7f383f961a Merge pull request #13026 from fusijie/fix_13025 
fix 13025 wild pointer.
 2015-07-27 13:38:38 +08:00
XiaoFeng f410fcd737 Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968 2015-07-27 11:55:18 +08:00
子龙山人 bd0bdae530 Merge pull request #12993 from WenhaiLin/v3.8-label-layout-refine 
Label:refine the implementation about text layout and support debug draw.
 2015-07-27 11:10:31 +08:00
jianglong0156 d51f0b1f05 add animate support new 2015-07-27 10:51:53 +08:00
fusijie f2f425d19c fix 13025 wild pointer. 2015-07-27 10:39:31 +08:00
jianglong0156 e25c4f88ae add animation3d support new to create 2015-07-27 10:31:35 +08:00
pandamicro c16cab7e53 Merge pull request #13015 from VisualSJ/v3.7.1-12940 
[ci skip] Moveing ActionTimeline tests
 2015-07-25 14:44:10 +08:00
VisualSj a0bf2c782f Moveing ActionTimeline tests 2015-07-25 14:37:56 +08:00
VisualSj c49053fce4 Moveing ActionTimeline tests 2015-07-25 14:37:44 +08:00
pandamicro 9615545e11 Merge pull request #12890 from jianglong0156/FileUtilsJSB 
[ci skip]add fileUtils writeString,writeValueMap,writeValueVector in jsb
 2015-07-25 14:16:14 +08:00
jianglong0156 c14ca98203 set file name to label.change the file dir 2015-07-25 14:04:41 +08:00
pandamicro 7ae3dd12a1 Merge pull request #12995 from fusijie/fix_12505 
fix blur shader compliant on win8 universal.
 2015-07-25 12:42:35 +08:00
pandamicro fa46a0abb4 Merge pull request #12992 from yangws/v3.7.1 
Fixed #12962 : Scene can't have std::vector member.
 2015-07-25 09:52:00 +08:00
pandamicro a666658764 Merge pull request #12998 from pandamicro/v3.7.1 
Add BoneNode/SkeletonNode/SkinNode JS bindings
 2015-07-24 23:42:38 +08:00
WenhaiLin a1e682ca65 Improves the test to reproduce issue 12996 2015-07-24 21:34:59 +08:00
fusijie 647848e843 fix blur sprite shader on win8 universal. 2015-07-24 21:04:44 +08:00
pandamicro 05bb775438 Sync timelineParser and fix issue 2015-07-24 20:16:56 +08:00
VisualSj 09550ff742 Issue #12997: Add JS test case (ccs.BoneNode) 2015-07-24 15:57:36 +08:00
VisualSj 64d247d91b Issue #12997: Add JS test case (ccs.BoneNode) 2015-07-24 15:45:19 +08:00
fusijie bd0a57242b refine blur shader test case. 2015-07-24 13:52:40 +08:00
fusijie d550dace35 fix blur shader compliant on win8 universal. 2015-07-24 12:47:38 +08:00
geron-cn 0b09fd5bcb Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h
 2015-07-24 11:38:09 +08:00
Vincent Yang e4a8aeee45 Fixed #12962 : Scene can't have std::vector member. 2015-07-24 11:16:45 +08:00
Dale Stammen 6669fec648 added missing bug test 2015-07-23 12:34:37 -07:00
pandamicro 5f57fa942f Merge pull request #12802 from ZhangMenghe/pageTurnDown 
Page turn down
 2015-07-23 18:10:53 +08:00
Vincent Yang 35040e7bb1 Fixed #12249 : Button touch doesn't work with setScale9Enabled. 2015-07-23 17:27:04 +08:00
zhangcheng 012053e163 replace space to tab. 2015-07-23 17:04:08 +08:00
zhangcheng 4b8248c015 Optimization of Custom Data. 
replace ComExtensionData to ObjectExtensionData.
 2015-07-23 16:30:23 +08:00
geron-cn 7255b5308b config for mac 2015-07-23 15:13:14 +08:00
geron-cn d46c8c6802 add lack file 2015-07-23 15:12:09 +08:00
geron-cn 915cefa208 bone node 2015-07-23 11:51:49 +08:00
Ricardo Quesada b2b9bad83d improves the test to reproduce bug 12847 2015-07-22 15:08:36 -07:00
pandamicro 6029ca3edd Merge pull request #12949 from yangws/issue_12906 
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
 2015-07-22 16:17:14 +08:00
Liam 99c1c33c61 update resource 2015-07-22 15:56:35 +08:00
pandamicro 741163db40 Merge pull request #12938 from WenhaiLin/v3.8-deps70 
Update deps for support FullType.
 2015-07-22 15:42:13 +08:00
pandamicro e0e5ae9d99 Merge pull request #12924 from liamcindy/SkyBox_3.7.1 
update for Game3DNodeReader & UserCameraReader
 2015-07-22 15:34:18 +08:00
子龙山人 bb9500769f Merge pull request #12885 from zilongshanren/add-jumpToPage-api 
Fix PageView scrollToPage bug and the curPageIndex bug
 2015-07-22 15:01:57 +08:00
pandamicro dbaf00bca6 Merge pull request #12950 from fusijie/add_texturecoord_bug_test 
add sprite frame flash line bug test case.
 2015-07-22 14:32:26 +08:00
fusijie 92e68cd9dc add sprite frame flash line bug test case. 2015-07-22 13:42:10 +08:00
Vincent Yang 3addf38134 Fixed #12906 : Can't add custom member to cocos2d::Scene subclass. 2015-07-22 12:01:34 +08:00
ZhangMenghe b6c566d87e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into setClearColor 2015-07-22 11:40:30 +08:00
子龙山人 8a8a089ad6 Merge pull request #12947 from zilongshanren/updateCcs-res-submodule 
[ci skip]update ccs-res submodule
 2015-07-22 10:46:02 +08:00
pandamicro f0962669a9 Merge pull request #12946 from pandamicro/v3 
[ci skip] Gen bindings for v3.7.1 branch
 2015-07-22 10:45:23 +08:00
andyque fbfb3a9dac update ccs-res submodule 2015-07-22 10:45:18 +08:00
pandamicro c260783fd0 [JS] Revert const to var to avoid issues on web compilation 2015-07-21 18:23:57 +08:00
WenhaiLin 979a9be1f5 Add test case for test font supported by FullType. 2015-07-21 17:09:27 +08:00
ZhangMenghe 2e72179b91 Remove a space 2015-07-21 15:22:03 +08:00
ZhangMenghe 94aa382669 Add testCase for setClearColor 2015-07-21 15:18:19 +08:00
ZhangMenghe 61e36463cc Modify a space 2015-07-21 14:00:59 +08:00
ZhangMenghe 3c2d68e25c Modify the testcase with coding standards 2015-07-21 13:48:08 +08:00
pandamicro d478c5f8a8 Merge pull request #12923 from ZhangMenghe/ModifytestCase 
Modify testCase for UITextFieldTest
 2015-07-21 12:53:26 +08:00
pandamicro 85d4ce0d5a Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
	docs/RELEASE_NOTES.md
	tools/cocos2d-console
	tools/tojs/cocos2dx.ini
 2015-07-21 11:39:24 +08:00
pandamicro 641ff2abf4 Merge pull request #12914 from WenhaiLin/v3.8-label-bmfont-opacity 
Label:Fixed opacity setting is invalid with bitmap font.
 2015-07-20 18:02:49 +08:00
ZhangMenghe 14c1862f7e Modify testCase for UITextFieldTest 2015-07-20 18:01:41 +08:00
WenhaiLin 63326c2826 Label:Fixed opacity setting is invalid with bitmap font. 2015-07-20 11:10:17 +08:00
yangxiao beda48124c merge cocos 2015-07-17 17:54:00 +08:00
yangxiao ef49e5a169 merge cocos 2015-07-17 17:43:32 +08:00
子龙山人 22ef262295 Merge pull request #12894 from zilongshanren/fixXcode5Warning 
fix xcode 5.1.1 warnings
 2015-07-17 17:33:13 +08:00
子龙山人 309b563c5b Merge pull request #12896 from yangws/v3 
[ci skip] Fix bug: the Back button in Node: UI->UIEditBoxTests click area has p…
 2015-07-17 15:57:19 +08:00
Vincent Yang f9e90f31f6 Fix bug: the Back button in Node: UI->UIEditBoxTests click area has positoin offset. 2015-07-17 15:52:58 +08:00
andyque 8c31d70211 fix xcode 5.1.1 warnings 2015-07-17 15:20:49 +08:00
jianglong0156 7f0167785d add back label 2015-07-17 13:46:00 +08:00
jianglong0156 c844a77786 add fileUtils writeString,writeValueMap,writeValueVector 2015-07-17 12:04:47 +08:00
fusijie d828c030cb remove CCClippingRectangleNode transform error support. 2015-07-17 11:56:23 +08:00
子龙山人 89e5307f0c Merge pull request #12867 from WenhaiLin/v3.8-label-letter-color 
Label:Fixed the color of letter will be overridden by fade action.
 2015-07-17 11:29:58 +08:00
yangxiao bf20145e35 animate3d callback and test 2015-07-17 11:08:27 +08:00
WenhaiLin a6f8031af9 Label:support font that contains GB2312 char map.[except android] 2015-07-16 17:10:05 +08:00
andyque 96f6c44281 fix auto scrolling and curPageIdx issue 2015-07-16 16:50:47 +08:00
WenhaiLin d5d5af5ac3 change ‘auto’ to ‘auto&&’ 2015-07-16 14:08:59 +08:00
子龙山人 40f4e0b27b Merge pull request #12864 from zilongshanren/add-jumpToPage-api 
add setCurPageIndex API to PageView.
 2015-07-16 13:56:05 +08:00
andyque 517221a0df add jumpToPage API to PageView. 
1. This commit also fix the default font size issue in ui::Button.
 2015-07-16 11:33:57 +08:00
WenhaiLin 1c9a181c35 Label:Fixed the color of letter will be overridden by fade action. 2015-07-15 20:17:05 +08:00
songchengjiang 282dc23bb2 modify interfaces of Animate3DCallback 2015-07-15 17:34:14 +08:00
pandamicro bcd20b1bf0 Merge pull request #12861 from pandamicro/v3 
Sync Cocos2d-x v3.7 RC1
 2015-07-15 17:16:44 +08:00
pandamicro 99e504e668 Merge pull request #12854 from yangws/issue_11310 
fixed #11310 : multiple camera case utils::captureScreen bug.
 2015-07-15 15:00:29 +08:00
pandamicro 436564f922 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	docs/RELEASE_NOTES.md
	web
 2015-07-15 14:39:40 +08:00
andyque 2f31f6baa6 fixed Scale9Sprite gray state issue. 
When call `setCapInsets`, the Scale9Sprite's inner sprite will be
rebuild and it's state will be lose.

This commit reset the shader state.
 2015-07-15 14:35:13 +08:00
Vincent Yang 7a105ce1e1 fixed #11310 : multiple camera case utils::captureScreen bug. 2015-07-15 12:09:08 +08:00
andyque e4cad50c2f fix tons of warnings 2015-07-15 12:04:48 +08:00
songchengjiang 6c83e8d81c Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
 2015-07-15 11:13:27 +08:00
pandamicro efffea5b91 Fixed #12834 Invoke cleanup function when override in JS 2015-07-14 15:35:29 +08:00
andyque 91dfb07a8c add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08:00
andyque ef5d4ddf86 Merge remote-tracking branch 'upstream/v3' into v3 
# Conflicts:
#	tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
 2015-07-14 11:24:38 +08:00
Vincent Yang 0589c14302 Restructure CCFileUtils class, move platform related functions to CCFileUtilsXXX. 
Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.
 2015-07-14 09:44:36 +08:00
andyque fc673ee502 Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
Vincent Yang 74227eaf16 Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test. 2015-07-13 22:44:40 +08:00
子龙山人 cdc7e5205b Merge pull request #11995 from MAUSMAUSgames/v3 
using Action::_tag as flag field
 2015-07-13 22:19:03 +08:00
子龙山人 c151ba89e5 Merge pull request #12774 from WenhaiLin/v3-label-createfail 
Label:Fixed create fail if the font(TTF) not contain a Unicode charmap.
 2015-07-13 21:58:39 +08:00
子龙山人 db71e073dd Merge pull request #12742 from WenhaiLin/v3-audioengine-preload 
AudioEngine:support preload for audio
 2015-07-13 17:06:17 +08:00
Vincent Yang e65b01bdc0 Merge pr11866: FileUtilsWin32 correct use all unicode version winapi. 2015-07-13 17:06:01 +08:00
WenhaiLin adfa6d4f0d Add test case for issue 12775 2015-07-13 15:38:33 +08:00
ZhangMenghe aca7914d86 Modify testcase for page Turndown 2015-07-13 13:44:58 +08:00
ZhangMenghe 3396da508f pageTurnDown in WebGL testCase 2015-07-13 12:45:07 +08:00
songchengjiang 5a16748273 optimize Animate3DCallback 
add Animate3DCallbackTest
 2015-07-13 11:43:13 +08:00
WenhaiLin 80dff7f1c4 Rollback pr12299 2015-07-13 11:32:25 +08:00
pandamicro c167e249cd Merge pull request #12790 from pandamicro/shaderNormal 
Use shader with normal while creating mesh with normals
 2015-07-12 21:47:05 +08:00
pandamicro 600568fdba Migrate test case from #10692 @babcca 2015-07-12 11:33:22 +08:00
WenhaiLin 5c9e8848bf [ci skip]Add missing configuration for Nibiru. 2015-07-10 21:16:21 +08:00
WenhaiLin 205e77a4fb Add missing configuration for Nibiru. 2015-07-10 21:09:15 +08:00
WenhaiLin 7f3e0b2a8c [ci skip]Replace tab with spaces. 2015-07-10 20:56:21 +08:00
WenhaiLin c68469a611 Update Nibiru SDK. 2015-07-10 20:42:05 +08:00
Liam 4a53afc798 update for error resource,just for build 2015-07-10 17:24:35 +08:00
songchengjiang 21a8a8d567 fix mirrored Effect3DOutline 2015-07-10 16:30:45 +08:00
pandamicro c30ce38cb5 Merge pull request #12766 from super626/v3.7-release 
Set default 3d animation quality to low
 2015-07-10 15:35:22 +08:00
pandamicro 2d27091398 Merge pull request #12717 from jianglong0156/FileUtilsWriteFunctionMerge 
add write api in FileUtils
 2015-07-10 15:13:21 +08:00
songchengjiang a1956e2210 fix issue#9310 issue#10151 issue#12551 2015-07-09 18:05:47 +08:00
yangxiao 10fe728eee animation quality default to low, do not interpolation 2015-07-09 17:54:21 +08:00
Liam e50fc4f184 merge code 2015-07-09 17:12:48 +08:00
WenhaiLin 41bc3a1900 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8 
Conflicts:
	AUTHORS
 2015-07-09 11:11:34 +08:00
Liam c6ebaa19ec add scene 3d test 2015-07-09 10:19:07 +08:00
Jacky 02597eb369 Completed test case and comment. 2015-07-08 22:34:33 +08:00
Jacky 34d1cc0b1d refactory Effects test case. 2015-07-08 21:56:14 +08:00
Jacky 4a9e9f3744 completed api. 2015-07-08 17:26:29 +08:00
子龙山人 155ac8c07e Merge pull request #11583 from hannon235/v3-update-sio 
Updates socket.io network extension to correctly detect and manage connection to socket.io server versions 0.9.x - 1.x
 2015-07-08 16:11:05 +08:00
Jacky 260ce177d7 refine GridNode with rect. 2015-07-08 15:57:27 +08:00
WenhaiLin b395ef06d8 AudioEngine:support preload for audio[WIN32/WINRT 8.1/WP8.1] 2015-07-08 10:48:20 +08:00
XiaoFeng 8429cc1d90 Update CCDrawNode bug test 2015-07-08 09:35:29 +08:00
XiaoFeng 707b4d8b90 Fix windows universal project file 2015-07-07 19:44:18 +08:00
WenhaiLin 581f1ab42b Add test case 2015-07-07 15:41:54 +08:00
jianglong0156 abee4a376a add write api in FileUtils 
bool writeStringToFile(std::string dataStr, const std::string& fullPath);
bool writeDataToFile(Data retData, const std::string& fullPath);
bool writeValueMapToFile(ValueMap& dict, const std::string& fullPath);
bool writeValueVectorToFile(ValueVector vecData, const std::string& fullPath);
and
formate the FileUtils code
 2015-07-07 14:06:59 +08:00
子龙山人 f28fbdd0c4 Merge pull request #12683 from neokim/add_scroll_bar_into_scroll_view 
Add scroll bar feature into ScrollView
 2015-07-07 13:56:09 +08:00
肖峰 37674c3689 Add bug test to Mac & iOS cpp-test project 2015-07-07 11:17:08 +08:00
XiaoFeng a9dfd8012c Add new bug test to Android, Win 10, Win Universal, Linux project file 2015-07-07 11:02:00 +08:00
XiaoFeng 9a6ffd8904 Add bug test for PageView layout & CCNodeDraw::onDrawGLLine 2015-07-07 09:54:42 +08:00
jianglong0156 6f3b977c1e add UserDefault api deleteValueForKey 2015-07-06 17:01:17 +08:00
Neo Kim 3ab4285960 Refactor code 2015-07-04 16:06:05 +09:00
Neo Kim ceeca575f3 Replace 'margin' of scroll bar with 'positionFromCorner' 2015-07-04 14:05:47 +09:00
Neo Kim 60c32f6fb5 Refactor some codes 2015-07-04 09:56:53 +09:00
Neo Kim c093bb18e2 Add scroll bar manipulation methods into ScrollView 2015-07-04 09:56:52 +09:00
Neo Kim 2cae17b462 Add scroll bar feature into ScrollView 2015-07-04 09:56:52 +09:00
pandamicro 99bad19cff Merge pull request #12660 from pandamicro/merge-v3.7 
Merge v3.7-release
 2015-07-03 11:08:50 +08:00
pandamicro 48c99d2ac4 Merge pull request #12635 from yangws/v3_scene3dtest 
Fix bug: spine animition can't show in Scene3DTest.
 2015-07-03 11:04:23 +08:00
pandamicro 1b22438792 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7 
Conflicts:
	cocos/ui/UICheckBox.cpp
 2015-07-03 10:23:49 +08:00
子龙山人 5b971ee93d Merge pull request #12607 from neokim/add_radio_button_and_group 
Add RadioButton and RadioButtonGroup widgets
 2015-07-02 17:12:59 +08:00
pandamicro d155d42c0e Merge pull request #12617 from yangws/issue_8194 
Fixbug :EventDispatcher wrong dispatch order
 2015-07-02 14:42:30 +08:00
Neo Kim 6550a9ccc2 Replace all tabs to 4 spaces to comply with the convention 2015-07-02 11:30:14 +09:00
Neo Kim 4b2bff4674 Change RadioButtonGroup not to be a node-parent of radio buttons but just a grouping node. And add one more test case. 2015-07-02 11:28:14 +09:00
Vincent Yang 7794bc9d46 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_scene3dtest 2015-07-02 10:27:55 +08:00
Vincent Yang 46d25a45a0 Merge branch 'v3_scene3d_fixspineani' into v3_scene3dtest 2015-07-02 10:27:25 +08:00
Neo Kim a3cbd13402 Update the resource sub module reference 2015-07-01 18:44:59 +09:00
Vincent Yang dc6e966501 [ci skip] remove a unnecessary CCLOG info. 2015-07-01 14:55:31 +08:00
yangxiao d35bf2305f add clipping test 2015-07-01 14:48:37 +08:00
Vincent Yang 276ed46c01 Fixbug : issue 8194. 2015-07-01 14:39:35 +08:00
Neo Kim 00e360f438 Add the missing file into CMake and Windows project configurations. 2015-07-01 15:36:53 +09:00
yangxiao 269feeb1f9 remove stencil from Renderstate 2015-07-01 14:06:37 +08:00
jianglong0156 9e9625feca add bool parm in android 2015-07-01 10:57:43 +08:00
jianglong0156 2ef2016c39 add call reflection with bool test case 2015-07-01 10:41:24 +08:00
Neo Kim 3f05ad2b98 Replace all tabs to 4 spaces to comply with the convention 2015-06-30 20:31:31 +09:00
Neo Kim f5e7184f0b Add new cpp files into Android.mk 2015-06-30 18:50:13 +09:00
Neo Kim bed90606d3 Add RadioButton feature and a test case for it. 2015-06-30 18:50:13 +09:00
yangxiao 538daf5bce add empty line 2015-06-30 14:19:58 +08:00
yangxiao 2ed5ee123e improve collider 2015-06-30 14:16:05 +08:00
Vincent Yang 1105111fab Merge v3 branch. 2015-06-30 11:59:56 +08:00
子龙山人 29cccf631e Merge pull request #12550 from kompjoefriek/v3-vibrate 
Vibrate support in v3
 2015-06-30 10:28:59 +08:00
子龙山人 265c9b55e0 Merge pull request #12586 from fusijie/add-autoculling-bug-testcase 
add auto culling test case.
 2015-06-30 09:33:36 +08:00
Jacky 0be9763a9c add auto culling test case. 2015-06-29 17:25:13 +08:00
pandamicro 08bdf84183 Merge pull request #12584 from jianglong0156/tilemapTestCaseConflict 
resolve the conflict that the 3d testcase show error after click the the titlemap testcase
 2015-06-29 17:07:13 +08:00
子龙山人 c997284825 Merge pull request #12352 from andyque/add-two-events-to-ui-slider 
Improve ui::Slider
 2015-06-29 17:01:27 +08:00
jianglong0156 fd54b9941d resolve the titlemap testcase conflict with the 3d testcase. 2015-06-29 16:34:54 +08:00
andyque cc1e126a84 Merge branch 'v3.7-release' into v3 2015-06-29 10:35:23 +08:00
songchengjiang 7befab0f7b add Physics3DCollider 2015-06-29 10:26:09 +08:00
pandamicro b9a6e8c051 Merge pull request #12579 from jianglong0156/videoplayer 
[ci skip]improve Videoplayer test
 2015-06-29 10:19:08 +08:00
jianglong0156 b9cccc8a4d Merge branch 'v3.7-release' into videoplayer 2015-06-29 10:07:19 +08:00
pandamicro f1528b728c Merge pull request #12565 from WenhaiLin/v3-37-tests-runFix 
[ci-skip][lua-tests/lua-empty-test]Fixed can't run successfully by console on WIN32.
 2015-06-26 18:43:14 +08:00
WenhaiLin 24eca337ca [ci-skip][lua-tests/lua-empty-test]Fixed can't run successfully by console on WIN32. 2015-06-26 17:12:39 +08:00
pandamicro 88aeaa36f4 Merge pull request #12534 from super626/skybox 
Skybox improvement
 2015-06-26 17:05:17 +08:00
pandamicro d29c5643bc Merge pull request #12559 from WenhaiLin/v3-37-crashfix 
[Cpp-tests-->SpriteOffsetAnchorRotation]Fixed crash when enter `SpriteOffsetAnchorRotation` again after a auto-tested.
 2015-06-26 12:51:07 +08:00
Wenhai Lin 94c0c0c3fc [Cpp-tests-->SpriteOffsetAnchorRotation]Fixed crash when enter `SpriteOffsetAnchorRotation` test case again after a auto-tested. 2015-06-26 12:02:15 +08:00
jianglong0156 ef51fc46ed add videoplayer state, modify play label 2015-06-26 10:44:43 +08:00
pandamicro ddb982246f Merge pull request #12553 from VisualSJ/v3-aa 
Encoded into AVC
 2015-06-26 10:15:02 +08:00
pandamicro d2764918b9 Merge pull request #12545 from WenhaiLin/v3-37-removeUInclude 
Remove unneeded include files and fixed warns.
 2015-06-26 09:31:51 +08:00
kompjoefriek 6eca03fdd2 Merged changes from "Vibrate support in v4" into v3 branch. 2015-06-26 01:02:44 +02:00
WenhaiLin 1494f09f06 Remove unneeded include files and fixed warns. 2015-06-25 23:15:39 +08:00
pandamicro 1ab369a70b Merge pull request #12542 from andyque/fix-v3.7-stuio-percent-mode 
Fix v3.7 cocosStudio percent position bug
 2015-06-25 21:37:12 +08:00
pandamicro a81d7aa8b4 Merge pull request #12541 from VisualSJ/v3-aa 
[ci skip] Encoded into AVC
 2015-06-25 20:32:53 +08:00
andyque 516d45db62 update submodule 2015-06-25 20:16:43 +08:00
VisualSJ 110e51d0bc Encoded into AVC 2015-06-25 19:01:55 +08:00
andyque 8f7b439dfe add cocostudio 1.6 tests 2015-06-25 18:06:45 +08:00
samuele3hu 7feaa18d82 Fix the compile error for cpp-tests based on android studio 2015-06-25 16:08:48 +08:00
samuele3hu ad4f5b8ec0 Fix the some lua tests case bug 2015-06-25 15:13:01 +08:00
yangxiao 63f948c822 modify skybox to projection space 2015-06-25 15:01:39 +08:00
pandamicro 117a72fa07 Merge pull request #12514 from WenhaiLin/v3-37-autotest-timeoutfix 
[Cpp-tests]Fixed cannot start auto test again if the timeout has occurred.
 2015-06-24 23:07:38 +08:00
pandamicro f9db471026 Merge pull request #12495 from super626/v3 
Fix terrain getIntersectionPoint
 2015-06-24 18:36:52 +08:00
WenhaiLin a7632a962f [Cpp-tests]Fixed cannot start auto test again if the timeout has occurred. 2015-06-24 18:24:16 +08:00
pandamicro 6638a53d69 Merge pull request #12509 from xiaofeng11/v3_xiaofeng 
Add a text label to Node3DReader Test, notice user there has no content to show
 2015-06-24 17:10:08 +08:00
Bin Zhang c9c212d0e1 Solve the error when run tests projects with `cocos run`. 2015-06-24 15:33:13 +08:00
XiaoFeng 0846dadbc3 Add a text label to Node3DReader Test, notice user there has no content to show 2015-06-24 14:58:14 +08:00
pandamicro fb852046e1 Merge pull request #12508 from jianglong0156/AccelerometerCrash 
reduce the accelerometer log num, avoid log too much in vs
 2015-06-24 13:45:53 +08:00
jianglong0156 9b31e8ed16 reduce the accelerometer log num, avoid log too much in vs 2015-06-24 12:03:16 +08:00
pandamicro 7ddb6308e9 Merge pull request #12503 from jianglong0156/hidepluginx 
hide facebook testcase
 2015-06-23 22:19:10 +08:00
江龙 f3eb455669 hide facebook testcase 2015-06-23 22:14:27 +08:00
samuele3hu 5c5f3dcc79 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_test 2015-06-23 20:03:14 +08:00
samuele3hu e2aa669b8d Fix the LayerTest error about Lua 2015-06-23 20:02:26 +08:00
pandamicro 32accbf21b Merge pull request #12488 from WenhaiLin/v3-37-androidApplicationFix 
Fixed Application may be created more than once on Android.
 2015-06-23 19:43:39 +08:00
pandamicro 0b26f966b5 Merge pull request #12497 from VisualSJ/v3-aa 
[ci skip]add info into BlendFunc tests on canvas and tests data problem
 2015-06-23 19:43:08 +08:00
VisualSJ 5472928aaa add info into BlendFunc tests on canvas and tests data problem 2015-06-23 18:54:18 +08:00
yangxiao c3593c9d64 merge cocos 2015-06-23 18:29:39 +08:00
yangxiao 251c81d7be Merge branch 'newcode' into v3 2015-06-23 18:25:41 +08:00
WenhaiLin f95245312a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0 2015-06-23 17:08:25 +08:00
pandamicro ce508bab87 Merge pull request #12487 from pandamicro/v3 
Fix TransitionTest issue that depth test haven't been disabled after transition
 2015-06-23 16:59:08 +08:00
WenhaiLin cbb073e905 Fixed Application may be created more than once on Android. 2015-06-23 16:58:38 +08:00
pandamicro cd1233f801 Fix TransitionTest issue that depth test haven't been disabled after transition 2015-06-23 16:58:15 +08:00
Vincent Yang 27d011dd50 Fixbug: LabelTestNew New Label + CharMap's effect is wrong. 2015-06-23 16:02:38 +08:00
子龙山人 fca9b89a4c Merge pull request #12480 from andyque/fix-rapidjson-assert-error 
fix rapidjson assert error
 2015-06-23 15:34:47 +08:00
andyque 70b709f4a8 fix rapidjson assert error 2015-06-23 13:54:11 +08:00
pandamicro 4823cc3bc2 Merge pull request #12476 from super626/fps 
show fps in scene3d demo
 2015-06-23 13:42:26 +08:00
子龙山人 d8a2695620 Merge pull request #12473 from WenhaiLin/v3-37-ParticleDemo-crashfix 
[cpp-tests] ParticleIssue12310:Fixed crash when tap left/right arrow to move to another test case.
 2015-06-23 13:36:36 +08:00
pandamicro b08325dd5b Merge pull request #12475 from samuele3hu/v3_7_test 
[ci skip]Fix the some test cases error about Lua
 2015-06-23 13:15:21 +08:00
yangxiao a433d57807 show fps 2015-06-23 11:56:50 +08:00
WenhaiLin a68874d3cb Node: Particles --> ParticleIssue12310:Fixed crash when tap left/right arrow to move to another test case. 2015-06-23 11:00:23 +08:00
andyque 931011809d fixed unintended spaces in string 2015-06-23 10:38:43 +08:00
samuele3hu 3b766e5236 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_test 2015-06-23 10:20:05 +08:00
samuele3hu 683c5b4cb2 Fix the LabeLTestNew error. 2015-06-22 22:32:21 +08:00
pandamicro 0f5c343e1e Merge pull request #12460 from MSOpenTech/v3-winrt-readme 
Added Windows 10.0 UWP info to Readme
 2015-06-22 13:05:51 +08:00
pandamicro b1e24ee8f2 Merge pull request #12455 from natural-law/v3 
Solve the error when build tests projects with cocos command on win32.
 2015-06-22 13:04:17 +08:00
samuele3hu bc964c96da Fix the error about the Camera3D Test 2015-06-22 09:28:18 +08:00
samuele3hu 0181a84883 Fix the bugs about the particle3DTest 2015-06-22 09:27:34 +08:00
WenhaiLin 6bd46fcfcc [ci skip]UIRichTextTest:Fixed text don't render properly in the Windows 8.1 Store App. 2015-06-20 17:07:11 +08:00
Dale Stammen d438bd6f49 added app name to 150x150 windows tile 2015-06-19 09:23:50 -07:00
Bin Zhang 85fe9e8816 Solve the error when build tests projects with cocos command on win32. 2015-06-19 18:32:32 +08:00
子龙山人 8ca0f18575 Merge pull request #12446 from pandamicro/v3 
Add auto bindings for navmesh
 2015-06-19 17:21:00 +08:00
子龙山人 776dd1dd09 Merge pull request #12449 from WenhaiLin/v3-37-resoucesfix 
[ci skip]Fixed resources.
 2015-06-19 16:30:05 +08:00
WenhaiLin 45de0b650a [ci skip]Fixed resources. 2015-06-19 16:26:03 +08:00
子龙山人 869e3c5243 Merge pull request #12444 from WenhaiLin/v3-37-label-linewrapfix 
Label:Fixed line wrap error without space.
 2015-06-19 15:08:13 +08:00
WenhaiLin d32a317ea0 Label:Fixed line wrap error without space. 2015-06-19 13:39:19 +08:00
pandamicro ca989e2aed Fix physics3d js test issue 2015-06-19 10:35:45 +08:00
pandamicro c6d4f283bb Fix compilation issue in navmesh conversion 2015-06-19 08:11:45 +08:00
江龙 91bc19fb29 Merge branch 'v3_origin' into navmesh 
Conflicts:
	tests/js-tests/src/Physics3DTest/Physics3DTest.js
 2015-06-18 23:50:19 +08:00
pandamicro b757837239 Move NavMesh to jsb namespace 2015-06-18 22:57:41 +08:00
Bin Zhang a4ecfdb7e2 Build engine with LOCAL_ARM_MODE=arm when building JS projects for android. 2015-06-18 22:00:57 +08:00
VisualSJ 3da67d3358 change the seek to time 2015-06-18 22:00:55 +08:00
samuele3hu a98b493151 Update UIS9NinePatchTest for jsb 2015-06-18 22:00:55 +08:00
samuele3hu cbfa92d3fd Add a new line. 2015-06-18 22:00:55 +08:00
samuele3hu 496ce50ff5 issue #12414:Add UIS9NinePatchTest for js 2015-06-18 22:00:55 +08:00
samuele3hu 77c3e9bdde issue #12414:Add UIS9NinePatchTest for Lua and js 2015-06-18 22:00:54 +08:00
VisualSJ 0a526875a8 Fixed a bug that xhr cross-domain error 2015-06-18 22:00:54 +08:00
VisualSJ 82c09e8d0c Fixed a bug that xhr cross-domain error 2015-06-18 22:00:54 +08:00
pandamicro cd7252014a Merge pull request #12432 from pandamicro/v3 
Change physics3d api to jsb namespace
 2015-06-18 21:53:39 +08:00
pandamicro 10a8adad53 Change physics3d api to jsb namespace 2015-06-18 20:39:40 +08:00
pandamicro 491d89baec Merge pull request #12429 from natural-law/v3 
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
 2015-06-18 20:28:52 +08:00
jianglong0156 4fe1542d17 add navmesh tests 2015-06-18 19:22:27 +08:00
Bin Zhang d288b13957 Build engine with LOCAL_ARM_MODE=arm when building JS projects for android. 2015-06-18 17:22:30 +08:00
pandamicro aa566a3722 Merge pull request #12424 from pandamicro/physics3d 
Fix Physics3D test and js bindings
 2015-06-18 16:09:49 +08:00
jianglong0156 85c40b6580 Merge pull request #8 from pandamicro/physics3d 
Physics3d
 2015-06-18 14:54:32 +08:00
pandamicro 811173ea3b Fix Physics3D test and js bindings 2015-06-18 14:33:16 +08:00
pandamicro 9dc52ba72f Merge pull request #12403 from VisualSJ/v3-aa 
[ci skip]Fixed some bug
 2015-06-18 12:31:27 +08:00
pandamicro 000be8316b Merge pull request #12415 from samuele3hu/v3_7_ui 
[ci skip]issue #12414:Add UIS9NinePatchTest for Lua and js
 2015-06-18 12:30:28 +08:00
tangziwen 1989de7a04 fix terraintest and Terrain::getInstersectionPoint() 2015-06-18 12:20:44 +08:00
pandamicro 7952477469 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into physics3d 2015-06-18 12:05:01 +08:00
VisualSJ 44c37c676e change the seek to time 2015-06-18 11:54:25 +08:00
Vincent Yang 27bf636eab Fix bug: spine animition can't show in Scene3DTest. 2015-06-18 11:45:17 +08:00
samuele3hu 6c749a77f2 Fix the bugs about the Physics3DTest for Lua. 2015-06-18 11:17:08 +08:00
tangziwen 4187ea2241 fix Scene3D test 2015-06-18 10:17:46 +08:00
samuele3hu 7f21731bb1 Update UIS9NinePatchTest for jsb 2015-06-18 10:08:13 +08:00
Vincent Yang 0e0c8cf72e Modify Scene3DTest to composite 2D/3D scene by moving UI and camera far away. 2015-06-18 09:54:48 +08:00
samuele3hu 31ce264c6a Add a new line. 2015-06-18 09:44:47 +08:00
samuele3hu 8c01d94945 issue #12414:Add UIS9NinePatchTest for js 2015-06-18 09:43:05 +08:00
samuele3hu 31aae38fac issue #12414:Add UIS9NinePatchTest for Lua and js 2015-06-18 09:41:16 +08:00
VisualSJ 400b2d7663 Fixed a bug that xhr cross-domain error 2015-06-18 09:23:15 +08:00
pandamicro 3ffc0e6be6 Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d 2015-06-18 09:20:37 +08:00
pandamicro 3975d44d3b Chain NavMeshTest 2015-06-18 00:58:03 +08:00
pandamicro bcf9659408 Merge branch 'v3' into navmesh 2015-06-18 00:36:37 +08:00
pandamicro 5b23e8b381 Fix resource issue 2015-06-18 00:24:01 +08:00
pandamicro 85e8a407b1 Merge branch 'navmesh' of https://github.com/jianglong0156/cocos2d-x into v3 
# Conflicts:
#	tests/js-tests/project/Classes/AppDelegate.cpp
#	tools/tojs/genbindings.py
 2015-06-17 19:58:24 +08:00
samuele3hu 683812d817 Update Physics3D test for js. 2015-06-17 18:50:55 +08:00
jianglong0156 b265033a41 add testcase and manual bindings 2015-06-17 18:38:18 +08:00
jianglong0156 897b5fd0e9 add navmesh test project file and binding file 2015-06-17 18:37:19 +08:00
VisualSJ 010cb23ead Fixed a bug that xhr cross-domain error 2015-06-17 17:10:31 +08:00
pandamicro 4fa1cdc302 Update submodules 2015-06-17 15:43:35 +08:00
pandamicro ddc820eb42 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-06-17 15:33:34 +08:00
子龙山人 fd508a0198 Merge pull request #12381 from VisualSJ/v3-aa 
[ci skip]Fix some simple bug
 2015-06-17 15:11:08 +08:00
VisualSJ 0a223adf7c After exiting should restore settings 2015-06-17 14:43:41 +08:00
子龙山人 dc33a8d66e Merge pull request #12243 from Wu-Hao/fix_spritepolygon2 
Fix spritepolygon
 2015-06-17 14:40:30 +08:00
VisualSJ fba76b11cd Fixed path bug 2015-06-17 14:07:07 +08:00
pandamicro 3a076b6508 Merge pull request #12387 from samuele3hu/v3_navigation 
[ci skip]Update the Physics3DTest for js and Lua by synchronizing the API.
 2015-06-17 14:01:21 +08:00
samuele3hu 9c550e0a11 Update the Physics3DTest for js and Lua by synchronizing the API. 2015-06-17 13:58:05 +08:00
Jacky 3c5ab4f518 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2 
# Conflicts:
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-06-17 13:04:24 +08:00
VisualSJ 6669f1df5e Fixed widgetFromJsonFile bug(#20035) 2015-06-17 11:49:27 +08:00
子龙山人 0915565b8d Merge pull request #12373 from samuele3hu/v3_navigation 
Add the Lua bindings for NavMesh and the related test case.
 2015-06-17 11:36:52 +08:00
VisualSJ d855066472 Fixed a bug that control's default resource error #20037 2015-06-17 11:19:06 +08:00
VisualSJ 164fb3a058 If json have the back button, then use this button 2015-06-17 11:16:44 +08:00
samuele3hu 2da760b655 Update the NavMesh test case 2015-06-17 09:49:31 +08:00
VisualSJ ab34c1de89 Change the path(UIVideoPlayerTest.js) 2015-06-16 17:30:48 +08:00
pandamicro d51fd2397c Fix js test ES6 usage issue 2015-06-16 15:01:52 +08:00
samuele3hu a547d6aa33 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_navigation 
Conflicts:
	tools/bindings-generator
 2015-06-16 11:36:11 +08:00
WuHao aeeed0f4ab Merge remote-tracking branch 'origin' into fix_spritepolygon 
# Conflicts:
#	external/config.json
 2015-06-16 11:19:20 +08:00
Dale Stammen 74f4d29fa9 added missing librecast 2015-06-15 20:06:54 -07:00
Dale Stammen 8d8e7d6cb9 Merge branch 'v3' into v3-winrt-librecast 2015-06-15 19:27:40 -07:00
Dale Stammen 0781978788 added librecast. Updated build properties 2015-06-15 18:44:14 -07:00
andyque b8826d9de4 improve the enum naming 2015-06-16 09:42:06 +08:00
Dale Stammen e14fdedf67 added missing NavMeshTest files 2015-06-15 18:19:51 -07:00
Ricardo Quesada b167ab3e78 StateBlock() is public 2015-06-15 17:43:37 -07:00
Ricardo Quesada ca3da86da7 StateBlock::restore() is public 
It is possible to restore to default state
 2015-06-15 14:12:44 -07:00
pandamicro ccd15b3da7 Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into spritepolygon 2015-06-16 00:56:58 +08:00
pandamicro 4f8bd25a83 Add js test cases for sprite polygon 2015-06-16 00:56:08 +08:00
andyque c1108db31e Improve ui::Slider 
1. Add two APIs to gain big precision
2. Add three type events in Slider's callback.
 2015-06-15 18:31:21 +08:00
WuHao 27d0f51e9b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_tests.xcodeproj/project.pbxproj
	cocos/2d/libcocos2d.vcxproj.filters
	tools/cocos2d-console
	web
 2015-06-15 16:13:36 +08:00
Hao Wu b4ca8c1489 Merge pull request #15 from pandamicro/spritepolygon 
Add SpritePolygon JSB bindingsJSB bindings
 2015-06-15 15:47:02 +08:00
pandamicro 0216d05eee Merge pull request #12102 from super626/navigation2 
3D Navigation
 2015-06-15 13:39:05 +08:00
pandamicro cd7f39d823 Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into spritepolygon 2015-06-15 13:22:38 +08:00
pandamicro 34954c2600 Add PolygonSprite Test1 2015-06-15 13:21:49 +08:00
yangxiao 97ef7974bb create agent in the onEnter 2015-06-15 11:57:05 +08:00
pandamicro 852b9b42b9 Remove jsb_cocos2dx_experimental_manual 2015-06-15 10:46:57 +08:00
jianglong0156 5ff0825468 modify android res copy 2015-06-15 09:55:10 +08:00
jianglong0156 393ad49481 add win32 project resource copy 2015-06-15 09:55:05 +08:00
jianglong0156 6310f74533 modify resource to res/resjs 2015-06-15 09:54:00 +08:00
jianglong0156 f9df298401 modify copy resource to res/resjs 2015-06-15 09:53:53 +08:00
Ricardo Quesada a8cf72dc43 pass bits to invalidate 2015-06-12 17:14:09 -07:00
Ricardo Quesada 4278bf51b1 Adds RenderState::StateBlock::invalidate(); 
handy function to restore the GL state to the default one.
Only use it if calling GL calls directly
 2015-06-12 16:47:08 -07:00
Ricardo Quesada d9b0b2ca38 more fixes 2015-06-12 15:28:29 -07:00
pandamicro 9806c09b0e Merge pull request #12299 from WenhaiLin/v3-label-cropped 
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
 2015-06-12 21:33:09 +08:00
pandamicro f9057b3f32 Merge pull request #12284 from pandamicro/v3 
Fix template android compilation issue on physics3d
 2015-06-12 21:10:40 +08:00
子龙山人 c01d1fe00a Merge pull request #12310 from WenhaiLin/v3-particlefile-key 
Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner.
 2015-06-12 16:44:12 +08:00
Jacky 29c108bdef Merge remote-tracking branch 'origin' into fix_spritepolygon2 
# Conflicts:
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-06-12 16:28:41 +08:00
pandamicro f3765a4c5f Fix physics 3d macro include issue 2015-06-12 15:58:43 +08:00
pandamicro e9d648f151 Fix physics 3d macro include issue 2015-06-12 15:41:46 +08:00
WenhaiLin 4d97d5075b Add test case for issue12310. 2015-06-12 15:39:57 +08:00
pandamicro c3aba0392d Update auto conversion for sprite polygon 2015-06-12 13:00:49 +08:00
子龙山人 7a9b48bd83 Merge pull request #12214 from andyque/optimize-ui-memory-usage 
Optimize ui memory usage
 2015-06-12 10:11:21 +08:00
pandamicro 1a9056cf14 Merge pull request #12300 from jianglong0156/textFieldShowString 
[ci skip]add textfield show textString
 2015-06-11 19:33:21 +08:00
WenhaiLin 5aa31ea83a Label:the texture of character have not cropped if character cross the axis-aligned bounding-box. 2015-06-11 17:16:44 +08:00
pandamicro 902f1696e8 Merge pull request #12290 from jianglong0156/issue#2928texture2d 
[ci skip]add pr#2928 test case, load same remote img. can callback the function
 2015-06-11 16:51:59 +08:00
子龙山人 43555272d5 Merge pull request #12236 from WenhaiLin/v3-box2d-compilefix 
Fixed compile error cause by enable CC_ENABLE_BOX2D_INTEGRATION.
 2015-06-11 16:34:45 +08:00
yangxiao 44c2b0d5ad merge cocos 2015-06-11 15:54:42 +08:00
WenhaiLin aff2f8c2c4 Fixed compile error. 2015-06-11 14:42:03 +08:00
samuele3hu 1b20e463d8 Update the Lua binding about the Polygon and update the test case. 2015-06-11 14:38:38 +08:00
jianglong0156 f97955682a add pr#2928 test case, load same remote img. can callback the function 2015-06-11 11:11:51 +08:00
jianglong0156 96ce3ec22c add textfield show textString 2015-06-10 16:15:09 +08:00
Jacky b41c60dbdb Merge remote-tracking branch 'origin/v3' into fix_spritepolygon2 
# Conflicts:
#	external/config.json
 2015-06-10 10:23:43 +08:00
Huabing.Xu 10352c40b2 Merge branch 'v3' into v3FrameBufferObject 
# Conflicts:
#	cocos/2d/CCCamera.h
 2015-06-10 10:16:42 +08:00
Huabing.Xu 3e331128c6 file rename CCFrameBufferObject->CCFrameBuffer 2015-06-09 15:32:12 +08:00
Huabing.Xu 97b387560b revert some accidental changes 2015-06-09 14:06:11 +08:00
Jacky 562d4b9a78 fix on the windows. 2015-06-09 11:23:37 +08:00
Huabing.Xu 9acab65e4f rename FrameBufferObject->FrameBuffer 
Move FrameBufferObject related class to experimental namespace
 2015-06-09 10:59:43 +08:00
WuHao a67e570ef7 deleted more leftover comments, placed polygon test further down the tests 2015-06-08 15:40:18 +08:00
WuHao 2650de030c modified tests to show current epsilon 2015-06-08 15:08:16 +08:00
WuHao 0808b6aff9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon 
Conflicts:
	cocos/2d/MarchingSquare.cpp
 2015-06-08 13:59:26 +08:00
WenhaiLin 784f142f91 Fixed compile error cause by enable CC_ENABLE_BOX2D_INTEGRATION. 2015-06-08 11:06:02 +08:00
Jacky 3e62dd0473 remove unused file and code. 2015-06-06 13:31:25 +08:00
Dale Stammen d4c9a81908 Merge branch 'v3' into v3-winrt-ogg 2015-06-05 16:03:54 -07:00
Ricardo Quesada 453a3d93bc samplers are treated as uniforms 2015-06-05 14:55:33 -07:00
Dale Stammen f1a067ee75 removed e option from xcopy of cpp template files 2015-06-05 09:21:52 -07:00