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

2305 Commits

Author SHA1 Message Date
Ricardo Quesada 13dc967b03 js_get_or_create_jsobject() and other stuff 
- getDescendatns() converted
- singletons converted
- new helper template-specialized js_get_or_create_jsobject()

Squashed commit of the following:

commit 3f21e65bca5f7e5e5c4bf304f2daed0eff26f6aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 7 19:04:24 2015 -0800

    logging added (and commented)

    will be useful in the future

commit f995295b385a515c1f82136688610a90eb379855
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 7 19:00:09 2015 -0800

    new js_get_or_create_jsobject<T>

    Specializes Template on cocos2d::Ref.
    When Ref, it calls the `jsb_ref` functions

commit 240b80e4080757ebb47db0d02a1fe1f875237d24
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 7 13:31:52 2015 -0800

    singletons converted

commit 667d94bf90267c103b620630bacfffa7767b42dd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 7 12:20:07 2015 -0800

    getDescendants() converted
 2015-12-07 19:05:23 -08:00
XiaoFeng b435f1df86 Fix wrong #endif statement 2015-12-07 10:44:52 +08:00
XiaoFeng 0328c31596 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_xf 2015-12-07 10:27:38 +08:00
Ricardo Quesada d02f4afd4a using new bindings templates 
ignores createInstance() from ui
 2015-12-05 22:26:54 -08:00
Ricardo Quesada cd8631ef09 sfunction "create" uses new optimized code 
...although this code should never be called
 2015-12-04 18:42:31 -08:00
XiaoFeng 76bd37e109 Add missing export declaration. 2015-12-04 19:40:09 +08:00
Ricardo Quesada e5d722b2a8 new bindings 2015-12-02 15:24:49 -08:00
yangxiao 45b25666ea reset submodule 2015-12-02 13:28:24 +08:00
yangxiao ebd5c1cca7 resolve conflict and fix checktexture bug 2015-12-02 11:26:05 +08:00
pandamicro df62e92d7b Correct bindings generator ref 2015-12-01 23:50:52 +08:00
yangxiao 1b3cb97b71 fix script binding 2015-12-01 23:05:47 +08:00
XiaoFeng e5d57b4fa2 update binding-generator sub module & code 2015-12-01 22:30:36 +08:00
yangxiao 01e0803587 not export Sprite3DMaterial::setTexture 2015-12-01 20:27:31 +08:00
yangxiao 84068c5189 not export Mesh::getTexture and Mesh::setTexture 2015-12-01 18:05:03 +08:00
yangxiao f298e49bf3 not export lua Mesh::getTexture and Mesh::setTexture 2015-12-01 17:39:00 +08:00
yangxiao 6fe361f06e not export Mesh::getTexture 2015-12-01 15:13:51 +08:00
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
XiaoFeng 167aa9b648 Update console sub-module, update project template.json to meet file position change 2015-12-01 15:00:45 +08:00
yangxiao 9b371a55bf js not export Mesh::setTexture 2015-12-01 14:35:39 +08:00
pandamicro 08837955a7 Skip Useless MenuItemToggle::initWithCallback to fix windows compilation issue 2015-11-30 23:54:42 +08:00
pandamicro 43c68aa16b Fix Chipmunk bindings issue 2015-11-27 22:38:16 +08:00
fnz 8c691430c1 conflicts resolved 2015-11-27 13:19:10 +03:00
fnz c4b995fe59 updates to JniHelper, refactoring of existing JNI calls 2015-11-27 12:00:33 +03:00
pandamicro ae2b75c8be Fix issues causing by temporary RootedObject passed as function parameters 2015-11-27 01:35:06 +08:00
XiaoFeng 5a2a343152 update code as comment 2015-11-26 17:38:32 +08:00
XiaoFeng 9811d6efcf Combine studio change for LuaBinding, jsb and simulator 2015-11-25 21:52:44 +08:00
pandamicro be2a3077c2 Remove useless manual bindings for addEventListener functions in UI 2015-11-25 14:15:45 +08:00
pandamicro 930405d52c Remove useless manual bindings for MenuItems 2015-11-24 16:32:02 +08:00
XiaoFeng 32f21ca5be Binding ResouceData structure to js to fix auto compile error 2015-11-19 14:31:39 +08:00
肖峰 3aeb5e0389 Fix when start simulator in CocoStudio to run a scene, can not read the correct config.json on MacOSX 2015-11-09 23:30:03 +08:00
XiaoFeng c0c35c603e Update version number & RELEASE_NOTES.md, prepare 3.9 release 2015-11-06 18:38:09 +08:00
pandamicro 01fdb60b7d Merge pull request #14311 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-11-04 10:45:35 +08:00
zhangbin 47ea0dfb02 Update the reference of submodule cocos2d-console. 2015-11-04 10:43:30 +08:00
pandamicro 0dabb4cfb7 Merge pull request #14295 from xiaofeng11/v3_xf 
Fix CodeIDE  can not start js project with simulator
 2015-11-03 17:37:01 +08:00
