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

35818 Commits

Author SHA1 Message Date
pandamicro b50ea4afce Support more system languages 2016-12-13 14:29:23 +08:00
pandamicro 197dac204b Fix function wrapper using js object during its gc 2016-12-13 14:29:23 +08:00
pandamicro 7ff5e8858b Add EventDispatcher#hasEventListener (sync from creator) 2016-12-13 14:29:23 +08:00
minggo 93a879bfab remove unneeded files (#16990) 2016-12-12 16:25:58 +08:00
James Chen a2603d70ef [android] Catches ‘NumberFormatException’ while invoking Integer.parseInt. (#16988) 
* [android] Catches ‘NumberFormatException’  while invoking Integer.parseInt.

* [android] Catches ‘NullPointerException’ while converting Integer to int in Cocos2dxActivity.hideVirtualButton.
 2016-12-12 11:44:31 +08:00
minggo 2c2ed5c5f5 don't let toggle accept focus (#16982) 2016-12-12 09:41:53 +08:00
James Chen 91daa7a12a Fixes NewEventDispatcherTest. (#16983) 
fixed http://punchbox.info:3000/issues/26036
 2016-12-12 09:39:20 +08:00
minggo 64994a2471 make it support .luac file too (#16981) 2016-12-09 17:52:45 +08:00
James Chen 951b5174db [lua-tests] Fixes PhysicsDemoBug5482 crashes. (#16979) 
Fixed http://punchbox.info:3000/issues/26011
 2016-12-09 14:12:57 +08:00
minggo fb3055e98c remove duplicated codes to fix crash in release mode (#16978) 2016-12-09 13:42:16 +08:00
James Chen e6aa2ace3e [lua] Fixes AssetsManagerEx test crashes. (#16977) 2016-12-09 12:04:38 +08:00
James Chen a0b67fc99a Fixes lua action test ‘Issue 1305’ crashes. (#16974) 
* Fixes lua action test ‘Issue 1305’ crashes.

* Removes an unused log.
 2016-12-09 10:39:34 +08:00
James Chen cef013dcc6 Fixes broken of JS AssetsManagerTest. And updates https configuration of cpp-tests, js-tests for macOS. (#16970) 
fixed http://punchbox.info:3000/issues/26031
 2016-12-08 10:40:22 +08:00
minggo f13fde4fc4 update changelog (#16969) 2016-12-07 15:31:00 +08:00
minggo b288821bdd use GLsizei to avoid overflow (#16962) 2016-12-06 23:05:56 -08:00
James Chen fb89672fff Updates lua CCControlSliderTest. (#16968) 
* Updates lua CCControlSliderTest.
fixed http://punchbox.info:3000/issues/26029

* [lua-tests] Fix the display position of CCControlSilderTest on win32.
 2016-12-07 14:55:43 +08:00
James Chen 46fd7e3d59 Sync JS TerrainTest.js from cpp test. (#16967) 2016-12-07 14:17:45 +08:00
minggo 3db39a27ea Vibrate test (#16966) 
* only show vibrate test on iOS and Android device

* vibrate no matter it is silient or not
 2016-12-07 11:12:38 +08:00
子龙山人 1b0a6c2c5c Sync editbox improvement from cocos creator (#16965) 
* sync the changes from creator

* fix editbox vertical alignment

* improve android editbox multiline text vertical alignment
 2016-12-07 09:21:17 +08:00
子龙山人 f51234c549 fix jsb test inconsistance (#16963) 2016-12-06 17:50:26 +08:00
minggo 77fb210b3a fix wrong codes and simplify codes (#16964) 2016-12-06 17:38:06 +08:00
子龙山人 c0e7443b24 Merge pull request #16961 from CocosRobot/update_lua_bindings_1480902231 
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
 2016-12-06 16:43:40 +08:00
CocosRobot#Set 5ef072de03 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2016-12-05 01:43:54 +00:00
minggo 84a6ab312c use correct downloader implementation on mac (#16955) 2016-12-05 09:36:35 +08:00
Ricardo Quesada 2e0881e284 Scale9Sprite / Slider / LoadingBar fixes (#16949) 
* WIP

* loadingbar issues fixed

* fixes clone in slider

* slider bug fixes

* slider: sets texturesize correclty before seting capsInsets

* sprite: scale9 avoid negativa values

* yeah! works!

* cloneIn -> copyTo

* restore xcode team: none

* fixes issue #16924

* correct issue number

* yeah! fixes issue #16928 and #16930
 2016-12-03 07:35:22 -08:00
James Chen babced8b7c Fixes lua-tests/keypad test case. (#16954) 
* Fixes lua-tests/keypad test case.

* Updates string
 2016-12-02 15:50:53 +08:00
CocosRobot e2100ce88c [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16950) 2016-12-02 14:47:45 +08:00
James Chen 73542b2f17 Updates cocos2d-console (#16951) 2016-12-02 14:47:29 +08:00
James Chen b80e316150 fixed #16938: Audio could not be played entirely on iOS/macOS. And refactored some code of decoding. (#16946) 
* fixed #16938: Audio could not be played entirely on iOS/macOS. And refactored some code of decoding.

* Adds license header, removes unused macros.

* issue #16938: Corrects remaining frame count calculation.

* Updates include path.

* Adds comments for AudioDecoder class.

* Adds const for getter functions in AudioDecoder.

* issue #16938: Adds test case.

* Updates license years.

* Deletes trailing white spaces.
 2016-12-02 13:52:37 +08:00
minggo 87f38d5e5d fix crash if scroll to top or left (#16944) 2016-12-01 17:10:20 +08:00
Dale Stammen 8791794f39 updated for v3.14 (#16942) 2016-12-01 10:37:04 +08:00
minggo 8f9b096792 fix url and use https protocol (#16940) 2016-11-30 17:51:57 +08:00
minggo 7e100135b6 disable menu item according different angle of view (#16937) 2016-11-30 16:49:50 +08:00
minggo 28e48c0af8 remove unneeded test case (#16936) 2016-11-30 16:21:33 +08:00
James Chen 51efcb9365 Fixes setScale & setAnchorPoint could not work in js-tests -> webview test . (#16935) 2016-11-30 15:32:02 +08:00
James Chen df13bc8856 Allows Arbitrary Loads for cpp-tests, js-tests, lua-tests project. removes exception dictionary. (#16934) 2016-11-30 15:29:48 +08:00
Ricardo Quesada c5a4e87d4a fix issue #16921 (#16932) 
call setupScale9() always
 2016-11-29 22:58:53 -08:00
minggo 56232a136b correct physics3d debug draw camera (#16927) 2016-11-30 14:38:18 +08:00
minggo fdb94d59d2 update engine version (#16929) 2016-11-30 11:53:53 +08:00
minggo 01f1bf88b4 use correct way to create spriteframe in clone (#16918) 2016-11-30 11:36:01 +08:00
CocosRobot f72b950465 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16926) 2016-11-30 11:33:49 +08:00
James Chen 8f7d5cfc01 Updates ios project configuration, allows http connection to `httpbin.org` for cpp-tests,lua-tests. (#16925) 2016-11-30 11:17:24 +08:00
minggo 691a520c29 fix url (#16922) 2016-11-30 10:28:51 +08:00
James Chen 066adfe204 Adds missing Scale9Sprite::initXXX overrided methods after refactoring Scale9 logic. Otherwise, `setupSlice9` will not be invoked. (#16916) 
* Adds missing Scale9Sprite::initXXX overrided methods after refactoring Scale9 logic. Otherwise, `setupSlice9` will not be invoked.
Test case is: 1. Node: Scene3D -> Description -> Scale9Sprite display is wrong.

* Some fixes:

* Call Sprite::initWithFile(filename) in Scale9Sprite::initWithFile(filename) rather than Scale9Sprite::initWIthFile(filename, Rect::ZERO). Otherwise content size will be zero which is incorrect.
* setCapInsets in updateCapInset only when it’s in slice mode.
* setCapInsets should reset _insetLeft, _insetTop, _insetRight, _insetBottom member variables.
* Remove _previousCenterRectNormalized, just updateCapInset while switching to SLICE mode.

* Fixes JSTest -> ExtensionTest -> EditBoxTest: no background of editbox.

* Avoids an unused `setCapInsets` invocation in setupSlice9.
 2016-11-30 09:26:40 +08:00
minggo 13841a0e36 Merge pull request #16917 from minggo/lua-64bit-fix 
update sunbmodule to fix lua in arm64 bit in debug mode
 2016-11-29 15:41:28 +08:00
minggo 403d679333 update sunbmodule to fix lua in arm64 bit in debug mode 2016-11-29 15:30:50 +08:00
minggo 575ed756d1 should check validation of _stencil (#16913) 2016-11-29 10:46:20 +08:00
James Chen 0c06029532 fixed #16894: RenderTexture does not support Sprite3D (#16909) 2016-11-28 09:50:54 +08:00
Ricardo Quesada fce13ba607 fix: Scale9Sprite test case 18 (#16897) (#16902) 
* fix: Scale9Sprite test case 18

Bug calculating rotated frames.
the width was being used instead of the height and vice-versa

* fixes test cases 8 and 9
 2016-11-25 09:27:20 +08:00
Ricardo Quesada 81f854e82e fix: Scale9Sprite test case 18 (#16898) 
Bug calculating rotated frames.
the width was being used instead of the height and vice-versa
 2016-11-24 15:35:57 +08:00