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

6808 Commits

Author SHA1 Message Date
samuele3hu a3dbd010db Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine 2014-11-13 13:42:46 +08:00
Dhilan007 249d34b707 fix AudioEngine can't looping audio on Android 2.3.x 2014-11-13 11:28:08 +08:00
LinWenhai a37549d7bc Update Cocos2dxMusic.java 2014-11-13 11:00:29 +08:00
samuele3hu 1d1d004c3a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-11-12 17:46:13 +08:00
Dhilan007 e071e5c896 Fix Label may display incomplete for multiline text with outline feature enabled. 2014-11-12 17:24:35 +08:00
wangqm0513 9415b2b930 Update TouchesJni.cpp 
fixed gamelist can't pull by mouse.
 2014-11-12 14:21:48 +08:00
wangqm0513 e8d24cb49b Update MathUtilNeon64.inl 
add arm64bit  neon support
 2014-11-12 14:15:29 +08:00
Dhilan007 76c9accec9 Fix SimpleAudioEngine::sharedEngine()->playBackgroundMusic() crash on Lollipop 2014-11-12 13:01:47 +08:00
jicheol-ryu c94a9ea01a fix bugs - potential memory leak. 
const std::string text = std::string((char*)ch,0,len); is using next
string constructor.
string (const string& str, size_t pos, size_t len = npos);
memory leak can occur while type converting char to string.

So we have to use next string constructor.
string (const char* s, size_t n);

http://www.cplusplus.com/reference/string/string/string/
 2014-11-12 00:06:30 +01:00
teivaz 7c355a087b - Optimization in CCClippingNode. 
Disable visiting when no objects has to be drawn under stencil.
 2014-11-11 21:09:58 +02:00
Mircea Rila a643f05330 add touch callback types 2014-11-11 18:00:34 +02:00
Vladimir Timofeev 8910b962a0 cmake: 
- fix Audio engine build on Mac
- remove duplicated defintions of _EXPORT_DLL_
 2014-11-11 10:30:48 +03:00
Vladimir Timofeev dba8ef33bd cmake: connect mac specific UIEditBox implementation to build 2014-11-11 10:30:48 +03:00
Vladimir Timofeev 0059c93757 cmake: protobuf should be linked with cocos2d.a in every platform (not only on linux) 2014-11-11 10:30:48 +03:00
minggo 6c67c6921d Merge pull request #8977 from pipu/v3_Modify_TextReader 
Modify that parsing attribute "fontName" of TextReader
 2014-11-11 12:05:49 +08:00
yangxiao 6ecb9a7b04 fix #9031 2014-11-10 12:48:42 +08:00
CocosRobot a908c391b0 [AUTO]: updating luabinding automatically 2014-11-09 15:33:08 +00:00
minggo 8476956ef9 Merge pull request #9057 from andyque/fixScale9FlipIssueNew 
fix scale9sprite flip issue
 2014-11-09 23:27:40 +08:00
minggo e7d5e79e88 Merge pull request #8998 from aeonmine/v3 
fix memory leak cocos studiov2.0 engine v3.3
 2014-11-09 23:24:16 +08:00
cpascal 74ba46f225 Fixed "warning: bundle reader out of range" 
This warning was displayed even if it's valid c3b file..
Changed "validLength <= needLength" to "validLength < needLength".
 2014-11-09 07:38:44 +09:00
joewanchen c4b1aeb0ec fix momery leak (partly fix, memory leak still exist). 2014-11-07 11:43:55 +08:00
andyque 9c3c693a21 refactor Widget flip logic 2014-11-07 11:11:51 +08:00
andyque 5483bc834d fix scale9sprite flip issue 2014-11-07 11:09:22 +08:00
CocosRobot aae2fd9e2a [AUTO]: updating luabinding automatically 2014-11-07 02:38:01 +00:00
minggo db659107d3 Merge pull request #9052 from huangshiwu/v3_fixbug 
fix ui crash bug caused by DrawNode
 2014-11-07 10:33:08 +08:00
minggo 3b8ddf1b54 Merge pull request #9005 from joshuastray/add-resource-folder-def 
Update CCFileUtils-linux.cpp
 2014-11-07 10:25:14 +08:00