zhangbin bfa50de768 Update the reference of submodule cocos2d-console. 2015-11-03 16:06:12 +08:00
hugo 0dd0233ba7 update sdkbox console 2015-11-03 13:06:09 +08:00
geron-cn c6feb3d34d update submodule cocos2d-console 2015-11-02 17:49:26 +08:00
XiaoFeng 218b5625bf Fix can not start js project with simulator in CodeIDE 2015-11-02 17:36:47 +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
pandamicro a3c2904e7f Fix cc.DrawNode.drawPoly 2015-10-27 16:46:25 +08:00
XiaoFeng 83a48ee501 Fix simulator run time only check screen direction flag, but won't check if size setting need swap 2015-10-19 19:43:10 +08:00
pandamicro be45e0bc50 Merge pull request #14174 from noshbar/v3 
CPPCheck fixes, correct deallocation, array size.
 2015-10-19 10:05:01 +08:00
pandamicro 784dbc4c88 Merge pull request #14158 from cocos2d/revert-14144-v3 
Revert "Remove screen direction check in simulator"
 2015-10-18 22:49:09 +08:00
Dirk de la Hunt 88bcaad518 General fixes: 
- changed some delete operations to be deletions of arrays where applicable
 - changed some "free" operations to "delete" where memory was allocated with "new"

CCPUScriptCompiler.cpp:
 - added checks to see if temp1 and temp2 are non-null before dereferencing them

FileServer.cpp:
 - changed the size of startFlag to be 13, seeing as the strcpy into it copies a string, "RuntimeSend:",
   is already 12 characters long, but strcpy() attempts to copy the NULL terminator too.
 2015-10-16 21:43:09 +02:00
hugo 2bf7f8ae3f update console 2015-10-16 16:10:08 +08:00
pandamicro 8915fc6cb9 Revert "Remove screen direction check in simulator to avoid render error" 2015-10-16 11:36:20 +08:00
zhangcheng 3edbf0f4a3 Fix#22934 
Node, Skeleton needs to show at the middle of the simulator.
 2015-10-15 19:35:06 +08:00
XiaoFeng ca8977b6f8 Remove screen direction check in simulator to avoid render error 2015-10-15 10:11:26 +08:00
XiaoFeng 90b96be690 Fix when scene been set a very large size(eg. 2048x1536), the simulator windows will been move out of window 2015-10-13 13:01:37 +08:00
zhangbin f25b62b4b5 Update the reference of submodule cocos2d-console. 2015-10-12 14:16:18 +08:00
Joachim Grill 9a0ea79b61 remove set/get/hasPolygonInfo methods from js / lua api; fixed C++11 issue 2015-09-30 15:20:53 +02:00
pandamicro 4f6bdd6d74 Fix mistaken uploaded lua bindings 2015-09-29 14:52:47 +08:00
pandamicro 7b85211cfe Remove ScriptComponent 
Because windows platform can't successfully compile in previous architecture
 2015-09-27 22:18:59 +08:00
pandamicro 2a3526a3fd Fix lua project 2015-09-26 19:43:36 +08:00
pandamicro 91928aa23d Add ComponentJS test case and fix windows platforms 2015-09-26 19:43:36 +08:00
pandamicro ddb636a022 Add ScriptComponent and ComponentJS 2015-09-26 19:43:36 +08:00
pandamicro 7e2b8c71a7 Improve lua script component 2015-09-26 19:43:35 +08:00
minggo 26632ec69a linjia demo finish 2015-09-26 19:43:35 +08:00
江龙 9eb05707fb add custom spine skeletonAnimation test 2015-09-25 13:36:48 +08:00
pandamicro d3504a9216 Update versions and html5 engine 2015-09-22 02:31:21 +08:00
WenhaiLin 4241df7af7 Fixed binding... 2015-09-21 15:41:14 +08:00
WenhaiLin 2288b7e8d1 Fixed tools/travis-scripts/before-install.sh... 2015-09-21 15:22:00 +08:00
WenhaiLin 460d0fd5a6 [ci skip]Fixed tools/travis-scripts/before-install.sh 2015-09-21 14:58:14 +08:00
WenhaiLin 1c7d4805ef Fixed travis-scripts/before-install.sh 2015-09-21 13:52:28 +08:00
pandamicro 44329d96ba Merge pull request #13946 from WenhaiLin/v3-binding-tool-refine 
Refine lua/js binding tool
 2015-09-20 16:42:40 +08:00
WenhaiLin a3f363735e Refine lua/js binding tool 2015-09-19 00:08:15 +08:00
pandamicro 0cbc1e5f40 Merge pull request #13923 from WenhaiLin/v3-physics-refine 
Refine components to improve physics performance
 2015-09-18 21:56:36 +08:00
