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

31953 Commits

Author SHA1 Message Date
子龙山人 271ab08b59 Merge pull request #13306 from WenhaiLin/v3.8-label-letter-flipped 
Label:Fixed letter can be flipped.
 2015-08-11 11:05:12 +08:00
子龙山人 f1c252a1a8 Merge pull request #13302 from WenhaiLin/v3.8-CocosBuilderTest-crash 
CppTests-->Extension-->CocosBuilderTest:Fixed crash on Android 5.0.x.
 2015-08-11 11:04:54 +08:00
fusijie aa1b1831e9 fix cocostudio skin setfliped. 2015-08-11 10:34:22 +08:00
子龙山人 c5477abaf0 Merge pull request #13305 from CocosRobot/update_lua_bindings_1439258043 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-08-11 10:07:02 +08:00
WenhaiLin eeb4a38715 Label:Fixed letter can be flipped. 2015-08-11 10:06:14 +08:00
CocosRobot aa6ac72405 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-11 01:58:29 +00:00
子龙山人 1f14b5895e Merge pull request #13303 from pandamicro/v3.7.1 
Fix issue described in #13284 by reorder state setting and event dispatching
 2015-08-11 09:51:06 +08:00
子龙山人 c65f09f63e Merge pull request #13296 from WenhaiLin/v3.8-label-crash-mac 
Label:Fixed crash cause by access an invalid address
 2015-08-11 07:30:38 +08:00
WenhaiLin 2deeee70d2 CppTests-->Extension-->CocosBuilderTest:Fixed crash on Android 5.0.x. 2015-08-10 22:41:18 +08:00
pandamicro 06f57600d4 Merge pull request #13294 from dabingnn/v3_fixMaterialParsingTestWP8.1 
V3 fix material parsing test wp8.1
 2015-08-10 22:30:43 +08:00
pandamicro 6bcea5baee Fix issue described in #13284 by reorder state setting and event dispatching 
The real reason of #13284 is that the `_selected` state is set after touch events dispatching.
So I decided to override `onTouchEnded` function to set the `_selected` state.
 2015-08-10 22:27:59 +08:00
pandamicro 986fd1d086 Merge pull request #13300 from jianglong0156/fixprojectTarget 
modify js-test mac device target 10.10 to 10.7
 2015-08-10 20:48:25 +08:00
pandamicro 97dbcd3c3b Merge pull request #13298 from jianglong0156/fixVibrateBugInWeb 
fix vigrate resource error, and hide the vibrateTest in web
 2015-08-10 20:46:50 +08:00
Vincent Yang d0a5c02399 fix bug: #21906 Pause/Resume 's result not correct. 2015-08-10 17:58:49 +08:00
jianglong0156 5c365f6599 modify js-test mac device target 10.10 to 10.7 2015-08-10 17:39:13 +08:00
jianglong0156 32223348cb fix vigrate resource error, and hide the vibrateTest in web 2015-08-10 17:27:28 +08:00
Vincent Yang 0d1dfbc440 Fix bug: #21861 cpp-tests->Node:Sprite->Testing Sprite BatchNode's effect not correct. 2015-08-10 17:07:46 +08:00
Wenhai Lin 2983aed0a9 Label:Fixed crash cause by access an invalid address 2015-08-10 16:50:59 +08:00
Huabing.Xu d848da0e7d change max parsing count to 5000 2015-08-10 16:41:16 +08:00
fusijie 4965a9a11c fix retro effect pos bug. 2015-08-10 16:32:24 +08:00
Huabing.Xu ea9d6e7997 refine test case to be more testing friendly 2015-08-10 16:12:15 +08:00
jianglong0156 e3f09d03b1 Merge branch 'v3' into fixJstestsReleaseError 2015-08-10 16:01:27 +08:00
Huabing.Xu b7c624805e fix material parsing crash on WP8.1 because memory exhausted 2015-08-10 15:51:26 +08:00
jianglong0156 9a46b3b3b1 fix js-tests can't use cocos run -p web -m release 2015-08-10 15:10:54 +08:00
pandamicro 940b53e271 Merge pull request #13292 from natural-law/v3 
[ci skip] Add copy resources config of js-tests for web platform.
 2015-08-10 15:09:33 +08:00