joewanchen b05f558214 fix compile error. 2014-11-07 10:14:07 +08:00
huangshiwu ace9933d72 fix ui crash bug caused by DrawNode 2014-11-07 10:05:29 +08:00
joewanchen b682438b68 revert some modifications. 2014-11-07 09:17:32 +08:00
joewanchen c2b97a3b13 fix sprite frame cache, and remove unnecessary headers dependencies. 
we should add private headers for ccs, do not expose privae headers to users.
 2014-11-07 09:13:59 +08:00
Ricardo Quesada 3d448e86ef fixes some compiler warnings 
don't call deprecated functions
 2014-11-06 12:25:55 -08:00
G17hao c7f5c3052d Update CCBone.cpp 
fix the bone disorderly flying
http://www.cocoachina.com/bbs/read.php?tid-220321-keyword-%C2%D2%B7%C9.html
 2014-11-06 17:51:19 +08:00
samuele3hu 76ab86674e Fix’ the error that Cocos2dxLuaJavaBridge' was optimized because of usage of LOCAL_STATIC_LIBRARIES on the android 2014-11-06 14:32:03 +08:00
cpascal 3dcce59e84 Fix error with CC_ENABLE_SCRIPT_BINDING=0 
There are too much compile error if I set EE_ENABLE_SCRIPT_BINDING=0.

CCEventTouch and CCTouch related things...
This is temporary fix... Many source/header files must be patched for
the right way..
 2014-11-06 07:20:41 +09:00
minggo 25053b80bc Merge pull request #8930 from super626/fixsprite 
add Sprite3D::getMeshArrayByName and refactor re-skin test
 2014-11-05 18:11:51 +08:00
minggo 7565b9b1eb Merge pull request #8969 from kaylyun/v3 
BUGFIX:SOMETIMES APP DIRECTLY AT THE STARTUP
 2014-11-05 17:58:28 +08:00
minggo 8a49ae0b07 Merge pull request #8981 from vovkasm/clean-order-of-fields-initialization 
Cleanup order of fields initialization.
 2014-11-05 17:51:58 +08:00
minggo e56c84ebf0 Merge pull request #8983 from super626/camera 
fix wrong camera lookat computation
 2014-11-05 17:49:59 +08:00
cpascal c1f85bac0e Fixed compile error with CC_REF_LEAK_DETECTION 2014-11-05 16:23:25 +09:00
CocosRobot 13f9073e22 [AUTO]: updating luabinding automatically 2014-11-05 05:44:02 +00:00
minggo 98073632d4 Merge pull request #8908 from zawasp/v3-source 
fix some warnings / remove TABs
 2014-11-05 13:39:20 +08:00
Ricardo Quesada 3a34d6eb9d Performance improvements 
`Director::getMatrix()` returns `const Mat4`
 2014-11-04 16:46:14 -08:00
Jialong Zhai 6e35e91642 Update CCFileUtils-linux.cpp 2014-11-04 18:23:12 +08:00
峰　正博 828715ab8b ;; -> ; 2014-11-04 11:54:48 +09:00
峰　正博 29779a4604 modiry document->Parse((char*)pByte); to document->Parse((const char*)pByte); 2014-11-04 11:51:00 +09:00
峰正博 85fb2c91ab fix memory leak cocos studiov2.0 engine v3.3 2014-11-04 01:25:58 +09:00
samuele3hu 08d6b0dcff Fix the type judgment of lua value would parse string —> int or int —> string 2014-10-31 17:50:59 +08:00
yangxiao 642a601502 fix wrong look at 2014-10-31 11:32:10 +08:00
CocosRobot 9592b1f661 [AUTO]: updating luabinding automatically 2014-10-31 02:44:25 +00:00
minggo d0edba2db3 Merge pull request #8975 from 2youyouo2/v3_EventFrame 
update event frame
 2014-10-31 10:32:53 +08:00
minggo 543c65c7b3 Merge pull request #8970 from super626/v3 
refact 3d bundle code and fix sprite
 2014-10-31 10:27:16 +08:00
minggo 87d7b7e8ee Merge pull request #8973 from joshuastray/fix_constructor_access 
modify protected -> CC_CONSTRUCTOR_ACCESS
 2014-10-31 10:26:32 +08:00
