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

33722 Commits

Author SHA1 Message Date
肖峰 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
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 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 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
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
Liam fb312a761c update for 3D object render, revert old changes 2015-12-18 11:23:33 +08: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
Sergey 714c01991e Scale9Sprite test improvemets 2015-12-18 01:38:53 +03:00
Sergey 98fe1d46cc Scale9Sprite now fully support cropped sprite frames in both mode simple & slice 2015-12-18 00:32:59 +03:00
pandamicro b3be20aae6 Merge pull request #14710 from ricardoquesada/uthash_bye_bye 
no more uthash
 2015-12-17 21:58:20 +08:00
XiaoFeng 6c08dd920e Fix TextField missing default password style text setting 2015-12-17 18:29:23 +08:00
Sergey Perepelitsa b30553e933 WebP loading improvements WebP loaded as premultiplied alpha if it have alpha 2015-12-17 12:07:56 +03:00
Sergey 3e049f8049 slider misprint fix 2015-12-17 12:06:39 +03:00
Sergey b4f762befa fix include in cocos network module 2015-12-17 11:50:54 +03:00
Sergey a172cce874 fix web socket crash 2015-12-17 11:48:25 +03:00
pandamicro 3dbc453ee2 Merge pull request #14713 from chengstory/UpdateWebSubmodule 
Update cocos2d-js web submodule to latest.
 2015-12-17 15:08:28 +08:00
zhangcheng df98bf098b Update web submodule to latest. 2015-12-17 14:07:01 +08:00
Ricardo Quesada d943381c65 Update spidermonkey_specifics.h 
updated docstrings
 2015-12-16 20:03:09 -08:00
Ricardo Quesada 1ba3f2badb minor fixes 2015-12-16 17:47:50 -08:00
Ricardo Quesada f023d5a378 no more uthash 
Instead of using two uthash entires, it uses two unordered_map entries.
Benefits are:

easier to debug. I can inspect the contents of the unorderd_map with the
debugger
less memory. I don't need to allocate two proxies. I only allocate one
proxy and I added it into both maps
If also fixes an important bug when unrooting objects. Unroot was
cleaning the heap object. So now proxy adds a _jsobj, which is a raw
pointer. Needed under certain cases.
 2015-12-16 17:37:44 -08:00
pandamicro b079705dcd Merge pull request #14702 from pandamicro/v3.10 
Fix Downloader callback bug on iOS9
 2015-12-17 01:05:10 +08:00
pandamicro 58902f0711 Fix issue in URLSession:task:didCompleteWithError: 2015-12-16 21:19:46 +08:00