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

34016 Commits

Author SHA1 Message Date
pandamicro 149775ea10 Merge pull request #13962 from ZhangMenghe/v3-scrollView 
[ci skip] Testcase for multiple items in scrollView
 2015-09-24 09:35:05 +08:00
XiaoFeng 6db2cd7b9c Fix issue : http://punchbox.info:3000/issues/23182 
When time scale set to negative value, it will cause emitCounter been set to negative value and cause render crash
 2015-09-23 18:37:12 +08:00
zilongshanren bee52e378d fix ui::WebView callback operate OpenGL issue. 
All the OpenGL operations should be in OpenGL thread.
This PR wraps the callbacks in OpenGL thread.
 2015-09-23 11:22:36 +08:00
XiaoFeng f5c88c32af Fix click slider bar but not drag ball, after slider position changed won't send percentChangedEvent 2015-09-23 10:55:01 +08:00
igorzel 40a6789765 Fixed integer overflow in Device::getTextureDataForText (in CCDevice-ios.mm) 
There was the problem when “height” and “width” were typecast to short
integer. So for values more than sizeof(short) we had integer overflow.

Steps to reproduce:
Create simple application with EditBox. Start it. Add 1000 (just
example) characters at a time to the EditBox. Method
Device::getTextureDataForText will be called and there will be integer
overflow for “height” and “width”. As a result application will crash
later.
 2015-09-22 13:25:43 +03:00
pandamicro 2560b5fc6f Merge pull request #13997 from CocosRobot/update_lua_bindings_1442913386 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-22 17:23:35 +08:00
CocosRobot b09b146f97 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-22 09:23:14 +00:00
pandamicro 41df5a7886 Merge pull request #13996 from KAlO2/v3 
fix typos
 2015-09-22 17:11:46 +08:00
Martin Taylor 62e36e8006 fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
XiaoFeng 573f5868ca Fix issue http://punchbox.info:3000/issues/23146 2015-09-22 14:52:16 +08:00
Martin Taylor 0ca45cf522 Merge pull request #1 from cocos2d/v3 
Update from original
 2015-09-22 14:01:00 +08:00
pandamicro 08204ec0bd Merge pull request #13991 from MSOpenTech/v3-win10-fix 
V3 Win10 UWP fixes
 2015-09-22 02:44:45 +08:00
pandamicro 53efc58f0e Merge pull request #13992 from pandamicro/v3 
[ci skip]Update versions and html5 engine
 2015-09-22 02:43:44 +08:00
pandamicro d3504a9216 Update versions and html5 engine 2015-09-22 02:31:21 +08:00
Dale Stammen 6a5db06115 added missing CCMotionStreak3D files. Re-added all Physics and 3D files to project 2015-09-21 11:11:34 -07:00
pandamicro b54a06a55e Merge pull request #13987 from Dimon4eg/Fix-crash-in-FontFreeType 
Fix crash in destructor of FontFreeType
 2015-09-22 01:59:34 +08:00
pandamicro deacab9222 Merge pull request #13990 from MSOpenTech/v3-win10-fix 
V3 Win10 UWP fixes
 2015-09-22 01:57:53 +08:00
pandamicro 49f6a863ea Merge pull request #13966 from zilongshanren/fix-xcode7-override-issue 
CCScrollView should override removeChild
 2015-09-22 01:53:37 +08:00
pandamicro eec67ea13b Merge pull request #13975 from zilongshanren/fixIssue11259 
don't change Text's dimension when label scale.
 2015-09-22 01:49:20 +08:00
Dale Stammen 70e157a44a removed CCComponentPhysics2d from Win10 UWP project 2015-09-21 10:44:30 -07:00
pandamicro 7fcea1ccaf Merge pull request #13976 from lsybblll/lsybblll-patch-1 
Update CCPhysics3DComponent.cpp
 2015-09-22 01:44:03 +08:00
Dale Stammen d5151952bb fixed compiler warning 2015-09-21 10:43:28 -07:00
pandamicro e0e0ae39ab Merge pull request #13985 from slackmoehrle/patch-1 
CONTRIBUTE link was wrong on line 286
 2015-09-22 01:41:56 +08:00