Huabing.Xu 0dee83b154 fix shader test crash 2015-08-10 14:40:54 +08:00
pandamicro 1471936c2f Merge pull request #13249 from pandamicro/v3 
Made SocketIO events correctly fired when compile in release mode
 2015-08-10 13:32:09 +08:00
pandamicro 3cc06d3f9b Merge pull request #13267 from yangws/bug_21796 
Fix bug: #21796 [Android 5.0][Cpp-Tests] Node::Scene3D menu unusable.
 2015-08-10 12:40:32 +08:00
zhangbin f91908d651 Add copy resources config of js-tests for web platform. 2015-08-10 12:00:53 +08:00
pandamicro f4440f5613 Merge pull request #13229 from fusijie/fix_13228 
Fixed SpriteBatchNode setFlipped bug.
 2015-08-10 11:53:30 +08:00
pandamicro acc5754f5e Merge pull request #13269 from WenhaiLin/v3.8-audioengine-addtestcase 
Add test case for issue 11143.
 2015-08-10 11:39:53 +08:00
子龙山人 b54b6826a8 Merge pull request #13289 from pandamicro/v3.7.1 
Synchronize enable state and bright state for Widget
 2015-08-10 09:33:41 +08:00
pandamicro c54a204bad Synchronize enable state and bright state for Widget 
Fix issue: https://github.com/cocos2d/cocos2d-x/issues/8137
 2015-08-10 07:42:35 +08:00
子龙山人 2aa5051137 Merge pull request #13284 from pandamicro/v3.7.1 
Fix CheckBox cross renderer state not updated correctly
 2015-08-09 21:25:06 +08:00
pandamicro 1f52f0971a Fix CheckBox cross renderer state not updated correctly 
Issue description: When checkbox checked, its renderer adaptation may not be updated.

Reported http://punchbox.info:3000/issues/21630
 2015-08-09 20:57:37 +08:00
子龙山人 af6043f76e Merge pull request #13286 from CocosRobot/update_cocosfiles_1439087229 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-08-09 10:34:35 +08:00
子龙山人 2ed2557cb8 Merge pull request #13287 from CocosRobot/update_lua_bindings_1439087314 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-08-09 10:34:14 +08:00
CocosRobot 8c76a194fa [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-09 02:32:59 +00:00
CocosRobot a26fdd0ff3 [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-09 02:27:11 +00:00
子龙山人 f6569f24f4 Merge pull request #13273 from zilongshanren/android-editbox-reimplement-fix 
Re-implement Editbox on Android platform.
 2015-08-09 10:25:19 +08:00
pandamicro e825160750 Merge pull request #13266 from super626/fixtest 
Fix Sprite3D test background to foreground bug
 2015-08-08 19:44:41 +08:00
pandamicro 99e1e00a5b Merge pull request #13268 from dabingnn/v3_fixCrashOnAndroid 
fix engine crash because of wrong initialisation on some android device
 2015-08-08 19:43:10 +08:00
pandamicro 395b6cb91f Merge pull request #13263 from super626/v3 
avoid to trigger touch event multiple times
 2015-08-08 17:58:41 +08:00
pandamicro 6644b06643 Merge pull request #13271 from WenhaiLin/v3.8-minorproblem-fix 
Fixed minor problems in test cases.
 2015-08-08 12:04:30 +08:00
pandamicro 8e5338040e Merge pull request #13280 from CocosRobot/update_lua_bindings_1438987793 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-08-08 12:00:17 +08:00
pandamicro c6e86a707a Merge pull request #13283 from pandamicro/ccs-3d 
[ci skip]Fix cocostudio 3d test crash on mobile platform
 2015-08-08 11:59:12 +08:00
肖峰 4575587cf7 Fix cocostudio 3d test crash on mobile platform 2015-08-08 11:57:40 +08:00
CocosRobot eb9d1ea205 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-07 22:55:48 +00:00
Ricardo Quesada 0cbd71fd11 Merge pull request #13279 from ricardoquesada/xcode7_fixes 
compiles on xcode7
 2015-08-07 15:46:06 -07:00
Ricardo Quesada 789da4edd8 compiles on xcode7 2015-08-07 14:00:18 -07:00