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

36708 Commits

Author SHA1 Message Date
CocosRobot f7c987e349 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18430) 2017-11-01 17:36:39 +08:00
Felippe Durán d651298d3e Fix bug of returning UNKNOWN event for return type key SEARCH/SEND in EditBox for Android and SEARCH for iOS. (#18192) 2017-11-01 17:33:31 +08:00
minggo d1a8e73be4
remove plugin (#18429) 2017-11-01 16:49:44 +08:00
minggo b53eb25200
use prebuilt version of Box2D (#18422) 2017-10-31 14:31:23 +08:00
minggo 496de07633 don't have to set NDK_MODULE_PATH manually 2017-10-26 13:40:27 +08:00
sbrednikhin 6cd2c0c340 Fix for issue #18409 (#18410) 
Remove unnecessary PLTE chunk from png.
 2017-10-26 11:39:50 +08:00
minggo 33135d0d14 remove unneeded log (#18406) 2017-10-26 10:12:53 +08:00
Vladyslav Kaplun 0f9a9c55d1 Fix status check in AudioDecoder.mm (#18374) 2017-10-25 10:48:45 +08:00
Greg Rynkowski 76ba85adfb Make cocos' Android.mk self containing (#18392) (#18393) 
PROBLEM
-------

cocos makefile is not self-containing.

From the perspective of a developer that link his target with
`cocos2dx_static` library, it should specify in his `Android.mk` only
a path to a makefile that defines that module, by

a) using `import-add-path` and `import-module`

    $(call import-add-path, <path-to-cocos-root>)
    $(call import-module, cocos)

  or ...

b) using directly an `include` command

    include <path-to-cocos-root>/cocos/Android.mk

Unfortunately the current configuration of cocos' Android.mk doesn't
specify (using `import-add-path`) locations of modules that it uses.
In result, every dev that uses cocos to create Android app has to
populate NDK_MODULE_PATH at his Android.mk files by adding two lines:

    $(call import-add-path, <path-to-cocos-root>/cocos)
    $(call import-add-path, <path-to-cocos-root>/external)

Those lines have to be placed at cocos/Android.mk file.

The current configuration of build script breaks a good practice of
hiding internal details from clients of library or component. In fact
the script exposes internal dependencies and require from a dev to make
them out.

---

SOLUTION

This commit adds corresponding `import-add-path` commands to Android.mk
files.

---

HOW TO TEST

1. Create cocos2d-x app.

2. Import in your Android.mk file a `cocos` module using one of
aforementioned approaches.

3. The app should compile without a error message like the one below:

    Android NDK: jni/../../cocos2d/cocos/Android.mk: Cannot find module with tag 'freetype2/prebuilt/android' in import path
    Android NDK: Are you sure your NDK_MODULE_PATH variable is properly defined ?

Issue: https://github.com/cocos2d/cocos2d-x/issues/18392
 2017-10-24 09:20:54 +08:00
CocosRobot bf67850710 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18397) 2017-10-23 11:58:20 +08:00
SBJoker f0be714c0d Fix for Non-TTF Label Shadow, it makes it follow label opacity (#18324) 2017-10-23 11:57:43 +08:00
Vladyslav Kaplun 9e3cc37a0c Remove autorelease mark from UIWebViewWrapper and manage memory manually (#18391) 2017-10-23 11:40:52 +08:00
Nikita 4726fa3b3d Corrected bugs with cursor in TextField (#18371) 
* No need to update password text in ccui TextFiled, because it's handled in TextFiledTTF

* Do not update visual state of Label if placeholder set when keyboard is attached
 2017-10-23 11:37:07 +08:00
crazyhappygame d06c082bf2 Fix Windows 10 compilation (#18394) 2017-10-23 11:18:14 +08:00
CocosRobot 79b97e9992 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18385) 2017-10-20 10:06:21 +08:00
pyrosphere 09d73ae238 Fix accelerometer on android when screen is rotated on reverse landscape or reverse portrait. (#18317) 2017-10-20 10:05:07 +08:00
okamura d13d55c23f Fix CameraBackgroundColorBrush cannot use alpha (#18281) 2017-10-20 09:43:45 +08:00
Vladimir Perminov 849e72385b Add test case for TextFieldTTF::setCursorFromPoint (#18336) 
Test crash in https://github.com/cocos2d/cocos2d-x/pull/18159
 2017-10-17 00:48:38 -05:00
Vladimir Perminov 19ea797593 Fix crash TextFieldTTF::setCursorFromPoint (#18159) 
A similar problem of
https://github.com/cocos2d/cocos2d-x/issues/15926
 2017-10-16 22:58:51 -05:00
Jeff Wang 40ec511f48 improvements for StringUtils::StringUTF8 (#18356) 
* 1. add 'const'
2. add range support for 'getAsCharSequence'

* remove default arguments

* use another variable to make it more clear

* rename isAnsi-> isASCII
 2017-10-16 22:03:32 -05:00
minggo 25c240391c fix crash (#18375) 2017-10-16 22:01:59 -05:00
xiaoyur347 617009f1cf fix CCTextureCache addImageAsync race condition (#18366) 2017-10-16 00:58:29 -05:00
Jeff Wang 6e535f40e3 fix memory leak (#18351) 
fix memory leak in `UserDefault::deleteValueForKey` when `key` not found
 2017-10-15 21:56:41 -05:00
Saber Haj Rabiee 37d05d3ca0 wrong code committed, forgot to put :: operator. (#18372) 2017-10-15 21:37:01 -05:00
Greg Rynkowski d32233d787 Fix "Possible misuse of comma operator here" (#18350) 2017-10-12 23:00:04 -05:00
minggo 10acb5a045 update version (#18367) 2017-10-12 22:58:43 -05:00
Jeff Wang 2132e48cd2 fix Memory Leak: ObjectFactory destroyInstance (#18352) 
`ObjectFactory destroyInstance` function not called
 2017-10-12 22:55:37 -05:00
halx99 809cfe3558 [ci skip]Fix endian detection macro. (#18354) 2017-10-10 09:01:19 +08:00
minggo 85b32eddb1 Update RELEASE_NOTES_CN.md 2017-10-09 17:31:00 +08:00
minggo bf08f446aa Merge pull request #18355 from minggo/sync-3.16 
Sync 3.16
 2017-10-09 14:36:40 +08:00
minggo 0b699e8f19 fix conflict 2017-10-09 10:23:13 +08:00
Allen Yunseok Lee f467d42e02 fix misspelling on RELEASE_NOTES.md (#18338) 2017-10-09 09:29:56 +08:00
CocosRobot f3e456c8bc [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18344) 2017-10-09 09:28:15 +08:00
minggo b0952077a8 udpate readme (#18346) 2017-10-06 09:40:34 +08:00
pandamicro d1eec987cd Avoid setting responseType in synchronous xhr (#18335) 2017-10-06 08:57:17 +08:00
pandamicro ef019ca321 [ci skip] update web ref (#18333) 
* [ci skip] update web ref

* Update web ref
 2017-09-30 09:09:02 +08:00
Knox 0d37220beb [ci skip]EditBox::setText() may crash on some Android devices 2017-09-28 10:59:03 +08:00
Knox 78a167fec1 [ci skip]when keyboard is popup, engine should not continue to handle touch events 2017-09-28 10:25:25 +08:00
minggo f2db054edb [ci skip]fix android violation (#18309) 2017-09-25 09:28:03 +08:00
halx99 e5d19429b8 [ci skip]Make the sort behavior is same on 32bit and 64bit (#18301) 
* Make the sort behavior is same on 32bit and 64bit

* Update CCNode.h

* Update CCNode.cpp

* Update ccMacros.h

* Use std::int32_t to for zOrder

* Update CCNode.cpp
 2017-09-25 09:27:33 +08:00
minggo cb3c0853e1 [ci skip]Remove win10 and tizen support 
* remove win10 sln

* remove win10 porj from template

* remove win10 and tizen support
 2017-09-22 17:54:37 +08:00
minggo 54572e7571 Update README.md 2017-09-22 17:39:31 +08:00
minggo d92de77ce7 Update README.md 2017-09-22 17:36:09 +08:00
minggo 42b45c4ad6 [ci skip]update changelog and release note (#18312) 2017-09-22 17:33:24 +08:00
James Chen b633260020 Should use setTextColor for editbox placeholder. (#18311) 2017-09-22 16:06:13 +08:00
Jeff Wang bd59575468 fix #18296 (#18299) 
fix #18296
 2017-09-22 11:56:51 +08:00
pandamicro 247921c08a [ci skip] update web ref and fix test case issues (#18310) 2017-09-22 10:54:53 +08:00
minggo f94fee793c [ci skip] update changelog and readme 2017-09-21 16:54:21 +08:00
minggo 5736863c74 update changelog and readme 2017-09-21 16:52:41 +08:00
minggo 19a038bd5b update CHANGELOG 2017-09-21 16:43:33 +08:00