dimon4eg 09b5b7fcc3 Fix crash in destructor of FontFreeType 2015-09-21 18:18:58 +03:00
slackmoehrle 7f888c6e9e CONTRIBUTE link was wrong on line 286 
CONTRIBUTE link was wrong on line 286, fixed.
 2015-09-21 10:30:37 -04:00
pandamicro b45beed52a Merge pull request #13980 from yangws/v3 
Fix js-template-default compile error.
 2015-09-21 19:33:02 +08:00
Vincent Yang fa6e6f8074 Fix js-template-default compile error. 2015-09-21 19:28:16 +08:00
pandamicro 1fba3663e5 Merge pull request #13979 from CocosRobot/update_lua_bindings_1442831966 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-21 18:52:34 +08:00
pandamicro 8e46b59b74 Merge pull request #13978 from CocosRobot/update_cocosfiles_1442831878 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-09-21 18:52:12 +08:00
CocosRobot 9ef7991b99 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-21 10:43:59 +00:00
CocosRobot 2aa835536f [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-21 10:37:59 +00:00
子龙山人 f2190c79b9 Merge pull request #13835 from neokim/add_jump_to_item_to_listview 
Add a feature of jumping to a specific item in list tview
 2015-09-21 18:36:05 +08:00
ZhangMenghe 68713d2074 Multiple items testcase 2015-09-21 18:22:58 +08:00
lsybblll 84489d322a Update CCPhysics3DComponent.cpp 
there should save old bool.
 2015-09-21 17:11:45 +08:00
zilongshanren fd8cfd8ccb don't change Text's dimension when label scale. 
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/11259
 2015-09-21 17:03:29 +08:00
子龙山人 d06a19fade Merge pull request #13974 from CocosRobot/update_lua_bindings_1442824208 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-21 16:44:38 +08:00
CocosRobot 0af77fca90 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-21 08:35:18 +00:00
pandamicro 3edff973f2 Merge pull request #13971 from WenhaiLin/v3-binding-fix 
Fixed script binding...
 2015-09-21 16:27:00 +08:00
Neo Kim b09a0bd0e3 Add a missing parameter in comment for document. 2015-09-21 17:07:32 +09:00
WenhaiLin 4241df7af7 Fixed binding... 2015-09-21 15:41:14 +08:00
pandamicro a8c4ce1589 Merge pull request #13970 from WenhaiLin/v3 
[ci skip]Fixed tools/travis-scripts/before-install.sh......
 2015-09-21 15:37:23 +08:00
WenhaiLin 2288b7e8d1 Fixed tools/travis-scripts/before-install.sh... 2015-09-21 15:22:00 +08:00
pandamicro cddd7dfdf6 Merge pull request #13965 from ZhangMenghe/v3-drawLabels 
[ci skip] DrawLabel Mode testcase
 2015-09-21 15:08:47 +08:00
pandamicro 50430a323d Merge pull request #13968 from WenhaiLin/v3 
[ci skip]Fixed tools/travis-scripts/before-install.sh
 2015-09-21 15:00:47 +08:00
WenhaiLin 460d0fd5a6 [ci skip]Fixed tools/travis-scripts/before-install.sh 2015-09-21 14:58:14 +08:00
pandamicro 5511d42cd4 Merge pull request #13716 from fusijie/particle_performance 
Refactory particle system update.
 2015-09-21 14:19:55 +08:00
pandamicro 8ae093dc58 Merge pull request #13967 from WenhaiLin/v3-travis-fix 
Fixed travis-scripts/before-install.sh
 2015-09-21 13:57:08 +08:00
WenhaiLin 1c7d4805ef Fixed travis-scripts/before-install.sh 2015-09-21 13:52:28 +08:00
zilongshanren 1c40f7b61b CCScrollView should override removeChild 
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/8396
 2015-09-21 11:35:11 +08:00
子龙山人 aa6d5e1a04 Merge pull request #13961 from zilongshanren/fix-xcode7-override-issue 
fix missing override keyword
 2015-09-21 11:34:43 +08:00