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

389 Commits

Author SHA1 Message Date
XiaoFeng ea077c5141 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_LuaJsSim 
Conflicts:
	cocos/scripting/js-bindings/manual/js_manual_conversions.h
 2015-12-01 15:12:32 +08:00
zilongshanren 0f8c3e0c1c Merge pull request #14435 from zilongshanren/improve-label-layout-v2 
Add Overflow to Label
 2015-11-27 17:31:40 +08:00
songchengjiang 64f082ab7c add bumped testing model 2015-11-26 10:14:27 +08:00
zilongshanren b36f464c09 update ccs-res submodule 2015-11-24 18:06:11 +08:00
zilongshanren ccdb2a75f9 Add Label Overflow and wrap option. 
Squashed commit of the following:

commit 7176582def3686f78701f92ead4d0976bccd115d
Author: zilongshanren <guanghui8827@126.com>
Date:   Thu Nov 19 10:30:54 2015 +0800

    add char map font test

commit 7ea7c251ff549e4a74d5c5c3faa49893fe5defc4
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 18 15:00:17 2015 +0800

    system font overflow is not supported

commit a02fe0c7f94692b95a0bfd6f194a94c4519cee3a
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 18 11:04:15 2015 +0800

    add system font test

commit eb098da8b16f485c86929a9b2ba00a64068264e9
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Nov 17 10:29:35 2015 +0800

    Finish resize height mode

commit ca78ba35abdbacc23bf6f8315454ec0a356a6aca
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Nov 16 11:01:27 2015 +0800

    fix wrap issue

commit baf1a5e0dc3a08da0a13500aea5afc82017b054a
Author: zilongshanren <guanghui8827@126.com>
Date:   Sat Nov 14 08:28:57 2015 +0800

    horizontal shrink still has a issue

commit 7e8abc0990cdf299d23c8072c5c1d4aa561bf798
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Nov 13 11:42:34 2015 +0800

    finish shrink without wrap

commit c9c45bd1f304ba00a6f9a274fa5631659a075bc1
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Nov 13 10:09:46 2015 +0800

    update shrink

commit ad82010ea846679e4d1a09f5127be29ae2e6adae
Author: zilongshanren <guanghui8827@126.com>
Date:   Thu Nov 12 17:55:15 2015 +0800

    refactor shrink logic

commit effc1ee1cd9f06eaa4f46dd5c2a1401f6a285af6
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 11 18:25:34 2015 +0800

    add resize overflow type

commit 194d552adc2a4ba2c439eff969b082556315e0ae
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 11 11:49:51 2015 +0800

    no wrap, shrink is working.

commit e2222ef14d5392817bd727895b3c2caec5ce4faf
Author: zilongshanren <guanghui8827@126.com>
Date:   Tue Nov 10 16:16:27 2015 +0800

    add overflow type to label.

    1. optimize the testcase

commit b65e2de4bfb3cb86a0d0cfa118be891a3f9fe858
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Nov 9 17:22:34 2015 +0800

    finish bmfont wrap by char

commit f339ff0309dc9e2ca2871f03f4551d329afce5e1
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Nov 9 17:04:51 2015 +0800

    finish bmfont wrap by word

commit 4c8edc65204a1294ac81315e72f1299acbdf43c0
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Nov 9 11:29:21 2015 +0800

    add BMFont size support

commit 3282481bda9dcb0f88b41f2568f7e5c856af6d53
Author: zilongshanren <guanghui8827@126.com>
Date:   Mon Nov 9 09:58:01 2015 +0800

    add font size support for BMFONT

commit 0c8e2a0374983625507a183cb2eb53a0b1709e25
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Nov 6 16:36:27 2015 +0800

    add toggle wrap option.

    1. make hirozontal clamp working

commit 19dcd3e80a34c54b20934d08937eb270e689a7db
Author: zilongshanren <guanghui8827@126.com>
Date:   Fri Nov 6 15:12:59 2015 +0800

    tweak label layout

commit e36a40babf4817ea7e9830614ac7560f2e69c583
Author: zilongshanren <guanghui8827@126.com>
Date:   Thu Nov 5 11:11:02 2015 +0800

    finish the test skeleton

commit a144a3a5d388d15c4f37cbfc12563eccabffb8e1
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 4 16:38:54 2015 +0800

    add setFontSize api to label.

    1. add new chinese-english bmfont
    2. beautify base test

commit b22551c9eb3738fbb1c38ae4a3bfd07a202dcaf0
Author: zilongshanren <guanghui8827@126.com>
Date:   Wed Nov 4 11:27:18 2015 +0800

    add label layout test skeleton
 2015-11-19 16:06:13 +08:00
