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

766 Commits

Author SHA1 Message Date
CocosRobot b6536e8d9f [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16499) 2016-09-02 10:44:55 +08:00
minggo df3b33cd59 Merge pull request #16457 from minggo/merge-v3.13 
Update rapid json to version 1.1.0.
 2016-08-29 15:22:01 +08:00
minggo 04fd2b16b2 merge v3.13 back to v3 2016-08-29 11:57:13 +08:00
CocosRobot ee4d59cf76 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16454) 2016-08-29 11:48:21 +08:00
CocosRobot 56cfd76b4c [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16411) 2016-08-22 15:49:43 +08:00
pandamicro ec52cf4aa4 [ci skip] Remove LayerRGBA in scripts to avoid issues and update web ref (#16412) 
* Remove LayerRGBA in scripts to avoid issues and update web ref

* Doctoc docs
 2016-08-22 10:55:21 +08:00
pandamicro f0be4f3069 Merge part of Cocos2d-x-lite (#16380) 
* Update js auto binding settings with new ndk version

* Remove unnecessary property from Ref

* Merge part of Cocos2d-x-lite :
1. Improve network bindings
2. Use nullptr instead of NULL
3. Remove usage of some deprecated APIs
4. Add some defensive code and cleanup

* Fix spine track entry circle referencing issue

* cocos2d/cocos2d-x#16327: Fix global object leak issue in JSB

* Improve ScriptingCore::evalString, old implementation have been deprecated in Spidermonkey

* Update JS versions

* Add docs for web v3.13

* Improve ScriptingCore

* Manual merge cocos2d/cocos2d-x#16383 by DavidDeSimone

* Fix auto bindings configurations

* Update web ref
 2016-08-19 16:28:47 +08:00
CocosRobot d09ee83c5a [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16395) 2016-08-19 09:36:50 +08:00
CocosRobot 7540a64fd8 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16370) 2016-08-16 16:56:06 +08:00
CocosRobot 7f222c92e0 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16360) 2016-08-15 10:53:07 +08:00
James Chen b135d512d2 Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
mogemimi 808a10429b Fix some typos in comments and strings (#16290) 2016-08-02 15:29:23 +08:00
CocosRobot aac49e35e1 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16284) 2016-07-31 22:50:28 +08:00
minggo 9a8f577095 fix some typos (#16269) 2016-07-29 17:20:42 +08:00
CocosRobot c5923e00ca [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16261) 2016-07-29 13:40:46 +08:00
CocosRobot af1783364b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-29 01:43:11 +00:00
Ricardo Quesada 2945968614 Upgrades to Spine v3.4 (#16242) 
* Upgrades to Spine v3.4

Github issue #16115

* compiles and works on windows

tested on:

* win32
* win10
* win8.1

* include-linter: don't test spine files

we need them unmodified

* spine bindings fixes

also, doesn't use goblins-ffd. instead it uses goblins.
goblins-ffd is no longer present in spine v3.4
 2016-07-28 07:25:50 -07:00
CocosRobot 6b3454e9c6 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-27 20:38:57 +00:00
CocosRobot e0abb981d5 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-25 09:39:34 +00:00
mogemimi 15030ad4c3 Fix typos in log messages 2016-07-25 02:53:22 +09:00
CocosRobot 708dab448d [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16175) 2016-07-21 10:11:14 +08:00
minggo c267167d07 Merge pull request #16069 from minggo/ndkr12b-issue 
fix compiling and linking error with ndk r12b
 2016-07-08 17:01:09 +08:00
minggo 4e125d84a4 fix compiling and linking error with ndk r12b 2016-07-08 15:29:35 +08:00
minggo 734d857ced Merge branch 'v3.12' into merge-v312 2016-07-07 15:13:21 +08:00
pandamicro ccb30cefc7 Update JS versions 2016-07-06 17:02:53 +08:00
pandamicro 305bd95dc2 More secure release in JSB_closeWindow 2016-07-06 13:55:18 +08:00
mogemimi bed4e048b6 Fix various typos 2016-07-06 08:27:39 +09:00
minggo 1c9ad5594c remove extra '\' 2016-07-05 09:50:38 +08:00
minggo 8bbeb01be4 Merge pull request #16025 from mogemimi/fix-doc-typo 
Fix typos and other mistakes in docs
 2016-07-04 09:33:29 +08:00
mogemimi 2443e09d29 Fix typos and other mistakes in docs 2016-07-04 00:42:10 +09:00
CocosRobot f30a7cf546 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-03 05:14:11 +00:00
pandamicro d02bdda781 Fix callfunc released with retained data (callback, target, extradata) issue 2016-07-01 10:56:17 +08:00
CocosRobot 94de257115 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-01 02:16:32 +00:00
minggo 47442b9d8b Merge pull request #15997 from mogemimi/fix-variable-names 
Fix some minor typos in local variable names
 2016-06-29 14:24:00 +08:00
CocosRobot ef01ac4465 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-29 04:47:21 +00:00
mogemimi c0f2194961 Fix some minor typos in local variable names 2016-06-29 11:04:11 +09:00
minggo bbd837aefa merge v3.12 back to v3 2016-06-28 17:53:50 +08:00
pandamicro d46cd96896 Don't warn user about API deprecation 2016-06-28 12:11:21 +08:00
pandamicro e7e365a00f Fix window.close crash in JSB 2016-06-28 11:59:55 +08:00
pandamicro 8cb2e93644 Fix easing action crash because the js object is not rooted 2016-06-24 14:38:59 +08:00
mogemimi 0dce4961ee Avoid implicit conversion from size_t to int 2016-06-24 15:15:45 +09:00
minggo 1042b18999 Merge pull request #15936 from mogemimi/use-nullptr-instead 
Use nullptr instead of 0 or NULL whenever possible
 2016-06-24 09:54:15 +08:00
mogemimi b7982fd8e0 Fix -Wreturn-type warnings when compiling JSB with Clang 2016-06-24 08:48:21 +09:00
mogemimi cbc0612306 Use nullptr instead of 0 or NULL 2016-06-23 12:39:23 +09:00
James Chen 67dd4b0684 JSScript* may be garbage collected before the next time execute the same JS file. 
It will crash in JS_ExecuteScript.
 2016-06-22 16:18:20 +08:00
James Chen cffc9cecd7 cc.Node.ignoreAnchorPointForPostion was deprecated, lua/js script should handle this. 2016-06-22 11:05:04 +08:00
CocosRobot 4c233b8df7 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-17 02:22:58 +00:00
CocosRobot cc2b887dbb [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-16 02:58:46 +00:00
mogemimi a348cbda8b Move StringUtils functions from deprecated header file to ccUTF8.h (#15835) 
* Move StringUtils functions outside of deprecated header

* Replace deprecated headers with 'base/ccUTF8.h'
 2016-06-15 15:01:26 +08:00
CocosRobot 7c4b7e1bf1 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-15 02:49:50 +00:00