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

33832 Commits

Author SHA1 Message Date
pandamicro 8bc9f712ea Merge pull request #14895 from minggo/firefox-remote-debug 
web console supports for JSB projects
 2016-01-15 21:27:27 +08:00
minggo 5f9bd06bee support webconsole 2016-01-15 18:05:59 +08:00
minggo e062ade514 make require() returns the value of last statement 2016-01-15 18:02:11 +08:00
pandamicro 2640396822 Merge pull request #14890 from minggo/firefox-remote-debug 
can use new firefox version to debug cocos2d-x jsb projects
 2016-01-15 12:48:46 +08:00
minggo 299a56d52e can use new firefox version to debug cocos2d-x jsb projects 2016-01-15 11:39:17 +08:00
Ricardo Quesada f0d35c9c08 Merge pull request #14889 from dumganhar/read-string-file-fix 
Some Important Fixes for File Reading, may cause stack overflow
 2016-01-14 18:51:48 -08:00
James Chen 41c0881ab5 SpriteTest fix 
* Image is Ref class, please new & release it. Don't allocate it on stack.
* Fixes complicated logic of getting string from file.
 2016-01-15 00:55:10 +08:00
James Chen b04e4754d7 Refactor CCBundle3D, remove wrong use of getDataFromFile. _jsonBuffer is std::string, _binaryBuffer is Data instance now. 2016-01-15 00:55:10 +08:00
James Chen 057db2444c Removes unused code in Material::initWithFile. 2016-01-15 00:55:10 +08:00
James Chen e7ed79f655 const Data -> const Data& for function argument, performance improvement. 2016-01-15 00:55:10 +08:00
James Chen 7e0a1344ca The fix for BMFontConfiguration::parseConfigFile reads string file. 
'strchr' finds a char until it gets a '\0', if 'contents' self doesn't end with '\0',
'strchr' will search '\n' out of 'contents' 's buffer size, it will trigger potential and random crashes since
lineLength may bigger than 512 and 'memcpy(line, contents + parseCount, lineLength);' will cause stack buffer overflow.
 2016-01-15 00:55:10 +08:00
zilongshanren 9c86d1f0f1 Merge pull request #14880 from mogemimi/fix-minor-typo 
Fix typos in comments and documentation
 2016-01-14 09:58:29 +08:00
xiaofeng11 be6f9c0f03 Merge pull request #14882 from geron-cn/playableframe 
add PlayableFrame
 2016-01-14 09:42:17 +08:00
Ricardo Quesada d589e44b0a Merge pull request #14692 from CodeAndWeb/spriteframe-anchor-from-plist 
Load anchor points from plist files
 2016-01-13 15:58:02 -08:00
geron-cn eab1de0f1e format code and remove fixes already in https://github.com/cocos2d/cocos2d-x/pull/14885 2016-01-13 16:34:04 +08:00
geron-cn e3c50caf11 add test case for PlayableFrame 2016-01-13 15:25:31 +08:00
geron-cn 0babe85947 add PlayableFrame 2016-01-12 17:21:01 +08:00
mogemimi 18a793792e Fix typos in comments and documentation 2016-01-12 13:27:06 +09:00
zilongshanren cd7671088f Merge pull request #14712 from xpol/fix-include-for-compile-under-crystax-ndk 
crystax-ndk-10.3.0 needs <stdint.h> to be included in cocos/ui/UIWebViewImpl-android.h.
 2016-01-12 11:56:43 +08:00
zilongshanren e1d0d7f722 Merge pull request #14854 from zilongshanren/fixScale9GrayShader 
fix scale9sprite gray state opacity issue.
 2016-01-12 11:50:41 +08:00
zilongshanren 161be986af Merge pull request #14340 from fnz/easyjni 
easy jni
 2016-01-12 11:50:16 +08:00
zilongshanren cf6fc000e7 Merge pull request #14709 from kcisoul/v3 
Fix  #14428 CCRenderTexture does not work properly on some devices wh…
 2016-01-12 11:35:00 +08:00
zilongshanren 3707464e80 Merge pull request #14873 from mogemimi/fix-doc-typo 
Fix some typos in docs
 2016-01-12 11:20:54 +08:00
mogemimi 41dd44c75d Fix some typos in docs 2016-01-11 19:23:05 +09:00
zilongshanren e8484d0cee Merge pull request #14866 from xiaofeng11/v3 
Merge 3.10 release from v3.10 into v3 branch
 2016-01-11 10:06:06 +08:00