zhangcheng 39f68e9885 Update ccs-res submodule to the latest. 2015-11-03 13:08:56 +08:00
pandamicro aa9f0d5bd5 Merge pull request #14049 from CodeAndWeb/v3-sprite-polygoninfo-from-plist 
Extending SpriteFrameCache to read PolygonInfo from atlas plist file
 2015-10-27 17:28:22 +08:00
Liam 68f25f65c4 update submodule 2015-10-08 14:59:48 +08:00
Joachim Grill 80ca579a01 added Sprite test case which loads PolygonInfo of sprite from plist file 2015-09-29 15:44:13 +02:00
Liam 8368762b37 update for light3D 2015-09-29 18:33:28 +08:00
yangxiao ea538cd9da merge cocos 2015-09-16 10:37:24 +08:00
zhangbin 6f06ea19ac Merge branch 'v3' into performance-test 2015-09-10 16:06:36 +08:00
zhangbin e3161eb127 Remove performance tests from cpp-tests project. 2015-09-10 16:01:56 +08:00
江龙 8daf026c6c fix the AssetsManagerEx can not continuous transmission for large zip file. 
the testcase is extension/assetsmanager
 2015-09-08 16:34:02 +08:00
yangxiao 7f7b4f83c4 add outline material 2015-09-08 15:33:24 +08:00
yangxiao c3ac446f35 resolve conflict 2015-09-07 14:45:09 +08:00
songchengjiang cc6e2077f4 replace custom shaders by material files 
add Sprite3DVertexColorTest
 2015-09-02 16:30:24 +08:00
江龙 7ce5542ffc add scriptTest project manifest 2015-08-26 14:50:34 +08:00
geron-cn ede4651b5e add blendfunc Frame test case 2015-08-20 11:29:52 +08:00
Liam 7aa36d14be fix the skybox display error from editor files 2015-08-17 13:04:25 +08:00
fusijie bed3640e6c fixed retro pos. 2015-08-12 15:09:33 +08:00
WenhaiLin e81d5af12d Spaces should not be lost if label created with Fingerpop.ttf 2015-08-05 23:46:41 +08:00
yangxiao 0de2a3b33d add terrain test with light map 2015-08-03 14:02:46 +08:00
yangxiao 8a6c49b5a3 merge cocos 2015-08-03 09:54:29 +08:00
pandamicro 3c2e66e425 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 
# Conflicts:
#	.travis.yml
#	build/cocos2d_js_tests.xcodeproj/project.pbxproj
#	build/cocos2d_tests.xcodeproj/project.pbxproj
#	cocos/2d/CCFont.h
#	cocos/2d/CCFontAtlas.cpp
#	cocos/2d/CCFontAtlas.h
#	cocos/2d/CCFontFreeType.cpp
#	cocos/2d/CCFontFreeType.h
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
#	cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
#	cocos/cocos2d.cpp
#	cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
#	templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
#	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
#	tools/bindings-generator
#	tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
#	tools/travis-scripts/generate-bindings.sh
#	tools/travis-scripts/generate-cocosfiles.sh
#	tools/travis-scripts/travis_mac.yml
 2015-08-02 22:28:27 +08:00
tangziwen cee43ccebb update terrain again 2015-07-29 14:32:36 +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
pandamicro 05bb775438 Sync timelineParser and fix issue 2015-07-24 20:16:56 +08:00
VisualSj 64d247d91b Issue #12997: Add JS test case (ccs.BoneNode) 2015-07-24 15:45:19 +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
zhangcheng 4b8248c015 Optimization of Custom Data. 
replace ComExtensionData to ObjectExtensionData.
 2015-07-23 16:30:23 +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
Liam 99c1c33c61 update resource 2015-07-22 15:56:35 +08:00
fusijie 92e68cd9dc add sprite frame flash line bug test case. 2015-07-22 13:42:10 +08:00
andyque fbfb3a9dac update ccs-res submodule 2015-07-22 10:45:18 +08:00
WenhaiLin a6f8031af9 Label:support font that contains GB2312 char map.[except android] 2015-07-16 17:10:05 +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
andyque fc673ee502 Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
WenhaiLin adfa6d4f0d Add test case for issue 12775 2015-07-13 15:38:33 +08:00
pandamicro 600568fdba Migrate test case from #10692 @babcca 2015-07-12 11:33:22 +08:00
XiaoFeng 9a6ffd8904 Add bug test for PageView layout & CCNodeDraw::onDrawGLLine 2015-07-07 09:54:42 +08:00
Neo Kim a3cbd13402 Update the resource sub module reference 2015-07-01 18:44:59 +09:00
pandamicro ddb982246f Merge pull request #12553 from VisualSJ/v3-aa 
Encoded into AVC
 2015-06-26 10:15:02 +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
