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

11132 Commits

Author SHA1 Message Date
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
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
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 a13a0c35d3 Update h5 sub-module ref 
Synchronize studio parser match change from h5 modify
 2015-12-18 15:40:21 +08: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 98fe1d46cc Scale9Sprite now fully support cropped sprite frames in both mode simple & slice 2015-12-18 00:32:59 +03:00
XiaoFeng 6c08dd920e Fix TextField missing default password style text setting 2015-12-17 18:29:23 +08: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
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
pandamicro ffcf45ef78 Improved solution for Downloader status code issue on iOS 9 2015-12-16 17:45:40 +08:00
pandamicro a8a9c8ec92 Merge pull request #14694 from ricardoquesada/v3_10_js_fixes 
ccvector_to / ccmap_to converted to new API
 2015-12-16 16:34:51 +08:00
pandamicro 7303895866 Improve error message for Downloader and add test case 2015-12-16 15:43:18 +08:00
pandamicro 05da27338a Merge branch 'fix/ios9_downloader_bug' of github.com:cezheng/cocos2d-x into v3.10 2015-12-16 15:24:42 +08:00
Ricardo Quesada eb8e755362 removes logs 2015-12-15 18:21:44 -08:00
Ricardo Quesada 43a573f4fd ccvector_to / ccmap_to converted to new API 
and more fixes
 2015-12-15 17:37:48 -08:00
GuoLunHao 7d72f66f5b add 'js_module_register.cpp' and 'lua_module_register.cpp' in Compile Sources on iOS Targets' Build Phases 2015-12-15 21:00:24 +08:00
CocosRobot 8cb2ec6187 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-12-15 04:31:50 +00:00
pandamicro 6e20c3cc4f Merge pull request #14681 from pandamicro/v3.10 
Fix ComponentJS proxy management issue in JSB
 2015-12-15 12:26:12 +08:00
Ce Zheng 6d58fc05d9 Fix Downloader callback bug on iOS9 
On iOS 9 when server returns a response with HTTP status 403 caused the
downloader to callback successfully and saving the error message to the
storage path. This commit adds a check on the HTTP status code and
do failure callback if status code is 4xx or 5xx.
 2015-12-15 13:16:24 +09:00
pandamicro 64276bd664 Fix ComponentJS proxy management issue in JSB 2015-12-15 11:48:44 +08:00
pandamicro 280a8e9d9c Merge pull request #14663 from xiaofeng11/v3.10 
Update all version number to v3.10
 2015-12-15 10:48:51 +08:00
Dale Stammen 46b926a18e added missing _USRJSSTATIC preprocessor define for ARM builds 2015-12-14 14:55:33 -08:00
mogemimi 18aec7e942 Fix deprecation warning in FontFNT 2015-12-15 02:25:32 +09:00
pandamicro 0e7a02d025 Merge pull request #14670 from pandamicro/v3 
Fix evalString doesn't return result issue
 2015-12-14 17:26:34 +08:00
zilongshanren bc29bde5ae Merge pull request #14653 from liamcindy/v3_ui_pageView 
update pageview to support adjust child size
 2015-12-14 17:00:58 +08:00
Liam 508d54ec3c fix pageview child size 2015-12-14 15:29:02 +08:00
肖峰 23bf815cfa Fix 3d touch compile error in lower version Xcode 2015-12-14 14:26:52 +08:00
zilongshanren 0dd4433104 Merge pull request #14669 from zilongshanren/fixCustomSize 
fix #12249
 2015-12-14 13:56:50 +08:00
zilongshanren 6781c96fe0 Merge pull request #14661 from zilongshanren/v3.10 
fix scale9sprite global zorder issue.
 2015-12-14 13:56:29 +08:00
pandamicro 662c7fbec5 Made API consistent with old version 2015-12-14 13:55:17 +08:00
pandamicro cbce4d37c3 Merge pull request #14671 from ricardoquesada/more_js_fixes 
More js fixes
 2015-12-14 13:41:59 +08:00
zilongshanren 96db089b64 Merge pull request #14665 from zilongshanren/fixMemoryLeak 
fix memory leaks of stencileStateManager
 2015-12-14 13:34:17 +08:00
pandamicro 330b588215 Fix evalString doesn't return result issue 2015-12-14 13:13:54 +08:00
pandamicro 41218a65e7 Merge pull request #14668 from pandamicro/v3 
Sync v3 and Fix win32 js project crash issue
 2015-12-14 13:12:42 +08:00
zilongshanren 838bd242ce fix #12249 2015-12-14 11:53:09 +08:00
zilongshanren 3e64e09e69 fix memory leaks of stencileStateManager 2015-12-14 10:40:09 +08:00
xiaofeng11 1c53920a13 Merge pull request #14660 from chengstory/#24345 
Fix #24345
 2015-12-14 10:38:13 +08:00
XiaoFeng 4815ec8b9a Update version number to v3.10 2015-12-14 10:32:29 +08:00