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

33861 Commits

Author SHA1 Message Date
pandamicro 727480e44f Merge pull request #14760 from mogemimi/fix-doc-typo 
Fix typos in documentation, comments and strings
 2015-12-21 09:32:57 +08:00
mogemimi aac1558b75 Fix typos in documentation, comments and strings 2015-12-21 08:22:41 +09:00
pandamicro 4ff9ed0ffe Merge pull request #14758 from pandamicro/v3 
Sync v3.10 to v3
 2015-12-20 23:47:07 +08:00
pandamicro 022bcc24f1 Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
	cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
	cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
 2015-12-20 22:56:33 +08:00
pandamicro 1071f63ac7 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-12-20 22:45:51 +08:00
pandamicro 80973677ed Improve UICheckBox issue 2015-12-20 21:13:16 +08:00
Sergey a342866083 Test for WebP with & without alpha 2015-12-20 14:22:04 +03:00
肖峰 7b8db23a9e Update change log and authors 2015-12-20 15:34:21 +08:00
pandamicro f747075a83 Merge pull request #14748 from pandamicro/v3.10 
Temporary disable forceGC on win32
 2015-12-19 23:27:12 +08:00
pandamicro 8f836162aa Temporary disable forceGC on win32 2015-12-19 22:45:57 +08:00
pandamicro 386b850871 Fix issue in MenuItem init usage 2015-12-19 22:45:22 +08:00
pandamicro ae48253da6 Fix UI addEventListener issue 2015-12-19 22:44:25 +08:00
pandamicro e9bddf0c6d Merge pull request #14747 from liamcindy/v3_ui_js 
fix scrpite sameples error with controlButton
 2015-12-19 22:26:38 +08:00
fanli ffbac99dc5 fix script samples error with controlButton 2015-12-19 22:22:41 +08:00
Ricardo Quesada 041150a36f Merge pull request #14336 from mogemimi/fix-function-name 
Fix spelling of function name
 2015-12-19 06:20:29 -08:00
xiaofeng11 ef3bb81be6 Merge pull request #14746 from zilongshanren/v3.10 
fix lua focus test
 2015-12-19 19:14:30 +08:00
zilongshanren ac4f66fff2 fix lua focus test 2015-12-19 18:32:43 +08:00
pandamicro a165ecb1e9 Merge pull request #14745 from pandamicro/v3.10 
Upgrade bindings generator
 2015-12-19 18:09:09 +08:00
zilongshanren f43379a313 Merge pull request #14744 from CocosRobot/update_lua_bindings_1450516210 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-12-19 17:19:08 +08:00
pandamicro 4f94b03b86 Upgrade bindings generator 2015-12-19 17:18:39 +08:00
CocosRobot 0f90f74df9 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-19 09:12:27 +00:00
zilongshanren ba74e8fc17 Update CHANGELOG 2015-12-19 17:07:50 +08:00
zilongshanren 94ee0734a5 Merge pull request #14721 from newnon/v3.10_slider_missprint 
slider misprint fix
 2015-12-19 17:06:26 +08:00
zilongshanren 4fda883c3b Merge pull request #14742 from xiaofeng11/v3.10 
Fix TextField won't show security text when first time set password enable
 2015-12-19 17:01:43 +08:00
zilongshanren 795637c0c5 Merge pull request #14743 from liamcindy/v3_ui_LoadingBar 
fix loadingbar direction changed error
 2015-12-19 16:59:42 +08:00
Liam 8bf7908e93 fix loadingbar direction changed error 2015-12-19 15:59:27 +08:00
XiaoFeng d8817f3cbb Fix TextField won't show security text when first time set password enable 2015-12-19 15:44:39 +08:00
pandamicro 6481a0f3c1 Merge pull request #14740 from xiaofeng11/v3.10 
Bug Fix & h5 engine ref update
 2015-12-19 14:13:37 +08:00
XiaoFeng a139221618 Synchronize parser match modify from h5 engine 
Update h5 engine ref
 2015-12-19 13:56:12 +08:00
XiaoFeng f6021d502d Fix pageViewTest Horizontal scroll won't work in Lua-test 2015-12-19 13:12:32 +08:00
zilongshanren b480e9191d Merge pull request #14729 from newnon/v3.10_scale9sprite_cropped_spriteframes_support 
Scale9Sprite cropped sprite frames support
 2015-12-19 13:07:25 +08:00
zilongshanren 7b64bbc3cb Update CHANGELOG 2015-12-19 10:13:55 +08:00
zilongshanren 8d967982cd Merge pull request #14723 from newnon/v3.10_web_socket_crash_fix 
fix web socket crash
 2015-12-19 10:11:58 +08:00
zilongshanren bf61545d83 Merge pull request #14736 from CocosRobot/update_lua_bindings_1450445156 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-12-19 10:04:32 +08:00
Sergey 9e6657d6b2 fix scale9error error 2015-12-18 22:40:12 +03:00
mogemimi 12ece31121 Mark the old functions as CC_DEPRECATED_ATTRIBUTE 2015-12-19 01:21:56 +09:00
mogemimi 689ee1081a Fix spelling of function name 2015-12-19 01:07:08 +09:00
CocosRobot b5141a28bd [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-18 13:28:14 +00:00
XiaoYang 593a619dc8 Merge pull request #14715 from liamcindy/v3_textureCache 
update for 3D object render, revert old changes
 2015-12-18 21:22:31 +08:00
xiaofeng11 2ee5c88f9a Merge pull request #14733 from xiaofeng11/v3.10 
Update h5 sub-module ref
 2015-12-18 19:06:59 +08:00
XiaoFeng 9253570304 update h5 sub-module ref 2015-12-18 17:32:44 +08:00
XiaoFeng a13a0c35d3 Update h5 sub-module ref 
Synchronize studio parser match change from h5 modify
 2015-12-18 15:40:21 +08:00
Ricardo Quesada e2f94a7a44 Merge pull request #14698 from super626/v3.10-fixshader 
fix Shader-Sprite crash when shader can not compile
 2015-12-17 23:22:09 -08:00
Sergey 9025b010ba changeв russian letter с to english c 2015-12-18 10:19:08 +03:00
zilongshanren eb72760b85 Merge pull request #14726 from xiaofeng11/v3.10 
Fix TextField missing default password style text setting
 2015-12-18 14:42:21 +08:00
pandamicro 4d9beb9d77 Merge pull request #14699 from WenhaiLin/v3-new-nothrow 
Adds `std::nothrow` to the `new` statements
 2015-12-18 14:38:28 +08:00
zilongshanren 2a6cec25fa Merge pull request #14701 from WenhaiLin/v3-label-letterfix 
Fixed label's letter can't be hide by `setVisible(false)`.
 2015-12-18 11:41:51 +08:00
Liam fb312a761c update for 3D object render, revert old changes 2015-12-18 11:23:33 +08:00
kci d3898991af fix some logical error 2015-12-18 11:03:23 +09:00
zilongshanren 1e8a0e0acc Merge pull request #14719 from newnon/v3.10_fix_android_include 
fix include in cocos network module
 2015-12-18 09:53:09 +08:00