WenhaiLin 45de0b650a [ci skip]Fixed resources. 2015-06-19 16:26:03 +08:00
pandamicro 4fa1cdc302 Update submodules 2015-06-17 15:43:35 +08:00
pandamicro 0216d05eee Merge pull request #12102 from super626/navigation2 
3D Navigation
 2015-06-15 13:39:05 +08:00
WenhaiLin 4d97d5075b Add test case for issue12310. 2015-06-12 15:39:57 +08:00
yangxiao 44c2b0d5ad merge cocos 2015-06-11 15:54:42 +08:00
Ricardo Quesada 453a3d93bc samplers are treated as uniforms 2015-06-05 14:55:33 -07:00
yangxiao 8b5333a5c9 Merge branch 'newcode' into navigation2 2015-06-04 12:44:39 +08:00
Ricardo Quesada 6a19661a80 Merge pull request #12150 from ricardoquesada/material_custom_uniforms 
Material custom uniforms
 2015-06-03 13:08:04 -07:00
Ricardo Quesada ff81078062 fixes bug when calculating the dynamic values 2015-06-02 17:48:50 -07:00
Ricardo Quesada 5f6f38616a Merge remote-tracking branch 'cocos2d/v3' into material_custom_uniforms 2015-06-02 17:05:05 -07:00
Ricardo Quesada 87a3a1844a Adds support for Autobindings in Shader 
...part of Material
 2015-06-02 16:56:59 -07:00
jianglong0156 0c821379f8 modify video mp4 formate 2015-06-02 17:07:11 +08:00
yangxiao 3d4606921b merge cocos 2015-06-02 14:27:31 +08:00
yangxiao c782d63bef add 3d navigation 2015-05-29 16:45:33 +08:00
子龙山人 a968bc2d15 Merge pull request #12062 from jianglong0156/jsWebviewTest 
Js webview test
 2015-05-29 11:35:30 +08:00
samuele3hu a89e000f80 Synchronize the modification of filenames about shaders to fix the bug of MateriaSystemTest . 2015-05-28 10:46:44 +08:00
Dale Stammen 9ee4b4af1e Merge branch 'v3' into v3-winrt-audio 2015-05-27 11:54:21 -07:00
jianglong0156 e105c47cb0 improve testcase 2015-05-27 18:23:56 +08:00
子龙山人 c8d8a9cfd2 Merge pull request #12022 from jianglong0156/modifyTestResource 
Modify test resource
 2015-05-27 15:05:32 +08:00
jianglong0156 7820610f13 Merge branch 'modifyTestResource' into jsWebviewTest 
Conflicts:
	cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
	tests/js-tests/project.json
	tests/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js
	tools/tojs/genbindings.py
 2015-05-26 17:49:17 +08:00
jianglong0156 4d6b763eb6 rename shader file name 2015-05-26 17:21:35 +08:00
jianglong0156 5b7cf14384 rename shader file name 2015-05-26 17:20:48 +08:00
jianglong0156 6f67ec1e6c Merge branch '2d-xv3' into modifyTestResource 2015-05-26 16:23:25 +08:00
jianglong0156 fe677f32dd delete js resource 2015-05-26 14:28:53 +08:00
jianglong0156 fd05998b5f fix the bug: shader in jsb can not run correctly. 2015-05-25 17:48:34 +08:00
jianglong0156 82c5fbbc76 add js resource for web tests 2015-05-25 16:50:27 +08:00
anniruddh.koppal b2eb946c14 Added MP3 support 2015-05-23 19:13:12 -07:00
minggo d5d329b74f Merge pull request #11946 from andyque/v3-final-android-9-patch-feature 
add Android 9-patch image format support
 2015-05-22 09:52:12 +08:00