WenhaiLin a17a702cd1 Refine components to improve performance 2015-09-18 14:34:02 +08:00
Vincent Yang 56ea700d37 Fix bug: new project created by template compile error. 2015-09-18 11:40:16 +08:00
zhangbin aaabe42e75 Update the reference of submodule cocos2d-console. 2015-09-16 11:01:52 +08:00
子龙山人 4c4a007b99 Merge pull request #13797 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2015-09-15 10:06:24 +08:00
pandamicro 1e7b78b057 Merge pull request #13795 from pandamicro/v3 
Update bindings-generator to initialize numeric/pointer variables
 2015-09-14 11:54:02 +08:00
zhangbin da24454c6c Update the reference of submodule cocos2d-console. 2015-09-14 11:46:02 +08:00
pandamicro b0dc83aed8 Update bindings-generator to initialize numeric/pointer variables 2015-09-14 11:22:06 +08:00
zhangbin 5d47ce8f23 Add tools for converting the performance tests data to excel files. 2015-09-14 09:52:21 +08:00
江龙 4509a316cc add uniform conversion 
relate issue:https://github.com/cocos2d/cocos2d-x/issues/13747
relate pr:https://github.com/cocos2d/bindings-generator/pull/191
 2015-09-09 16:03:57 +08:00
pandamicro dc607a1784 Merge pull request #13726 from jianglong0156/actionExtendSquash 
support custom action, and rewrite update function
 2015-09-09 10:25:56 +08:00
江龙 badd80bf3a support custom action, and rewrite update function 
support custom action in js, and developer can rewrite the update function in custom action class.
useage:
// custom action sample code
var customMoveBy = cc.MoveBy.extend({
    ctor:function (duration, deltaPos, deltaY) {
        this._super(duration, deltaPos, deltaY);
    },
    update:function (dt) {
        this._super(dt);

        if (this.getTarget()) { // rand color
            this.getTarget().setColor(cc.color(cc.rand()%255, cc.rand()%255, cc.rand()%255));
        }

    }
});
 2015-09-09 10:08:07 +08:00
minggo 8326ed6535 add physics component 2015-09-08 09:54:01 +08:00
zhangbin d145416e1f Update the reference of submodule cocos2d-console. 2015-09-07 17:36:54 +08:00
pandamicro 4fb34ba190 Merge pull request #13703 from cocos2d/v3.8 
Sync v3.8 to v3
 2015-09-07 14:56:37 +08:00
zhangbin 2c6c35cb76 Update the version displayed in about dialog of windows simulator. 2015-09-01 18:00:50 +08:00
XiaoFeng 4cd3683e5b Use solution path as root path 2015-08-31 18:14:38 +08:00
XiaoFeng be2be30162 Fix missing config.json notice when simulator start to run a cocostudio project 2015-08-31 16:16:10 +08:00
zhangbin 2520e16cc0 Update the reference of submodule cocos2d-console. 2015-08-31 12:04:18 +08:00
pandamicro d6045fdbea Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/audio/winrt/Audio.cpp
	cocos/platform/winrt/CCCommon.cpp
	cocos/platform/winrt/CCWinRTUtils.cpp
	cocos/platform/winrt/CCWinRTUtils.h
 2015-08-27 10:40:04 +08:00
VisualSj 71f4b804ea Add BlendFuncFrame auto binding 2015-08-26 13:42:52 +08:00
andyque c2fae3987b fix Jenkins template compile 2015-08-24 10:26:12 +08:00
pandamicro 6ee33499b4 Update changelog and versions for v3.8 rc0 2015-08-22 11:56:25 +08:00
andyque 72496ae426 add missing ui test in Lua 2015-08-20 15:25:09 +08:00
pandamicro 78ef019561 Made travis run for v3.8 2015-08-18 10:17:44 +08:00
pandamicro 81d5a8377f Merge pull request #13418 from jianglong0156/fixTMXTileFlagsError 
Remove duplicate function definition, Add function adaptation
 2015-08-17 22:56:59 +08:00
jianglong0156 b19e02bdf6 Remove duplicate function definition, Add function adaptation 2015-08-17 18:18:38 +08:00
zhangbin 3f6816f2f7 Update the reference of submodule cocos2d-console. 2015-08-17 17:16:21 +08:00
pandamicro 559305646b Merge pull request #13411 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2015-08-17 17:13:12 +08:00
pandamicro 9db78b2bb7 Merge pull request #13407 from liamcindy/v3.8 
fix the skybox display error from editor files
 2015-08-17 16:57:32 +08:00
zhangbin deaf50e803 Update the reference of submodule cocos2d-console. 2015-08-17 15:41:56 +08:00
Liam 7aa36d14be fix the skybox display error from editor files 2015-08-17 13:04:25 +08:00
zhangbin 6628dc47cb Update the reference of submodule cocos2d-console. 2015-08-14 15:12:58 +08:00
Ricardo Quesada 5baa90c79e libcurl.h not included in the header to avoid... 
too many dependencies
 2015-08-13 19:28:38 -07:00