minggo e87e0290fd Merge pull request #8958 from MSOpenTech/wp8-shader-fix 
WP8 Shader fix for cocos2d-x issue 8933
 2014-10-31 09:43:31 +08:00
Vladimir Timofeev 2835b094da Cleanup order of fields initialization. 
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
 2014-10-30 17:28:41 +03:00
pipu 2ed51e042d Modify that parsing attribute "fontName" of TextReader 2014-10-30 18:00:03 +08:00
Jialong Zhai ce85ea3946 fix indentation 2014-10-30 14:38:55 +08:00
Jialong Zhai 4113929fc0 Update UIVideoPlayer.h 2014-10-30 14:36:15 +08:00
Jialong Zhai fd238cab36 modify protected -> CC_CONSTRUCTOR_ACCESS 2014-10-30 14:24:37 +08:00
minggo e99ea7a9fe Merge pull request #8961 from Appgeneration/winrt_link_fix 
Winrt link fix
 2014-10-30 12:54:48 +08:00
yangxiao 77aebb657d merge cocos 2014-10-30 11:56:20 +08:00
kaylyun 97c076337a BUGFIX:SOMETIMES APP DIRECTLY AT THE STARTUP 
Sometimes app directly at the startup on android platform.
 2014-10-30 10:21:19 +08:00
kaile.yin ec5081798c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_EventFrame 2014-10-30 09:57:01 +08:00
Miguel Ferreira ad8ffa5de1 Fixed winrt DLL link errors when using extern consts 2014-10-29 10:47:02 +00:00
kyokomi 2b4cf9ae59 bugfix: setting forget the contentSize. 2014-10-29 19:38:12 +09:00
Dale Stammen 32a5a2cbb8 Merge branch 'v3' into wp8-shader-fix 2014-10-28 22:08:04 -07:00
Dale Stammen 060779c138 added check for WP8_SHADER_COMPILER 2014-10-28 21:01:26 -07:00
Dale Stammen a8e0987b8d disabled distanceFieldEnabled for WP8 as the shader crashes some older windows phones 2014-10-28 20:59:44 -07:00
Dale Stammen ee83a8a6e0 disabled distanceFieldEnabled for WP8 as the shader crashes some older windows phones 2014-10-28 20:57:40 -07:00
Dale Stammen 145156d698 disabled distanceFieldEnabled for WP8 as the shader crashes some older windows phones 2014-10-28 20:56:49 -07:00
minggo e3d813795d Merge pull request #8923 from liamcindy/v3 
update ui button size changed logic
 2014-10-28 21:59:49 +08:00
Dale Stammen af14b40ba0 must call DisplayInformation::GetForCurrentView() from main UI thread 2014-10-27 13:40:19 -07:00
Dale Stammen 5b69a55121 added check for WP8_SHADER_COMPILER 2014-10-27 11:16:14 -07:00
Dale Stammen 510c8caed7 added DPI support for universal app 2014-10-27 11:12:54 -07:00
Dale Stammen 6d46ee8f3d fixed location of renderer filter 2014-10-27 11:09:27 -07:00
Dale Stammen 4dd48d5020 removed mutex. use concurrent_queue for events 2014-10-27 11:08:22 -07:00
Dale Stammen b483162128 added ignore warning 4756 2014-10-27 11:07:27 -07:00
Dale Stammen 2eccd58d45 added DPI support for universal app 2014-10-27 11:07:00 -07:00
Dale Stammen 6fb69870f9 fixed compiler warnings for winrt code 2014-10-27 10:57:57 -07:00
Dale Stammen 77c00bc77f removed use of std::mutex. Now using lock-free concurrent_queue 2014-10-27 08:32:19 -07:00
yangxiao 7656ff2f0e fix wrong vertex buffer size 2014-10-27 13:59:40 +08:00
minggo 34c2587f7c Merge pull request #8928 from Svenito/vec_op 
Add greater than operator to Vec2
 2014-10-27 11:54:23 +08:00
minggo 23f922420a Merge pull request #8919 from ahlwong/v3 
Fix Label Kerning on Single Characters Cocos2d-X3.3Beta0
 2014-10-27 11:48:50 +08:00
minggo baff367c94 Merge pull request #8918 from dumganhar/iss8843-drawpoint 
closed #8843: Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
 2014-10-27 11:38:11 +08:00