jianglong0156 9ed290e64e Merge branch 'jsTest' into modifyTestResource 2015-05-21 17:35:13 +08:00
andyque 0352a7a3ea add Android 9-patch image format support 
commit c214c4a7a457275785d6377031b5a267d543ffbb
Author: andyque <guanghui8827@126.com>
Date:   Mon May 18 17:16:09 2015 +0800

    Add Android 9-patch format support.

    Squashed commit of the following:

    commit a5a5a7a8f25b5bddae0ba21c56676a3f8d84102a
    Author: andyque <guanghui8827@126.com>
    Date:   Mon May 18 17:08:05 2015 +0800

        finish refactoring

    commit 730bf817f833de56999c616779fc0279890e14bf
    Author: andyque <guanghui8827@126.com>
    Date:   Mon May 18 11:47:08 2015 +0800

        refactoring 9-patch

    commit b45be6d54ac6e70a3fb9aa3eb700b252e4e72a54
    Author: andyque <guanghui8827@126.com>
    Date:   Mon May 18 09:42:06 2015 +0800

        refactor

    commit 384110193f1d581c4a0fb7a2c771c55f1db63cbf
    Author: andyque <guanghui8827@126.com>
    Date:   Fri May 15 17:59:21 2015 +0800

        fix lua and Android compile error

    commit 2877538fb3a436f95400b2ad637ea147b9df81d7
    Author: andyque <guanghui8827@126.com>
    Date:   Fri May 15 11:32:43 2015 +0800

         Add Android 9-patch image format support.

        The 9-patch format is used for creating Scale9Sprite.
 2015-05-21 16:04:37 +08:00
jianglong0156 5af04be9ad add js-test resources 2015-05-21 15:38:41 +08:00
anniruddh.koppal 9081304e80 reduced audio file sizes 2015-05-18 19:00:59 -07:00
anniruddh.koppal 2db5a89b87 Added new audio engine with wav support 2015-05-15 18:17:52 -07:00
yusheng.lu 60190a1be6 changed csb names in ccs-res to shorter 2015-05-14 18:08:37 +08:00
Ricardo Quesada fde5f8d63c Adds better sample 
adds clone support as well
 2015-05-13 17:39:39 -07:00
Ricardo Quesada e95de4de62 fixes mipmap issue with parsing Sampler 2015-05-13 10:24:32 -07:00
Ricardo Quesada c693573d77 more samples 
and API fixes
 2015-05-12 22:24:52 -07:00
Ricardo Quesada 1937431596 Material uses new file format 
The new file format is easier to read and less error prone
It also fixes many bugs and adds new test cases
 2015-05-11 21:31:33 -07:00
yangxiao 2391558c96 add physics3d support 2015-05-08 15:49:33 +08:00
Ricardo Quesada ce95bfe059 Squashed commit of the following: 
commit 3676fd8b4fe09be74fe10a6e2b8d6043cd016a2a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 5 11:46:57 2015 -0700

    compiles on win32

commit 0b8d30a3f8b2656e714846a62ca8a94b303efbdc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 5 11:01:04 2015 -0700

    compiles on windows!

commit 8cad22273ec2d9b74ef22196afcb8aa2f2bd8a6c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 5 10:20:13 2015 -0700

    windows fix

    CALLBACK is defined in windows. Use CALLBACK_FN instead

commit 33eff5c09c30e5ba6c8e61a69d1be0696d0b5d15
Merge: 17c5102 f843466
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue May 5 09:51:02 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 17c5102215e60c9e9b8b69ceb6b61b84b657ec91
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon May 4 17:05:49 2015 -0700

    Material system works Ok.

    Deftaul states are being applyied to RenderState::StateBlock::_default
    state as well!

commit 3f5285102ef95c77c505d0f2174f8f77b9bd86e1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon May 4 15:52:09 2015 -0700

    more fixes for material

    blending works as expected

commit 347eaea42248eb07bc77844dcee56dcbcf0fbcb2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon May 4 12:14:00 2015 -0700

    compiles on Android

    compiles on Android

commit 5feef67410a6e8408414230887c177a5cc3d8c35
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon May 4 11:01:46 2015 -0700

    Cmakefiles

    works with Cmake again

commit 1366da20efd4f63f683ac9264e18aa71d84bcc71
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat May 2 18:17:50 2015 -0700

    Particle3D working Ok with its own uniforms

commit c6cfa32e1f693e6d71d00e0cd9dd9610ca1e7663
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 1 17:32:00 2015 -0700

    MeshCommand now works 100% on Material!

commit 92d641e29675ffc58daba48fcdcc5ec6459be02f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 1 15:49:14 2015 -0700

    multiple meshes work Ok

commit 842927d18b5605b2fd1bd3a679fc25418c7eeab8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri May 1 13:43:56 2015 -0700

    Adds `clone` to GLProgramState

commit c4b8e222f8e852254b1f23f0e17c16dfca7cc5ca
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 30 18:54:34 2015 -0700

    adds comment about the glprogramstate bug

commit 2d008ec90557025507e0b17284e60b39fc9b42d3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 30 18:28:39 2015 -0700

    some uniforms moved to Material

commit 11f59f87079a6cb698c7e9b5a55735f6d51cf420
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 30 16:52:07 2015 -0700

    depth test moved to Material!

