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

599 Commits

Author SHA1 Message Date
CocosRobot 74cdb25f8f [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-25 13:07:58 +00:00
minggo 2293630335 issue #2430:move enum in ccTypes.h class 2013-07-25 18:46:43 +08:00
James Chen 0e1bbcfa90 closed #2431: Potential crash when loading js files. 2013-07-25 17:58:15 +08:00
James Chen 25beed0051 [Android] Fixing path error and reducing dependence for extension. 2013-07-25 16:53:35 +08:00
James Chen aaf5bcef52 issue #2404: Invocation of some deprecated methods fixes. 2013-07-25 15:25:11 +08:00
James Chen f16a64cf4a issue #2404: Compilation error fixes. 2013-07-25 11:56:09 +08:00
James Chen 4cc3f63507 closed #2427: Exposing cc.FileUtils.getInstance().createDictionaryWithContentsOfFile to JS. 2013-07-24 11:51:12 +08:00
CocosRobot 88211a401a [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-24 03:06:37 +00:00
Ricardo Quesada 1f37d4d00a More best practices fixes and other bug fixes 
- Adds `CC_REQUIRES_NULL_TERMINATION` to methods that require a NULL at the end
- Removes more Hungarian notations in samples
- s/sprite/scene: fix from previous commit
- `CCLog` -> `log`
- `getLayerNamed` -> `getLayer`
- `getPropertyNamed` -> `getProperty`
- and other small fixes
 2013-07-23 15:20:22 -07:00
CocosRobot 18248b0e85 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-23 14:32:59 +00:00
James Chen 2228614748 issue #2344: JSB also uses 'ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(XXX);' now. 2013-07-22 17:12:53 +08:00
CocosRobot 2030d9f94b [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-22 06:54:13 +00:00
James Chen 50c280fb9d Fixing complication errors in CCTextureAtlas.cpp and jsb_cocos2dx_auto.cpp. 2013-07-21 19:10:22 +08:00
Ricardo Quesada 89d210bdb3 CCAssert -> CCASSERT 
and other best pracitces like:

capacity and "index" are ints and not unsigned int (google's recomendation).
 It is easier to detect underflow bugs like this

plus other minor improvements
 2013-07-19 22:01:27 -07:00
CocosRobot 476e53b490 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-19 15:24:06 +00:00
CocosRobot f3615b40d5 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-19 03:50:49 +00:00
James Chen 6ffac07a81 More getter functions: e.g. MenuItemFont::fontSize --> MenuItemFont::getFontSize 2013-07-19 11:08:47 +08:00
CocosRobot 11daa0f769 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-18 09:53:56 +00:00
CocosRobot ca06ed4f2c [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-18 07:38:53 +00:00
CocosRobot 2523e7746b [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-17 10:21:56 +00:00
James Chen 86ef8f45e7 Merge branch 'functions' of https://github.com/colesbury/cocos2d-x into colesbury-functions 2013-07-17 17:51:05 +08:00
CocosRobot e8777b8722 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-17 09:46:49 +00:00
James Chen a9eea0a887 issue #2407: Updating jsb_deprecated.js and cocos2dx.ini. 2013-07-17 17:38:03 +08:00
CocosRobot 8cc8d56ed2 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-17 06:53:49 +00:00
Sam Gross 96c15efb66 Add JSFunctionWrapper in preparation for bindings-generator changes. 2013-07-16 19:30:47 -04:00
CocosRobot 1ea10c75c3 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-16 09:50:03 +00:00
James Chen b71e9d83e1 Merge pull request #3165 from sunzhuoshi/master 
Fixed bad js constant names and added config macro for "spine" extension
 2013-07-16 02:36:49 -07:00
James Chen 63bd5cf10b closed #2307: Adding cc.PhysicsSprite.prototype.getBody in jsb_cocos2d_extension. 
The issue was fixed at https://github.com/cocos2d/cocos2d-x/pull/2869 .
Reported at http://www.cocos2d-x.org/boards/20/topics/25430?r=31702
 2013-07-16 15:06:36 +08:00
sunzhuoshi 8cad37a8d8 Fixed javascript constant names auto-generated 2013-07-16 14:47:47 +08:00
James Chen c813ff4b02 issue #2404: Mark cc.Action.copy and cc.Animation.copy as deprecated methods. 2013-07-16 14:43:20 +08:00
James Chen 570240a75f Merge pull request #3145 from jdmunro/jsb-distancesq 
Added JSB support for ccpDistanceSQ
 2013-07-15 22:42:37 -07:00
James Chen 92d6fbddd3 Merge pull request #3156 from colesbury/js_log 
Ignore formatting specifiers in JavaScript log messages.
 2013-07-15 22:36:13 -07:00
CocosRobot c956385841 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-16 05:10:52 +00:00
CocosRobot 5ce0e0df50 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-16 02:46:07 +00:00
CocosRobot c2fc2219f5 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-16 02:33:31 +00:00
James Chen 62b12cbe82 Updating jsb_deprecated.js. 2013-07-16 10:14:52 +08:00
James Chen a36a4bf19b issue2405: Adding jsb_deprecated.js for the compatibility of deprecated variables and methods. 2013-07-16 10:02:02 +08:00
Sam Gross 903b63abaf Ignore formatting specifiers in JavaScript log messages. 2013-07-15 15:10:02 -04:00
CocosRobot 00052e8f4f [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-15 09:03:47 +00:00
jdmunro 43f5b09964 Added JSB support for ccpDistanceSQ. 2013-07-14 09:53:09 +01:00
minggo 34b60e99f1 Merge pull request #3140 from minggo/iss2393-mark_deprecated 
Use Point, Rect and Size member functions instead of global functions
 2013-07-12 08:59:27 -07:00
minggo 6abe6fce78 closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
CocosRobot e0ed817177 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-12 09:01:48 +00:00
CocosRobot 746a077623 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-12 08:35:39 +00:00
minggo 2d205c235f closed #2393:fix some warnings 2013-07-12 15:29:32 +08:00
minggo 5d9fea1416 issue #2393:mark PointZero RectZero and SizeZero as deprecated 2013-07-12 14:47:36 +08:00
Ricardo Quesada cf262c28e2 getInstance() / destroyInstance() are used... 
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.

common files + Mac files + iOS files + tests/samples files were updated.

The old methods are deprecated now.
 2013-07-11 15:24:23 -07:00
minggo c37af8fa77 issue #2393:mark functions in CCPointExtensions deprecated 2013-07-11 16:38:58 +08:00
James Chen 9b9fe67d25 issue #2387: Using static_cast instead of C style cast in iteration of CCArray. 2013-07-09 14:29:51 +08:00
CocosRobot 920634d70c [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-09 03:29:23 +00:00
CocosRobot 945c967409 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-09 02:19:07 +00:00
dumganhar 9b126e79d7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2013-07-08 23:09:48 +08:00
dumganhar 8f900d02b8 issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
minggo da41046e4a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2129-remove_prefix 2013-07-08 18:12:38 +08:00
minggo 87125e4b2a issue #2129:use capital words for static const member variables 2013-07-08 18:11:32 +08:00
CocosRobot bff888507a [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-08 08:10:07 +00:00
James Chen 7a7d451acf issue #2129: Reverting changes in cocos2d_specifics.cpp 2013-07-08 15:19:26 +08:00
James Chen 17e1b65646 issue #2129: Adding 'FontDefinition_to_jsval' and reverting some changes. 2013-07-08 15:18:57 +08:00
James Chen db0a15b02f Merge branch 'iss2129-remove_prefix' of https://github.com/minggo/cocos2d-x into minggo-iss2129-remove_prefix 2013-07-06 15:19:09 +08:00
minggo 04465622b7 issue #2129:remove prefix of types in ccTypes.h 2013-07-05 16:49:22 +08:00
James Chen 47c28c43c9 Updating auto jsbindings glue codes. 2013-07-05 15:34:45 +08:00
minggo 40effbf3bf issue #2373:fix a compiling error 2013-07-04 13:58:50 +08:00
James Chen cf369c0c66 Merge pull request #3052 from smshuja/pivotjoint-class 
Pivotjoint constructor and pointQueryFirst in Space class will return false instead of invalid shape object
 2013-07-03 19:21:48 -07:00
James Chen 7892f1ac9d Merge pull request #3053 from dumganhar/iss2285-js-motionstreak 
Adding MotionStreak test for TestJavascript.
 2013-07-03 01:36:07 -07:00
James Chen 1a1040bdd5 [manually] Updating auto-generated JS glue codes. 2013-07-03 16:33:34 +08:00
James Chen 75d8e10994 [manual] Updating auto-generated jsbinding glue codes. 2013-07-03 16:27:26 +08:00
James Chen ed7e208895 Revert some codes in cocos2d_specifics.cpp. 2013-07-03 16:07:06 +08:00
James Chen 72344a318e closed #2363: Fixing compilation errors for JS projects. 2013-07-03 14:57:29 +08:00
Shuja Shabandri fee6a2fc87 pointQueryFirst in Space class returns invalid Shape when a shape is not found 2013-07-02 12:24:17 +04:00
Shuja Shabandri 96f8b59b9f PivotJoint class constructor will now take 3 or 4 arguments like in html5 2013-07-02 12:20:33 +04:00
CocosRobot bc6acb6411 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-29 04:35:21 +00:00
James Chen e20de6b6aa Reverting submodules. 2013-06-29 11:45:16 +08:00
Ricardo Quesada b846a3060e cocos2d-x in Mac: 
Works as expected. All the projects defines CC_KEYBOARD_SUPPORT.
Either all of them should define them, or none, otherwise the vtable
will be broken
 2013-06-28 19:02:10 -07:00
Ricardo Quesada 9b1684b666 Merge remote-tracking branch 'cocos2d/develop' into js_mac 2013-06-27 22:15:03 -07:00
Ricardo Quesada b0de6d0e8c Project fixes 
In debug: optimization is NONE, and other small fixes for Mac
 2013-06-27 18:14:24 -07:00
James Chen 0f2719fa06 issue #2340: Checking jsc( js compiled) files first. 2013-06-27 17:20:02 +08:00
Ricardo Quesada 880a2a53f6 Merge branch 'develop' into js_mac 2013-06-26 18:38:55 -07:00
James Chen 30fa9e80d3 Merge pull request #3012 from dumganhar/ios-project-fix 
Fixing iOS workspace project, using c99 instead of gnu99.
 2013-06-26 02:55:01 -07:00
James Chen 0fdf4b97d6 Fixing iOS workspace project, using c99 instead of gnu99. 2013-06-26 17:52:54 +08:00
CocosRobot b681238425 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-26 09:07:45 +00:00
James Chen 057d5c18a4 issue #2305: sched_yield(); --> std::this_thread::yield(); 2013-06-26 14:55:20 +08:00
James Chen adf6932543 issue #2305: Using std::thread instead of pthread for ScriptingCore. 2013-06-26 14:41:19 +08:00
Ricardo Quesada 297c63cd5e jsbidings for mac 2013-06-25 10:19:55 -07:00
James Chen 8dc8fec180 issue #2325: Updating project configuration, tested on iPad 3. 2013-06-24 18:32:06 +08:00
James Chen b870488aad issue #2325: [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port. 2013-06-24 15:31:18 +08:00
James Chen 80cb06d3f7 Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread 2013-06-24 10:01:57 +08:00
James Chen 53a372669a closed #2322: Updating all win32 project configurations, improvement by using Multi-processor Compilation. 2013-06-23 17:25:34 +08:00
James Chen 24d32010d6 Compilation errors in ScriptingCore.cpp fixes 2013-06-21 22:29:48 +08:00
James Chen 8b9090eb55 fixed #2315: [JSB] Iterating through cc.Node children causes crash. 2013-06-20 22:51:54 +08:00
CocosRobot e651c40d66 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-20 08:25:36 +00:00
James Chen 9cbf513c9e issue #2129: jsb_CCXXX --> jsb_XXX 2013-06-20 14:58:33 +08:00
James Chen ba1fe39d91 issue #2129: Removing CC prefix for scripting module. 2013-06-20 14:33:59 +08:00
James Chen e432496dc4 Merge pull request #2869 from xyhl515/develop 
issue #2307: JSB function getCPBody return type is not right.
 2013-06-18 23:56:21 -07:00
CocosRobot d418d16fa9 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-19 04:51:43 +00:00
James Chen 3cfb2b86c1 issue #2300: invoking clone(c++) method when cc.Action.copy() is called. 2013-06-19 12:09:18 +08:00
minggo b9c85d87ae Merge pull request #2896 from dumganhar/iss2129-format-codes 
issue #2129: New naming of member varibles, renaming m_iVar to _var.
 2013-06-17 03:27:01 -07:00
CocosRobot a9559c0db6 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-16 03:08:06 +00:00
James Chen c0d44cb2e4 fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
CocosRobot 96d12bc1b9 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-14 06:24:17 +00:00
xyhl515 9ea4f7ea8e fix Jsb function getCPBody return type bug 2013-06-11 11:04:29 +08:00