XiaoFeng ab0efd933a Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	CHANGELOG
	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
	tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
 2016-01-09 18:01:56 +08:00
Ricardo Quesada d3683a854e Merge pull request #14857 from ricardoquesada/gc_after_transition_is_finished 
garbage collect when transition is finished
 2016-01-07 10:52:46 -08:00
Ricardo Quesada dc785f63ea garbage collect when transition is finished 2016-01-07 10:52:03 -08:00
zilongshanren 7d943f200f fix scale9sprite gray state opacity issue. 
Ticket: https://github.com/cocos2d/cocos2d-x/issues/14378
 2016-01-07 17:17:55 +08:00
zilongshanren 67f4be538b Update CHANGELOG 2016-01-07 17:08:40 +08:00
zilongshanren 62f017b1d6 Merge pull request #14853 from cocos2d/revert-14852-fixScale9Opacity 
Revert "fix scale9sprite gray state opacity issue."
 2016-01-07 17:07:45 +08:00
zilongshanren 2797277de8 Revert "fix scale9sprite gray state opacity issue." 2016-01-07 17:07:27 +08:00
zilongshanren a05e15d17e Update CHANGELOG 2016-01-07 16:58:48 +08:00
zilongshanren 44b7c32bc6 Merge pull request #14852 from zilongshanren/fixScale9Opacity 
fix scale9sprite gray state opacity issue.
 2016-01-07 16:58:08 +08:00
zilongshanren 1910f79b2f fix scale9sprite gray state opacity issue. 
Ticket: https://github.com/cocos2d/cocos2d-x/issues/14378
 2016-01-07 15:26:14 +08:00
xiaofeng11 4785f3af70 Merge pull request #14850 from xiaofeng11/v3.10 
Fix pre-compiled framework js project will crash if use "Force Quit" to terminate program.
 2016-01-07 11:32:16 +08:00
XiaoFeng 1554b6e676 Fix pre-compiled framework js project will crash if use "Force Quit" to terminate program. 2016-01-07 10:42:47 +08:00
Ricardo Quesada b673b5789d Merge pull request #14849 from ricardoquesada/gc_fix_for_cpp 
ouch... doesn't crash on pure C++ projects
 2016-01-06 11:17:38 -08:00
Ricardo Quesada ddb142e211 ouch... doesn't crash on pure C++ projects 2016-01-06 11:16:55 -08:00
pandamicro 8b773e288c Merge pull request #14846 from xiaofeng11/v3.10 
[ci skip] Fix more js parser font setting error
 2016-01-06 20:45:05 +08:00
XiaoFeng 0fcfb359d2 Fix more js parser font setting error 2016-01-06 20:42:27 +08:00
xiaofeng11 87be7e3531 Merge pull request #14844 from xiaofeng11/v3.10 
[ci skip] Fix js parser use resource path name for font name when font name is blank in BMFontLoader and ButtonLoader
 2016-01-06 19:45:24 +08:00
XiaoFeng d82b6b6f1c Fix js parser use resource path name for font name when font name is blank in BMFontLoader and ButtonLoader 2016-01-06 19:36:32 +08:00
pandamicro bf405c9b5a Merge pull request #14838 from chengstory/UpdateReleaseNote3 
[ci skip]Update RELEASE_NOTES.
 2016-01-06 09:54:51 +08:00
zhangcheng a19cceedb5 [ci skip]Update RELEASE_NOTES. 2016-01-06 09:50:00 +08:00
pandamicro 343eec6a25 Merge pull request #14828 from zilongshanren/v3.10 
add overFlow enum to jsb and lua.
 2016-01-05 13:46:25 +08:00
pandamicro 74dc0cc4d0 Merge pull request #14836 from chengstory/UpdateReleaseNote2 
[ci skip]Fix releasenote error.
 2016-01-05 11:29:29 +08:00
zhangcheng 5f85f6154b fix error 2016-01-05 11:24:55 +08:00
pandamicro 013ad3367a Merge pull request #14834 from chengstory/UpdateSubmodule 
[ci skip]Update RELEASE_NOTES
 2016-01-05 10:57:32 +08:00
zhangcheng a6123bee06 Fix error. 2016-01-05 10:52:03 +08:00