commit 4dabb53641c293bfe8c417fe3491ec33b33ffc4e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 30 13:12:28 2015 -0700

    Material/Technique/Pass subclass of RenderState

    Inheritance of RenderState. Code from GamePlay3D

commit a8b888dc30cf7ab4fae186acec2a366dfb967116
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 30 12:05:26 2015 -0700

    same as v3

commit c026de5318a2a03beed1de6d7a0efda431569a5c
Merge: 4561e3f 254a4b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 30 11:37:40 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 4561e3f5763849872d888a3be9ebbdcfb1a7bf9d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 29 18:02:21 2015 -0700

    fixes on blending

commit 1b4cd8fd1c7b2a489b6a52ab6d42548eb7c7fac0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 29 17:51:05 2015 -0700

    better defaults for StateBlock

commit 3a661c35908aa075754d7b9dfac45be1af3b38e9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 29 17:46:36 2015 -0700

    RenderState::bind() binds lots of states

commit 074d5fb4a485e4ac32996c345e314594806e3cf0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 29 16:40:07 2015 -0700

    Adds REnderState parsing in .material

commit 7c0f098b7e2e198aa4a821bfbdec661eeba2587e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 29 16:06:31 2015 -0700

    RenderState added into RenderState

    Code based on GamePlay3D. Adds GamePlay3d License.

commit 04a6295ca5839e2e1202881b8a10733685c113d6
Merge: 52c916f 5671818
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 29 11:27:55 2015 -0700

    Merge branch 'v3' into material_system

commit 52c916fb4df04558433b1370102a5e9269f73607
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 28 18:15:12 2015 -0700

    order files alphabetically

    order files alphabetically

commit a5f54f0c1ca5d997a87e0231ce1b28d3c8d9ca64
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 28 17:46:07 2015 -0700

    Adds cmake and android support

commit 2432b1dd2ec3c7db78d4d9e5e7b9fbe491b95884
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 28 16:33:50 2015 -0700

    for some reason the callback was crashing

    ... bug in the callback code?
    in any case, we didn't need it and it was making the code slower.

commit 7844d32d04cb411ddae139d9598adcb04b899606
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 28 14:00:24 2015 -0700

    more little fixes

commit 2992a5e0f4a8dfac87d6aab37e101154f8b41519
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 28 12:11:28 2015 -0700

    MeshCommand using Material internally

    works

commit 67a435d66b4e554b4d24e462ca2ad42408157e69
Merge: 6dee7ca b9a994f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 28 10:34:03 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 6dee7cac6a51b4c123aabb111b0f8951082b1507
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 27 17:41:27 2015 -0700

    improved readebility of MeshCommand code

commit 3a57eb200f7cba4a17f512060dd3f121d83e32fd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 27 15:41:07 2015 -0700

    mesh supports Material

    `Mesh` supports `Material`
    Now `MeshCommand` needs to implement it correctly.

commit 2fc745c787555fbd5c6b100b0a2833ef0e65ad73
Merge: 05b16f5 bd5f4e0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 27 11:23:28 2015 -0700

    Merge branch 'v3' into material_system

commit 05b16f5c6f783ff38b4ae54528f9b949d8bb39a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 24 17:40:48 2015 -0700

    Adding Material into Mesh

    WIP.

commit bc62f1a146ff9ad9864d8ff317f6a9540760066a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 24 16:39:54 2015 -0700

    cosmetic

commit 2f86d50cee15c6af20abb512368aa36dc4ed3ccf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 24 16:26:41 2015 -0700

    moves even more code form Sprite3D to Mesh

commit 04643bed3c277f0a775e962a5c87f550b1a59e74
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 24 16:15:21 2015 -0700

    Moves "draw" from `Sprite3D` to `Mesh`

commit 4bf884cdcb1a8df7522adeab364368493aba11e0
Merge: 2f305fc 2199bf1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 24 15:00:50 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 2f305fc68ad847fd4bdf855611c6f6f6a4bf63d2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 24 14:46:28 2015 -0700

    cosmetic

commit a697b43a96e5f9440787aa2a1c4e178d98b2e5bc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 23 16:44:21 2015 -0700

    revert my changes...

    ...actually the GLProgramState code was Ok... ouch

commit 36323c62eae2f8dbdcd7e13075758752cce44132
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 23 15:40:54 2015 -0700

    parsing GLProgramState validates the attributes

commit a406d6236a78244f73e81ded0b4148199a8677e5
Merge: 3be7fde cf177bb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 23 12:10:31 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 3be7fdee9d88a14916b4f25b1c0b6f50cb619c04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 22 17:45:34 2015 -0700

    little progress on Sprite3D + Material

    GLProgramState needs to decouple Uniforms from Attributes in
    `applyGLProgram`.

    binding the attributes is something that needs to be done
    at a different order.
    Perhaps the attributes are part of a VAO or something else.
    the method `applyAttributes()` has a variable to avoid that...
    but everything looks very hackish.