minggo f1ac0df761 Merge pull request #8921 from TimothyZhang/fix-program-cache-add 
release old program with the same key before adding glprogram
 2014-10-27 11:22:00 +08:00
Liam d6564be67e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-10-27 11:16:58 +08:00
Liam 19ed3d1965 udpate for ui button state change event 2014-10-27 11:16:25 +08:00
minggo 7c09787324 Merge pull request #8925 from Teivaz/v3 
* [WP8] Enabled GLProgramState restoring on render recreated
 2014-10-27 11:13:18 +08:00
Timothy Zhang d42f8cac65 replace tab with 4 spaces 2014-10-27 10:02:28 +08:00
Timothy Zhang 80230258d6 replace tab with 4 spaces 2014-10-27 09:59:47 +08:00
kaile.yin dd517813a8 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_EventFrame 2014-10-25 23:02:38 +08:00
Liam 57e6631918 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-10-25 19:01:18 +08:00
Liam f1970e98dd update for ui button press event 2014-10-25 18:00:57 +08:00
minggo b99f0bf321 Merge pull request #8926 from MSOpenTech/wp8.1-universal 
WP8.1 universal app
 2014-10-25 15:45:50 +08:00
yangxiao 0696041ea9 add getMeshArrayByName method 2014-10-25 12:27:03 +08:00
Sven Steinbauer c9f5eacc2e Add greater than operator to Vec2 2014-10-24 20:27:06 +01:00
Ahlwong dfcdf10898 Fix Label Additional Kerning All Strings 2014-10-24 08:57:37 -07:00
Dale Stammen 042976265c updated precompiled shaders for WP8 2014-10-24 07:20:16 -07:00
Dale Stammen 40e49cdc12 Merge branch 'v3' into wp8.1-universal 2014-10-24 07:08:55 -07:00
minggo 1c72b4fba8 Merge pull request #8924 from CocosRobot/update_lua_bindings_1414158758 
[AUTO]: updating luabinding automatically
 2014-10-24 22:04:20 +08:00
CocosRobot 0ef3887497 [AUTO]: updating luabinding automatically 2014-10-24 13:55:25 +00:00
minggo ab365b9498 Merge pull request #8892 from dumganhar/rm-uthash 
Removes uthash in CCGLProgram,uses std::unordered_map instead
 2014-10-24 21:50:47 +08:00
minggo a2eeea1d87 Merge pull request #8920 from super626/fixsprite 
Fix sprite
 2014-10-24 21:48:30 +08:00
teivaz bfe83e5624 * [WP8] Enabled GLProgramState restoring on render recreated 2014-10-24 16:00:08 +03:00
Dale Stammen fa6b70cbb8 disabled xaml functions for WP8 2014-10-24 05:59:59 -07:00
Timothy Zhang 0fb584ad92 release old program with the same key before adding glprogram 2014-10-24 18:31:00 +08:00
Liam 92bdfea638 update ui button size changed logic 2014-10-24 17:38:32 +08:00
yangxiao 4d08a08809 add getMeshCount method 2014-10-24 15:57:47 +08:00
yangxiao f878533f85 load attached sprite from cache 2014-10-24 15:52:24 +08:00
XiaoYang 01e2d62e90 Merge pull request #149 from lvlonggame/v3 
Fix bug: load sprite3D from cache, the attach node will be discarded.
 2014-10-24 15:43:37 +08:00
