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

35530 Commits

Author SHA1 Message Date
minggo 86de22a008 fix crash if FontAtlas pointer is the same (#16555) 2016-09-09 11:39:00 +08:00
minggo 4056f24d71 update console (#16553) 2016-09-09 09:35:39 +08:00
minggo 02e943075b update changelog and release note (#16548) 2016-09-08 18:36:25 +08:00
Dale Stammen 1c27c12327 updated libcocos2d dll version to 3.13.1 (#16542) 2016-09-08 10:38:16 +08:00
minggo 1d7d803882 update submodule (#16540) 2016-09-07 18:00:34 +08:00
minggo e394c05c51 update console submodule (#16539) 2016-09-07 17:30:25 +08:00
minggo 569681f6bd use api level 13 (#16538) 2016-09-07 14:50:03 +08:00
minggo e122b902a9 update changelog and release note (#16537) 2016-09-07 13:58:48 +08:00
Ricardo Quesada 282959cc0f fix: uses correct design resolution (#16534) 
fixes github issue #16485
 2016-09-07 12:01:40 +08:00
minggo fa15ab8212 3.13.1 text color (#16516) 
* fix: Label updateColor() and underline color work as expected (#16486)

fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior

fixes Github issue #16471

* fix conflict

* Issue 16471 (#16489)

* fix: Label updateColor() and underline color work as expected

fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior

fixes Github issue #16471

* docs: added more internal doc for issue_16471
 2016-09-07 09:44:58 +08:00
minggo c233a5bdf7 [ci skip]V3.13.1 doc (#16528) 
* update release note and changelog

* update engine version
 2016-09-06 17:01:23 +08:00
minggo 937525a4de prevent restarting activity on some events (#16525) 2016-09-06 16:12:49 +08:00
minggo c51605971f fixed #16490: [android, audio] AudioEngine::stop() triggers 'finished' callback (#16491) (#16524) 2016-09-06 10:58:43 +08:00
minggo 9dc737901b fixed #16473: OpenSLES error while play background music in writable path or sdcard. (#16475) (#16521) 2016-09-06 09:41:53 +08:00
minggo a6c398ec95 Fixes jsval_to_std_string could not convert number to string. (#16504) (#16515) 
Don't use deprecated method in ActionsProgressTest.
 2016-09-05 17:42:34 +08:00
CocosRobot 331faac9d1 [AUTO][ci skip]: updating cocos2dx_files.json (#16436) 2016-08-24 17:54:11 +08:00
minggo 460e1e2da9 update release note (#16435) 2016-08-24 17:41:51 +08:00
minggo 20a0798007 avoid to use __system_get_property__ (#16433) 
* avoid to use __system_get_property__

* add utils

* revert console
 2016-08-24 17:11:41 +08:00
pandamicro bd0173a826 Doctoc docs and update web ref (#16430) 2016-08-24 15:17:47 +08:00
minggo 1748dfa79d update agreement (#16431) 2016-08-24 14:52:55 +08:00
yanli.huang 5db61ca26f fix cocos package can't update (#16428) 
* update cocos2d-console commit id : cocos package so change pyc

* update cocos2d-console  commit id: fix cocos package can't update
 2016-08-24 10:09:42 +08:00
minggo 2c68163081 add ETC1 alpha picture (#16425) 
* add ETC1 alpha picture

* update VR plugin section
 2016-08-23 14:57:25 +08:00
Slack-Moehrle e7be4fc7df updated VR, per Minggo (#16417) 2016-08-23 11:47:08 +08:00
minggo e6521fa173 update release note (#16422) 2016-08-23 11:43:31 +08:00
minggo 1b3ff00cef fix compiling error (#16420) 2016-08-23 11:05:01 +08:00
yanli.huang b0c8a8505a update cocos2d-console commit id : cocos package so change pyc (#16413) 2016-08-22 16:06:29 +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
James Chen 727c501285 Fixes crash while invoking pause&resume right after play2d. (#16406) 2016-08-22 09:43:06 +08:00
CocosRobot 0fbc404cd9 [AUTO][ci skip]: updating cocos2dx_files.json (#16403) 2016-08-22 09:38:51 +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
minggo 92ed162cbe replace replace __system_property_get() since it is deprecated in 64 bit android NDK (#16398) 2016-08-19 11:49:33 +08:00
minggo e9a5a4e2bd Revert luajit (#16397) 
* revert to use lua

* comment lua bytecode test

* update release note
 2016-08-19 11:49:19 +08:00
minggo 2c37be5d86 fix lua tempate error (#16377) 2016-08-17 16:09:48 +08:00
minggo fe3fb42f49 update release note & changelog (#16376) 2016-08-17 15:40:10 +08:00
CocosRobot 9019d7f2c4 [AUTO][ci skip]: updating cocos2dx_files.json (#16374) 2016-08-17 13:59:55 +08:00
minggo 3ce4134ab3 use java reflection to avoid API level dependent, use app-abi 10 (#16371) 
* use java reflection to avoid API level dependent, use app-abi 10

* add license header
 2016-08-17 13:55:26 +08:00
minggo 41cb85edd4 update external version 2016-08-16 13:55:18 +08:00
CocosRobot c03f6468fc [AUTO][ci skip]: updating cocos2dx_files.json (#16368) 2016-08-15 17:27:05 +08:00
James Chen 86b8a633f3 Android arm64-v8a also uses Luajit. (#16352) 
* Android arm64-v8a also uses Luajit.

* Updates external/config.json
 2016-08-15 14:57:04 +08:00
James Chen 1edaf7e122 Initializes member variable for TMXMapInfo and updates hexa-test.tmx to the latest format. (#16353) 2016-08-15 14:10:13 +08:00
James Chen 020745ee2e Disables 'permessage-deflate' extension for WebSocket temporarily. (#16366) 
Currently, we couldn't find out the exact reason.
libwebsockets official said it's probably an issue of user code since 'libwebsockets' passed AutoBahn stressed Test.
 2016-08-15 13:59:01 +08:00
James Chen 12d022d6ea [lua-tests] Reverts uniform after GetUniformTest. (#16357) 2016-08-15 09:41:18 +08:00
Ricardo Quesada 87f6dd3c97 v3.13 branch: spine updates (#16340) 
related to:

* Github issue #16263
* Github issue #16294
 2016-08-11 23:30:15 +08:00
Dale Stammen a124213777 disabled /ZW option for .c files for all platforms/configurations (#16338) 2016-08-11 23:03:58 +08:00
James Chen 8af275c4a6 Fixes potential crash in AudioEngine::uncache(filePath). (#16345) 2016-08-11 16:06:59 +08:00
James Chen 89baddceda fixes compile error for win32 (#16351) 2016-08-11 15:54:51 +08:00
minggo abb97b1b71 don't set camera the same as its parent by default (#16325) 2016-08-05 17:26:27 +08:00
James Chen f44f253179 [Android] Notify waitup only while preloadEffect(info, cb) is invoked in play2d. (#16320) 
Currently, if a audio isn't preloaded, then play2d will wait the preload operation to finish.
 2016-08-05 14:07:19 +08:00
子龙山人 0d836b2cea Fix pageview click turning event (#16318) 
* fix pageView click turning event

* fix current PageIndx issue
 2016-08-05 14:04:57 +08:00
Ricardo Quesada 59a646341c adds more info for bug #15776 (#16316) 
related to github issue #15776

This is a PR for v3.13 branch
 2016-08-05 14:04:26 +08:00