commit f82496c61c9cb5a0787f883a4fb2d475889fa711
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 22 15:46:02 2015 -0700

    doesn't crash :)

    but doesn't show anything either

commit 0593fb09dc987aa2dd22af3a6c3aa8241fedfe5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 22 13:35:45 2015 -0700

    adding sprit3d test

commit e716da63fe053b48db06f2aed9e0280256dd5f1b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 22 12:10:32 2015 -0700

    MeshCommand: initial draw with Material

commit d758041d81c3e6275997205e6395c46006bcc4ca
Merge: 8cdc99f ca1a95f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 22 10:41:05 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 8cdc99fca664b0c9c2a536d431ffcc7844d69b3e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 21 21:57:28 2015 -0700

    adding Material to MeshCommand

commit 0121872709c5e584b9b9f102e0f8dfc9c836841b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 21 19:39:09 2015 -0700

    pre commit before merging MeshCommand

commit 06c0ac2a67e303bde98dff75ac436ec22de59263
Merge: 736feb1 0287b42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 21 18:19:00 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 736feb1b6495b7411525afb130015bdb31b5c471
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 20 17:22:03 2015 -0700

    Pass conforms to create()/init() pattern

commit 6103ffbb8479681b6665e81f0572bc3287919d07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 20 17:04:19 2015 -0700

    defines are strings

    better error checking when creating objects
    autorelase added in Pass, Material, Technique

commit 1efcbab63c7ca4259d50825144184baee1b577ac
Merge: 5b233bc fd3e38b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 20 11:23:47 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 5b233bc879bd65123092d366257843465ec1d306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 17 15:31:37 2015 -0700

    blur effect works with alpha

commit 836d3c4a0dcc3a363e1b0290e628b7ac2a973c89
Merge: e4c1dd2 425b2b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 17 15:04:35 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit e4c1dd23d8b28f2631efe30f6cc9da9eda4501bb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 17 15:04:07 2015 -0700

    Material, Technique, Pass: they have parent

commit 7c3f258a1c9e4ff319db4e3eebfd39006d673d91
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 16 21:48:06 2015 -0700

    multipass works

commit b73ede73b72d8305f6f9d7898b4a5aa2336e9e32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 16 17:31:04 2015 -0700

    yeah!

    more materials... a lot to do yet

commit d54d24ed185071ce1350bbf71914a64c9f6f228e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 16 17:06:46 2015 -0700

    yeah! works!

commit 1e70cb553148e6c136df42a789bf85184e73762d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 16 16:43:54 2015 -0700

    simple test of material system works!!!

commit c8581dfe9e970a3004254987416d75cccc644ccd
Merge: 83aeec4 5d5fa3d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 16 13:51:45 2015 -0700

    Merge remote-tracking branch 'cocos2d/v3' into material_system

commit 83aeec41c7933ee46f5763ad64dcdc71a50885dc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 15 18:04:23 2015 -0700

    JSON file curated

    fixes minor bugs

commit 35f669e7fad6257ff6e60023e95ec757fdfe23f5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 15 17:22:36 2015 -0700

    parsers shaders!

    including uniforms

commit 3f58bad0b2bc7ebbcfcf74e1eb02048f9d574340
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 14 23:24:18 2015 -0700

    Material parses texture

commit 1f678faf9d6c25f6405591f052da511281be8768
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 14 18:22:33 2015 -0700

    material parsing almost working

commit 9a79c45fe4d735a772d5e6d9e1f8bcb02546560d
Merge: d0ff296 d54ddbd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Apr 14 09:23:23 2015 -0700

    Merge branch 'v3' into material_system

commit d0ff2960f4f9edc4714f9d3edf921f3365d305c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 13 18:42:42 2015 -0700

    json parsing broken

    ha... I need to parse the content of the file, to the name of the file.
    to be fixed tomorrow

commit e5aab39e5774d997f848155fc7209e9fbbd03bbc
Merge: 81e93fa bc34554
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Apr 13 10:19:11 2015 -0700

    Merge branch 'v3' into material_system

commit 81e93faac9d80888e975ee19d7412c54daf439a0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 10 17:41:12 2015 -0700

    Adds more dummy files for material

commit 5552a1e099bcf960d962c5369973ea663f802895
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 10 17:01:16 2015 -0700

    adds empty test