yangxiao 7cf5b50790 add getMeshCount method 2014-10-24 15:24:36 +08:00
Dale Stammen 6fcd0ebafd don't hide flyout when keyboard is hidden 2014-10-23 22:23:42 -07:00
Dale Stammen 5df4278e36 fixed reentrancy when closing flyout 2014-10-23 22:17:25 -07:00
Dale Stammen b77e7a5a97 fixed reentrancy when closing flyout 2014-10-23 22:01:35 -07:00
Ahlwong 012683bf6e Fix kerning on signle characters 2014-10-23 21:18:51 -07:00
James Chen 603700179e closed #8843: Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points. 2014-10-24 12:03:11 +08:00
lvlong 799f375802 Fix bug: load sprite3D from cache, the attach node will be discarded. 2014-10-24 12:02:55 +08:00
Dale Stammen afa052c5c7 added critical section 2014-10-23 20:49:10 -07:00
Dale Stammen f42afaa6bb updated project files with new pch files 2014-10-23 19:40:57 -07:00
Dale Stammen 6e92d169cd changed implementation to use xaml flyout for editbox 2014-10-23 19:30:32 -07:00
Dale Stammen c82a75d4f7 added xaml support functions 2014-10-23 19:29:38 -07:00
Dale Stammen 2ddb692628 added flyout xaml to support uieditbox on winrt 2014-10-23 19:29:18 -07:00
Dale Stammen 96054e9c29 updated headers for change in pch.h 2014-10-23 19:28:53 -07:00
Dale Stammen b6329c6c7b added correct options to compile c file 2014-10-23 13:27:24 -07:00
Dale Stammen b520e80e04 updated 2d and base file locations 2014-10-23 09:03:35 -07:00
Dale Stammen 0af2f30d61 fixed WP8_SHADER_COMPILER checks 2014-10-23 08:40:34 -07:00
Dale Stammen a4294c07c1 added check for WP8_SHADER_COMPILER 2014-10-23 08:32:31 -07:00
Dale Stammen d2f852c3cb added editbox support for universal apps 2014-10-23 07:39:38 -07:00
Dale Stammen b5fdf892b2 added text input from keyboard support for winrt 2014-10-23 07:38:46 -07:00
Dale Stammen cc3b784dd1 added windows 8.1 platform support files 2014-10-23 07:38:04 -07:00
Dale Stammen a4f13a91ab added CC_NO_GL_POINTSIZE preprocessor define 2014-10-23 07:36:23 -07:00
Dale Stammen 89d3d7b7cf added missing cocos2d files 2014-10-23 07:29:57 -07:00
Dale Stammen 9b2adef6b2 added CC_PLATFORM_WINRT 2014-10-23 07:15:58 -07:00
Dale Stammen c0ebee6bc7 gl_PointSize currently not support for Windows Phone 8.1 in new version of ANGLE 2014-10-23 07:15:22 -07:00
Dale Stammen 14568361aa gl_PointSize currently not support for Windows Phone 8.1 in new version of ANGLE 2014-10-23 07:14:58 -07:00
Dale Stammen 01fbcfcd31 Windows 8.1 ANGLE reguires vert and frag shaders to use same precision 2014-10-23 07:13:38 -07:00
Dale Stammen 1112cad792 remove PhoneDirect3DXamlAppComponent namesapce refactor 2014-10-23 07:12:51 -07:00
Dale Stammen 3d16bbc6b9 added UIEditBoxEvent. namespace refactor 2014-10-23 07:09:03 -07:00
Dale Stammen b20015f845 updated for Universal App support 2014-10-23 07:07:58 -07:00
Dale Stammen 06913670dc use device orientation for acceleration values 2014-10-23 07:04:13 -07:00
Dale Stammen 8af672c588 moved messagebox code to winrt cceglview to handle threading issues 2014-10-23 07:03:41 -07:00
Dale Stammen bf9843a905 removed CMakeLists.txt 2014-10-23 07:02:36 -07:00
Dale Stammen 38d5be5082 no mp3 for winrt 2014-10-23 07:01:53 -07:00
Dale Stammen 00f9e888d2 enable console for winrt 2014-10-23 07:01:04 -07:00
Dale Stammen 753bc5034a removed winrt/wp8 code. no longer needed 2014-10-23 06:59:09 -07:00
Mircea Rila 3d276db6d2 fix some warnings / remove TABs 2014-10-23 12:54:15 +03:00
kaile.yin 0f184a4982 add arriving last frame event 2014-10-23 17:38:04 +08:00
kaile.yin e7de544231 1.fixed frame event may forword emit 2014-10-23 17:37:18 +08:00
James Chen dd6bb0b3eb Uses reference in for loop inside ccvector_std_string_to_luaval 2014-10-23 10:18:09 +08:00
Dhilan007 20d372b356 Fixed Label shifting when outline feature enabled 2014-10-22 14:34:01 +08:00
yangxiao 1a5ab908fd Merge branch 'newcode' into v3 2014-10-21 19:31:15 +08:00