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

8738 Commits

Author SHA1 Message Date
minggo 701d5fa827 Merge pull request #11673 from vovkasm/dev/v3-cleanup 
Fix warnings in v3.
 2015-05-05 11:26:10 +08:00
minggo 5a7cf31663 Merge pull request #11682 from CocosRobot/update_lua_bindings_1430789665 
[AUTO]: updating luabinding automatically
 2015-05-05 11:17:06 +08:00
zhangbin 23ed3dbe4c Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-05-05 10:53:04 +08:00
zhangbin b4f2d94109 Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
minggo e75936b778 Merge pull request #11669 from samuele3hu/v3.7 
Update cocos2dx_3d.ini and cocos2dx.ini for generating Lua bindings code to support CC_CONSTRUCTOR_ACCESS  equal to public
 2015-05-05 09:37:56 +08:00
CocosRobot 4414536612 [AUTO]: updating luabinding automatically 2015-05-05 01:36:54 +00:00
minggo 564918c604 Merge pull request #11659 from WenhaiLin/v3.7 
Label:Fixed crash.
 2015-05-05 09:30:54 +08:00
WenhaiLin 26c9be7881 Add FileUtils::getSuitableFOpen[window-universal] 2015-05-04 16:06:04 +08:00
WenhaiLin 1839564fbb Merge branch 'v3-dev-get-suitable-f-open' of https://github.com/perminovVS/cocos2d-x into v3.7 2015-05-04 10:16:47 +08:00
WenhaiLin 004cb5464e Fixed crash 2015-05-03 22:15:58 +08:00
Vladimir Timofeev fd3e44b72b Fix warning in the ClippingNode class. Do not define the setProgram(Node*,GLProgram*) helper function on 'non OpenGL ES' platforms. 2015-05-01 12:36:19 +03:00
Vladimir Timofeev 912956a3b3 Correct field initialization order in spine (Xcode warnings). 2015-05-01 12:20:11 +03:00
Vladimir Timofeev 0aecc15a25 Correct field initialization order in various places (Xcode warnings) 2015-05-01 12:19:30 +03:00
Vladimir Timofeev 2d8c687d6e Fix the Frame class: 
* Field initialization order (warning in Xcode)
* Make conditions with && and || more readable for programmers (warning in Xcode)
 2015-05-01 11:51:20 +03:00
Vladimir Timofeev ad494a7131 Make a UserDefault destructor to be virtual. 
Because the UserDefault has virtual functions and allow programmers to inherit from, it must have a virtual destructor to allow a child object to destroy correctly.
 2015-05-01 11:45:47 +03:00
samuele3hu f4b57511b0 Update cocos2dx_3d.ini and cocos2dx.ini for generating Lua bindings code to support CC_CONSTRUCTOR_ACCESS equal to public 2015-04-30 17:18:12 +08:00
WenhaiLin 7472bafee3 Label:When you invoking `getLetter(letterIndex)` and `setString(text)` in sequence, and `letterIndex` greater than the length of `text`, it might crash your program. 2015-04-30 15:13:41 +08:00
CocosRobot 2b916b3b80 [AUTO]: updating luabinding automatically 2015-04-30 06:56:36 +00:00
minggo 4acd231f89 merge v3.6 2015-04-30 13:46:08 +08:00
minggo 79a6f2f510 Merge pull request #11652 from MSOpenTech/v3.6-winrt-fix 
V3.6 Windows Phone 8.1 fix for issues 11606 and 11607
 2015-04-30 09:41:52 +08:00
Dale Stammen 904abeab87 added CC_WINDOWS_PHONE_8_1 to preprocessor defines 2015-04-29 09:48:14 -07:00
Dale Stammen f64012d77b special shaders for Windows Phone 8.1 with no gl_PointSprite 2015-04-29 09:47:44 -07:00
WenhaiLin 1950498b0a Replace tab with space. 2015-04-29 18:41:10 +08:00
WenhaiLin 8f3566add9 Merge branch 'v3.6' of https://github.com/WenhaiLin/cocos2d-x into v3.6 2015-04-29 18:37:18 +08:00
Wenhai Lin 1d9ff11837 VideoPlayer:Fixed can't play video on Android 2.3.x 2015-04-29 18:32:59 +08:00
minggo 9586cdf2c8 Merge pull request #11650 from xiaofeng11/v3.6 
Fix a logical bug that may cause null pointer been used
 2015-04-29 16:21:17 +08:00