commit 7027c85fb24109f1ed4c50877dbec35618b5b39c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 10 15:36:24 2015 -0700

    more material fixes

    multiple passes added in renderer

commit db6745ead9879c6ce66b1921f32bf927421c54d9
Merge: 58d2412 8a160d7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 10 11:52:30 2015 -0700

    Merge branch 'v3' into material_system

commit 58d241266bdbd88162bb7ae9a7e868af173e6375
Merge: 0eccb23 b409f20
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 9 15:42:35 2015 -0700

    Merge branch 'v3' into material_system

commit 0eccb236aa933eb471416258c5bb55a7ca3a24f0
Merge: 83494de 967f35a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 9 15:18:34 2015 -0700

    Merge branch 'cpp_compiles_on_mac' into material_system

commit 83494dedd0f4e7092f0267187cf07bd7de7723c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 9 15:09:59 2015 -0700

    compiles on Mac

commit cca5b060164182b67df21fa330dce938e17fb324
Merge: dfc3740 09c50c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 9 13:54:59 2015 -0700

    Merge branch 'v3' into material_system

commit dfc374099ca02e547478d24fa8fd61817a85862c
Merge: fa2152b 64c45fa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Apr 8 14:16:27 2015 -0700

    Merge branch 'v3' into material_system

commit fa2152b3402e3519d35f98309c4acc03b6790370
Merge: 90b7b6f b648d1f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 3 10:15:28 2015 +0800

    Merge branch 'v3' into material_system

commit 90b7b6f6540edff156e22fdf38021a5c83194deb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Apr 3 10:13:24 2015 +0800

    little changes to pass

commit 7f8b83017f03572a3698f431b6af497d62fcfa25
Merge: 7460614 0779d05
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 2 08:36:43 2015 +0800

    Merge branch 'v3' into material_system

commit 7460614dd8b7eff5d8c759be54dd205333b26033
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Apr 2 08:23:17 2015 +0800

    small changes

commit fa0354e74983795adafad3bedc9c50f6e8e328c9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Thu Mar 26 18:20:46 2015 -0700

    initial Material system
 2015-05-05 13:07:32 -07:00
zhangbin b4f2d94109 Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
lvlong 8e51a561b1 modify some about animate3D quality! 2015-04-24 11:49:28 +08:00
minggo fbb1c578a2 Merge pull request #11430 from minggo/update-spine 
update spine runtime to v2.1.25
 2015-04-14 17:01:11 +08:00
minggo cdd7acc537 add spine test case 2015-04-14 16:14:51 +08:00
XiaoYang 5ed65e13c9 Merge pull request #303 from zhukaixy/texturecube 
bugfix for cubemap
 2015-04-14 14:25:35 +08:00
zhukaixy 451a560200 bugfix for cubemap 2015-04-14 14:20:31 +08:00
yangxiao 8c8058a9be merge cocos resolve conflict 2015-04-14 13:56:05 +08:00
zhukaixy 6684491249 1: update cube texture for sky box 
2: add mouse-controled camera for test case (skybox)
 2015-04-14 01:39:23 +08:00
minggo da69dbd133 Merge pull request #11388 from xiaofeng11/v3 
Reader update
 2015-04-13 11:20:53 +08:00
pipu 755134ba3f Update parse animation easing 2015-04-10 17:05:55 +08:00
pipu 7a67b6ccce Test samples 2015-04-10 14:52:54 +08:00
WenhaiLin b5ae74c52b [ci skip]Update the reference of submodule ccs-res. 2015-04-09 17:07:37 +08:00
tangziwen 0c2c8b072a terrain update terrain test update ,resource update 2015-04-08 15:13:24 +08:00
tangziwen 0193420dfc Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain 
Resovle Conflicts:
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-04-03 15:45:51 +08:00
minggo c1cd041912 Merge pull request #11221 from super626/v3 
3d animation quality control
 2015-03-31 17:23:58 +08:00
XiaoYang 45987b6a60 Merge pull request #276 from tangziwen/terrain 
update Terrain, support skirt
 2015-03-31 09:14:27 +08:00
tangziwen 1a93f87a15 update terrain 2015-03-30 18:25:22 +08:00
lvlong 4bc44c207d modify config-example.plist 2015-03-30 18:07:32 +08:00
lvlong ccb5039411 Merge branch 'v3' of github.com:super626/cocos2d-x into v3 
Conflicts:
	cocos/base/CCConfiguration.h
 2015-03-30 11:50:01 +08:00
minggo 59441adc2c Merge pull request #11213 from super626/texturecube 
Texturecube bug fix
 2015-03-30 10:48:10 +08:00
