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

2503 Commits

Author SHA1 Message Date
CocosRobot 7f222c92e0 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16360) 2016-08-15 10:53:07 +08:00
JaryGuo f9abbf02f6 fix the problem in ccUTF8.cpp and CCLuaJavaBridge.cpp (#16314) 
* fix the return value when return null in java

fix the return value when return null in java

* fix getStringUTFCharsJNI

fix getStringUTFCharsJNI when srcjStr is null

* remove a word

remove a word added by mistake

* make a indention

line 233 utf8Str
 2016-08-08 10:43:14 +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 9566a0cb24 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-26 02:06:58 +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
mogemimi 94d4971ddc Fix typos in documentation and comments 2016-07-22 02:05:19 +09:00
CocosRobot 708dab448d [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16175) 2016-07-21 10:11:14 +08:00
mogemimi 5bd2d74078 Fix spelling for `getPolygonCenter` function 2016-07-19 08:24:22 +09:00
CocosRobot cbcbeb96b3 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-18 06:20:59 +00:00
Ricardo Quesada 1824b21cb7 Merge pull request #16090 from ricardoquesada/issue_15566 
fixes issue #15566
 2016-07-12 21:36:52 -07:00
Ricardo Quesada 05a772115e fixes issue #15566 
lua and javascript for arm64 is not compiled

version 103

uses JPEG 9b for android

using armeabi

uses Lua, and not LuaJIT for Android ARM64
 2016-07-12 19:03:53 -07:00
coderwj c9ad76e56a Fix a bug, in lua can't get the "backClicked" but a nil 
in lua, I registerScriptKeypadHandler,when debug on Andriod, after clicking back button, I didn't get "backClicked",but a nil 
I see that in CHANGELOG:
cocos2d-x-3.1  May.24 2014
    [FIX]           EventKeyboard::KeyCode: key code for back button changed from KEY_BACKSPACE to KEY_ESCAPE
so,I fix it , and get the right "backClicked"
 2016-07-12 17:37:33 +08:00
CocosRobot 3aeefd911e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-11 07:54:54 +00:00
minggo 9c7d44ccd7 Merge pull request #16080 from minggo/use-std_abs 
use std::abs instead
 2016-07-11 12:02:10 +08:00
minggo 3dc167a9f9 use std::abs instead 2016-07-11 12:01:09 +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
CocosRobot 8fe92fbd4b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-07 19:04:04 +00: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
minggo 6248480b3a Merge pull request #16047 from minggo/issue-14071 
[ci skip]convert aplpha channel correctly
 2016-07-06 15:59:50 +08:00
minggo d0db838b71 convert aplpha channel correctly 2016-07-06 15:49:05 +08:00
pandamicro 305bd95dc2 More secure release in JSB_closeWindow 2016-07-06 13:55:18 +08:00
CocosRobot cf2646b7a2 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-06 02:16:03 +00:00
mogemimi bed4e048b6 Fix various typos 2016-07-06 08:27:39 +09:00
minggo e4aa6d1ef7 Merge pull request #16035 from minggo/issue-16032 
remove extra '\'
 2016-07-05 14:22:19 +08:00
minggo 1c9ad5594c remove extra '\' 2016-07-05 09:50:38 +08:00
CocosRobot 934b2413dc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-04 01:40:35 +00: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
CocosRobot 274a82c7f5 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16001) 2016-06-29 22:56:13 +08: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 86af4cdab8 Merge pull request #15897 from halx99/patch-4 
luabindings: Add script with utf-8 bom support.
 2016-06-24 09:58:41 +08: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
halx99 ba55723178 Update CCLuaStack.cpp 2016-06-23 13:42:38 +08:00
mogemimi cbc0612306 Use nullptr instead of 0 or NULL 2016-06-23 12:39:23 +09:00
halx99 90434e58d0 fix compile error. 2016-06-23 11:37:20 +08:00
halx99 c4def57774 Update CCLuaStack.cpp 
Lua script utf-8 bom support, handle encrypted script.
 2016-06-23 10:24:22 +08:00