XiaoFeng 9d0741544c Fix a logical bug that may cause null pointer been used 2015-04-29 15:58:44 +08:00
minggo d768c8c5f4 Merge pull request #11645 from xiaofeng11/v3.6 
Fix wrong shadow & outline color bug for text component
 2015-04-29 14:16:26 +08:00
XiaoFeng 49b465f0f4 Fix wrong shadow & outline color bug for text component 2015-04-29 10:46:23 +08:00
minggo d0cf310a0b Merge pull request #11643 from super626/v3.6 
missing texture color
 2015-04-29 10:33:32 +08:00
yangxiao 59988fdcc0 missing texture color 2015-04-29 10:30:18 +08:00
minggo 37c9a9cb98 Merge pull request #11636 from super626/v3.6 
fix bug some 3d sprite crash when texture missing on release mode
 2015-04-29 09:35:37 +08:00
yangxiao e424cb4777 fix bug some 3d sprite crash when texture missing on release mode 2015-04-28 23:55:23 +08:00
minggo 21987592d2 Merge pull request #11632 from WenhaiLin/v3.6 
Fixed warns and crash on Win32.
 2015-04-28 21:18:42 +08:00
CocosRobot 1f02af4a94 [AUTO]: updating luabinding automatically 2015-04-28 12:21:56 +00:00
minggo 48729b653f Merge pull request #11630 from samuele3hu/v3.6_test1 
Add Lua-bindings for SpritePolygon and related test case
 2015-04-28 20:13:52 +08:00
WenhaiLin ce7e36f76e Fixed warns and crash on Win32. 2015-04-28 20:10:56 +08:00
samuele3hu 5819159889 Add Lua-bindings for SpritePolygon and related test case 2015-04-28 18:19:57 +08:00
minggo 85e58dce55 Merge pull request #11598 from HueyPark/v3.6 
Fix android http client memory leak
 2015-04-28 16:38:21 +08:00
minggo 164cf78844 Merge pull request #11620 from WenhaiLin/v3.6 
Fixed compile error on VS 2012.
 2015-04-28 13:36:16 +08:00
minggo 692ed1e4ad Merge pull request #11625 from xiaofeng11/v3.6 
Fix simulator crash when miss some armature resource
 2015-04-28 13:34:32 +08:00
XiaoFeng 27e3dce628 Fix simulator crash when miss some armature resource 2015-04-28 11:54:36 +08:00
samuele3hu 2a59180da3 Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6_test1 2015-04-28 11:30:01 +08:00
samuele3hu c801d1868c Update Sprite3DTest and VideoPlayerTest about Lua 2015-04-28 11:27:50 +08:00
andyque 854fcdf2bf fix spritepolygon 2015-04-28 11:26:21 +08:00
andyque a6a2dddfe9 fix spritepolygon 2015-04-28 10:51:26 +08:00
WenhaiLin 41e2d84116 Fixed compile error on VS 2012. 2015-04-28 10:35:21 +08:00
minggo 99482d4e48 Merge pull request #11614 from xiaofeng11/v3.6 
Fix simulator crash when add animation under a user defined lua extension
 2015-04-28 09:45:44 +08:00
minggo a32a1029f5 Merge pull request #11617 from lvlonggame/v3 
fix bug: set sprite name
 2015-04-28 09:35:04 +08:00
minggo ce9f40fb9a Merge pull request #11619 from samuele3hu/v3.6_test1 
Fix the bugs about cubeMap & Skybox lua test case and update the Android.mk about SpritePolygon
 2015-04-28 09:32:30 +08:00