yangxiao b469cfa928 merge cocos 2015-03-30 10:28:14 +08:00
zhukaixy 8a1637e3de Update cube_map.frag 2015-03-27 16:50:59 +08:00
yangxiao a45f0d1a76 merge cocos 2015-03-27 16:50:40 +08:00
yangxiao 7af9957e1c reset submodule 2015-03-26 12:56:38 +08:00
yangxiao 84535feb0c merge cocos 2015-03-26 11:59:26 +08:00
lvlong c999307150 add different animate quality. 2015-03-26 11:30:22 +08:00
lvlong f93dffdeb0 node frame animation test and resource 2015-03-26 09:25:37 +08:00
pipu 0bdfe99731 Update resources of Test TestTimelineProjectNode. 2015-03-20 17:08:15 +08:00
yangxiao 0106c1184e add pu for performance test 2015-03-19 15:00:07 +08:00
yangxiao e6770909f2 reset expolosion 2015-03-17 17:47:53 +08:00
yangxiao dced8004e1 reset explosion and fix bug of event handler 2015-03-17 17:44:52 +08:00
songchengjiang 7e5af41817 replace mp_fire_02_2x2.dds with mp_fire_02_2x2.png 2015-03-13 16:34:21 +08:00
songchengjiang 444dbfdf9e replace .mesh with .c3b 
modify ParticleUniverse file structure
 2015-03-05 14:54:32 +08:00
yangxiao 68eaadaffb merge cocos 2015-03-04 09:57:42 +08:00
yangxiao 36723fcb68 reset submodule 2015-03-03 18:34:51 +08:00
songchengjiang 5c460ebb2d add/update particle files 2015-03-02 13:07:32 +08:00
yangxiao d5bde9e536 add missing material 2015-02-28 12:57:15 +08:00
yangxiao 218de84cc5 remove expolosion particle 2015-02-28 11:31:15 +08:00
Ray 0f8f0322c8 fix ccs-res 2015-02-26 10:10:32 +08:00
Ray ff07f62e83 fix CocosStudio 3DReader test resource 2015-02-25 15:49:04 +08:00
Ray 71f90306f7 update ccs-res submodule 2015-02-25 15:40:46 +08:00
Ray c66a4f28bc Add CocosStudio UserCameraReader 
fix Sprite3DReader Test
 2015-02-25 14:19:08 +08:00
Ray 35e3e8d62d Sprite3D Reader and tests 2015-02-23 00:34:30 +08:00
Ray 73e40f1c4b Node3DReader Test 2015-02-19 16:18:54 +08:00
yangxiao 79a0c0152a add 3d particle (Particle Universe) 2015-02-11 18:14:22 +08:00
tangziwen 10eced8b98 bug fix upload new sample texture 2015-01-30 15:46:39 +08:00
zhukaixy f3536056d8 Simpilify skybox 2015-01-29 19:01:10 +08:00
zhukaixy ee99700ec1 add test case TextureCube 2015-01-29 09:28:14 +08:00
geron-cn 3268dbc9fd add cpp-test for animation list and projected 2015-01-28 02:12:09 +08:00
minggo 880abfe814 Merge pull request #10209 from andyque/fixLoadingBarReloadTexture 
Fix loading bar reload texture issue
 2015-01-27 13:50:38 +08:00
andyque 691e1925ca udpate test resource submodule 2015-01-26 15:05:41 +08:00
yangxiao 5e1d7449f7 complete use case 1 2015-01-26 14:58:16 +08:00
yusheng.lu 304f28a58a Update the csb resources for current Cocos2d-x 2015-01-21 17:08:16 +08:00
yusheng.lu a35be8977a Submodule ccs-res go forward. 2015-01-20 19:18:23 +08:00
tangziwen 25cd1f4c02 update test 2015-01-20 10:34:30 +08:00
pipu 34402b75c9 Merge branch 'v3' into parse_inneractionframe 2015-01-12 13:38:30 +08:00
pipu 82be4701b5 Update resource DemoPlayer.csb in path tests/cpp-tests/Resources/ActionTimeline 2015-01-12 11:12:38 +08:00
songmiao dfa6137ce9 modify arcball and fog shader 2015-01-07 17:58:10 +08:00
songmiao 41cd946e27 modify fog shader format and notes 2015-01-07 15:47:27 +08:00
songmiao c522a72f66 modify fog shader for ios device 2015-01-07 14:56:34 +08:00
songmiao d1845f89fe add fog test and arcball camera test 2015-01-07 11:47:34 +08:00
minggo 3c1978fcc3 Merge pull request #9611 from super626/quaternion 
Rotation With Quaternion
 2014-12-30 10:09:08 +08:00