James Chen 710ab777dd Some lua bindings fixes: 
1) Reverts changes in  #15443, the behavor of LuaEngine::handleCommonEvent should not be changed. empty eventName should be supported, otherwise it will break compatiblity.
2) Null pointer check in CommonScriptData initialization
3) No error callback in lua (fixed #15904)
 2016-06-22 17:48:17 +08: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
CocosRobot 4a5bedc6e6 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-22 05:52:51 +00:00
James Chen cffc9cecd7 cc.Node.ignoreAnchorPointForPostion was deprecated, lua/js script should handle this. 2016-06-22 11:05:04 +08:00
halx99 f41130bafe luabindings: Add script with utf-8 bom support. 2016-06-21 14:31:25 +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
mogemimi de5dd21ded Add missing default cases within switch block for JS and Lua JavaBridge 2016-06-08 15:41:44 +09:00
minggo cf80eb18b1 Merge pull request #15777 from pandamicro/v3 
Fix scheduler callback target lost issue
 2016-06-03 14:05:32 +08:00
minggo 5cd4c8aaca Merge pull request #15778 from minggo/scriptingcore-issue 
avoid to access invalid memory
 2016-06-03 14:04:17 +08:00
minggo b7b74f2328 avoid to access invalid memory when received data length is the same as buffer size 2016-06-03 11:39:01 +08:00
pandamicro 3597ce7c43 Fix scheduler callback target lost issue 2016-06-03 11:01:06 +08:00
Nikita 612cd7b82f Fixed behavior of "cc.isObject" function for undefined and null values. (#15085) 
* Fixed wrong behavior of "cc.isObject" function for undefined and null values.

* Simplify 'cc.isObject' function

* Remove double return in 'cc.isObject'
 2016-06-03 09:45:32 +08:00
minggo c7c67144b7 Merge pull request #15769 from pandamicro/v3 
Fix scheduler callback target lost issue
 2016-06-03 09:29:01 +08:00
CocosRobot da114e13d1 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-02 09:16:13 +00:00
pandamicro d1e9a149c4 Fix scheduler callback target lost issue 2016-06-02 16:02:29 +08:00
minggo 6f79082c6a Merge pull request #15754 from minggo/linux-compiling-error 
use std::isnan instead of isnan to fix compiling errors
 2016-05-31 09:22:05 +08:00
minggo 3810854c45 use std::isnan instead of isnan to fix compiling errors 2016-05-30 18:19:10 +08:00
CocosRobot 4f0869e51e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-05-30 09:27:04 +00:00
minggo 7516db0fa8 Merge pull request #15734 from pandamicro/v3 
Support cc.view.setOrientation on web
 2016-05-27 14:26:50 +08:00
minggo 127f718dfc Merge pull request #15728 from mogemimi/remove-duplicate-includes 
Remove duplicate header includes
 2016-05-27 14:25:39 +08:00
minggo 80039c4aee Merge pull request #15731 from minggo/jsb-debug-issue 
fix the bug that will lost message if only received one message
 2016-05-27 09:46:36 +08:00
mogemimi fc6c612c4c Remove duplicate header includes 2016-05-26 23:25:44 +09:00
pandamicro 1928d24bf0 Made templates support cc.view.setOrientation on web 2016-05-26 19:24:24 +08:00
zilongshanren 3e941be0ce fix actionNode studio 1.6 parser error 2016-05-26 17:20:51 +08:00
minggo 031e329d64 fix the bug that will lost message if only received one message 2016-05-26 16:32:10 +08:00
pandamicro 8692ee176c Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/network/HttpAsynConnection-apple.m
	cocos/network/HttpClient-android.cpp
	cocos/network/HttpClient.cpp
	cocos/network/HttpCookie.h
	cocos/network/HttpRequest.h
	cocos/network/HttpResponse.h
	cocos/network/SocketIO.cpp
	cocos/network/WebSocket.h
 2016-05-25 19:19:27 +08:00
pandamicro 2c05ecc3cd Fix Component event issue 2016-05-25 18:36:02 +08:00
minggo c8c57696be Merge pull request #15705 from minggo/jsb-debug-issue 
lock mutext to get element from g_queue
 2016-05-25 13:55:34 +08:00
minggo fff7a78efe lock mutext to get element from g_queue 2016-05-24 15:59:00 +08:00
mogemimi 38fd8ebca9 Fix typo in function name: Keybard -> Keyboard 2016-05-24 10:14:36 +09:00
minggo b8e7f37eaf Merge pull request #15640 from xpol/better-lua-print 
Print as Lua 5.1 does and remove duplicate code.
 2016-05-23 18:42:23 +08:00
minggo 9c0acf1e5d Merge pull request #15619 from VisualSJ/v3_audio 
audio search path (android)
 2016-05-19 18:06:58 +08:00
minggo 3e396fedab Merge pull request #15617 from pandamicro/v3 
Some modifications merged from Creator
 2016-05-17 13:43:41 +08:00
minggo abe020e808 Merge pull request #15654 from minggo/ipv6-compatibility 
Ipv6 compatibility
 2016-05-17 09:25:14 +08:00
minggo 88db5d3660 use AF_UNSPEC to support ipv6 2016-05-16 15:15:29 +08:00
Xpol Wan a7d9dd9a75 Print as Lua 5.1 does and remove duplicate code. 2016-05-14 14:09:58 +08:00
minggo 74af3b5232 merge v3.11 back to v3 2016-05-12 09:50:03 +08:00
ViusualSJ ada1d1dfe8 audio search path (android) 2016-05-11 17:24:14 +08:00
pandamicro 1023c8730e [JSB] Made cc.log overwrite-able 2016-05-11 11:58:24 +08:00
minggo 5d7cbe622a Merge pull request #15589 from pandamicro/v3.11 
Add cc.game.end to close game window
 2016-05-07 22:11:46 +08:00
Naoyuki Totani 04ebba425f add missing lua const values 2016-05-07 16:23:23 +09:00
pandamicro d0fc3ec4c4 Add cc.game.end to close game window 2016-05-07 14:37:36 +08:00
CocosRobot d72fadf6cc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-05-06 05:44:31 +00:00
CocosRobot 0445e7c562 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-05-05 03:07:58 +00:00
minggo a5602cc732 merge v3.11 back to v3 2016-05-04 16:02:23 +08:00
dualface 2901f0aea6 fix display.wrapScene() 2016-05-03 21:37:15 +08:00
CocosRobot 198acb9466 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-28 01:56:50 +00:00
zilongshanren 482788c933 Add tizen support (#15518) 
* add Tizen Support

* fix linter error

* fix tizen audio engine lua bindings config
 2016-04-28 09:49:55 +08:00
Xpol Wan 1cc0130bdd Fixes signed/unsigned mismatch warnings. 
```
2d\CCFontFNT.cpp(328): warning C4018: '<' : signed/unsigned mismatch
2d\CCLabel.cpp(782): warning C4018: '>' : signed/unsigned mismatch
2d\CCLabel.cpp(784): warning C4018: '<' : signed/unsigned mismatch
scripting\js-bindings\manual\cocos2d_specifics.cpp(2741): warning C4018: '<' : signed/unsigned mismatch
tests\cpp-tests\Classes\Sprite3DTest\Sprite3DTest.cpp(1969): warning C4018: '>=' : signed/unsigned mismatch
tests\cpp-tests\Classes\TextInputTest\TextInputTest.cpp(264): warning C4018: '>=' : signed/unsigned mismatch
ui\UIEditBox\UIEditBoxImpl-common.cpp(113): warning C4018: '<' : signed/unsigned mismatch
ui\UIRichText.cpp(1573): warning C4018: '<=' : signed/unsigned mismatch
ui\UITextField.cpp(89): warning C4018: '>=' : signed/unsigned mismatch
```
 2016-04-26 17:53:25 +08:00
CocosRobot 29da95494e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-26 03:47:27 +00:00
CocosRobot 361e054d6d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-21 07:07:41 +00:00
minggo fcd8aa30f4 Merge pull request #14312 from TimothyZhang/jsb-getDataFromFile-should-return-null-if-read-failed 
return null if read failed in js_cocos2dx_CCFileUtils_getDataFromFile
 2016-04-21 14:17:44 +08:00
CocosRobot f4c9ea3902 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-21 01:54:49 +00:00
CocosRobot a9184f1047 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-20 09:31:06 +00:00
minggo 09e476af9a Merge pull request #15450 from mogemimi/fix-deprecation-warning 
Replace cc_utf8_to_utf16 with UTF8ToUTF16 to avoid deprecation warning
 2016-04-19 16:51:52 +08:00
mogemimi 87be03fe9b Fix compilation error with Platform Toolset v120 for WinRT 2016-04-19 16:13:12 +09:00
mogemimi 19c2893509 Replace cc_utf8_to_utf16 with UTF8ToUTF16 to avoid deprecation warning 2016-04-18 19:50:59 +09:00
Xpol Wan bd263d6be4 Fixes deprecated warnings 
* remove all internal use of FileUtils::getFileData().
 2016-04-18 16:45:46 +08:00
xpol 24db45e925 Fixes some warnings in Lua manual bindings. (#15443) 
1. Use __Type for deprecated classes.
2. Refactored LuaStack::luaLoadChunksFromZIP() and use FileUtils:getDataFromFile().
3. Fixes wrongly compare NULL with char array.
 2016-04-18 16:35:50 +08:00
xpol 1e70fb5eb5 Remove include of cocos2d.h (#15435) 2016-04-18 15:09:21 +08:00
Ricardo Quesada 3eb7d62e6e fix: compile in Windows 
Github issue #15372
 2016-04-15 09:33:19 +08:00
CocosRobot 7d9946a9cc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-11 09:56:18 +00:00
Juan Luis Boya García 9c4f3ffa8d Make selectedSprite optional in JSB too 2016-04-11 11:53:53 +08:00
Бесшапошников Никита 54e457f1be Fixed ccui scroll widgets constants for JS bindings 2016-04-11 11:29:00 +08:00
Ricardo Quesada fea84b8af3 fix: use chipmunk v6.2 API whenever possible 
fix: make it more compatible with chipmunk v6.2 code

fix: make it more compatible with chipmunk v6.2.2
 2016-04-11 11:12:34 +08:00
pandamicro 79cfe8ac0e Fix a issue in cc.CallFunc JSB implementation 2016-04-11 11:12:13 +08:00
CocosRobot 150ec2e7ce [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-11 11:11:54 +08:00
pandamicro f9f9551645 Fix some issues 
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
 2016-04-11 11:11:34 +08:00
pandamicro bb2cfc7308 Update engine version 2016-04-11 11:11:17 +08:00
Бесшапошников Никита 9acde1bc06 Fixed ccui scroll widgets constants for JS bindings 2016-04-08 15:34:25 +03:00
pandamicro f18763033d Merge pull request #15390 from pandamicro/v3 
Fix a issue in cc.CallFunc JSB implementation
 2016-04-08 09:54:13 +08:00
zilongshanren 36c5ae4d9c Merge pull request #15389 from CocosRobot/update_lua_bindings_1460042601 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-04-08 09:30:58 +08:00
Ricardo Quesada c4230f839e Merge pull request #15392 from ricardoquesada/chipmunk_js_fix 
Chipmunk js fix
 2016-04-07 16:24:28 -07:00
Ricardo Quesada f243cc4ce3 fix: use chipmunk v6.2 API whenever possible 
fix: make it more compatible with chipmunk v6.2 code

fix: make it more compatible with chipmunk v6.2.2
 2016-04-07 16:22:49 -07:00
pandamicro f1108bfbe3 Fix a issue in cc.CallFunc JSB implementation 2016-04-07 23:49:57 +08:00
CocosRobot 416d2531fc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-07 15:25:41 +00:00
pandamicro e6d4beef8a Merge pull request #15388 from pandamicro/v3 
Issue fixes and update engine version
 2016-04-07 23:15:39 +08:00
pandamicro 1ada222c36 Fix some issues 
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
 2016-04-07 22:40:32 +08:00
pandamicro 817f4f4871 Update engine version 2016-04-07 22:36:29 +08:00
pandamicro 9de585077a Merge pull request #15369 from ntrrgc/develop 
Make selectedSprite optional in JSB too
 2016-04-07 17:07:03 +08:00
CocosRobot dfe3dc5e14 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-07 07:46:49 +00:00
minggo 328331df4f Merge pull request #15179 from mogemimi/remove-const-from-return 
Remove unnecessary const from return types in PU and Lua
 2016-04-07 15:41:00 +08:00
Ricardo Quesada ae369c1b68 fix: compile in Windows 
Github issue #15372
 2016-04-06 10:26:46 -07:00
mogemimi 985155749b Remove unnecessary const from return types in PU and Lua 2016-04-06 12:36:20 +09:00
minggo 6b167a1aa1 Merge pull request #15335 from mogemimi/fix-typos 
Fix typos in comments and strings
 2016-04-06 11:32:46 +08:00
Juan Luis Boya García 73b900a77f Make selectedSprite optional in JSB too 2016-04-05 12:58:50 +02:00
CocosRobot 81448cd1b8 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-02 12:06:57 +00:00
肖峰 5b10ab3c2d rollback chipmunk export change 2016-03-31 11:01:58 +08:00
minggo 48d24f14d7 upgrade engine version 2016-03-30 15:17:49 +08:00
mogemimi 44080a04d8 Fix typos in comments and strings 2016-03-29 10:52:17 +09:00