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

33933 Commits

Author SHA1 Message Date
minggo 85c297f53b temple save 2015-09-26 19:43:35 +08:00
minggo 10427fb7ae add lua component 2015-09-26 19:43:35 +08:00
pandamicro 72483eb75c Merge pull request #14015 from CocosRobot/update_lua_bindings_1443170285 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-25 22:50:47 +08:00
zhangbin 6697cad212 Solve the crash of performance-tests on windows. 2015-09-25 18:23:13 +08:00
XiaoFeng 47d9a59b41 Fix quickly click mouse in "41:Node:Physics -> 6:joints" in cpp-test may cause program crash. 2015-09-25 18:12:16 +08:00
CocosRobot c135587962 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-25 08:43:00 +00:00
pandamicro 970300c3e2 Merge pull request #14012 from jianglong0156/customSpine 
add custom spine skeletonAnimation test
 2015-09-25 16:34:57 +08:00
pandamicro c05e4fe5c9 Merge pull request #14014 from yangws/v3 
Fix bug: FileUtils::GetFileSize can't treat multi-char path.
 2015-09-25 16:32:42 +08:00
Vincent Yang 5c0d6691ca Fix bug: FileUtils::GetFileSize can't treat multi-char path. 2015-09-25 14:50:20 +08:00
江龙 9eb05707fb add custom spine skeletonAnimation test 2015-09-25 13:36:48 +08:00
pandamicro e16404c280 Merge pull request #14008 from thuydx55/fix_android_compile_script_load_pluginx 
Fix loading pluginx lib when compile Android with --compile-script flag
 2015-09-24 14:08:46 +08:00
pandamicro 718f5c7b88 Merge pull request #14006 from CocosRobot/update_cocosfiles_1443058624 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-09-24 14:07:52 +08:00
pandamicro d82906d5ff Merge pull request #14007 from ZhangMenghe/v3-buttonOpacity 
[ci skip] button Opacity setting testcase
 2015-09-24 14:07:04 +08:00
pandamicro 95379c5dc2 Merge pull request #13995 from xiaofeng11/v3 
Fix issue http://punchbox.info:3000/issues/23146
 2015-09-24 13:03:59 +08:00
Nick 003920f826 fix loading pluginx when compile Android with --compile-script flag 2015-09-24 11:41:18 +07:00
ZhangMenghe 03e5573f79 button Opacity setting 2015-09-24 11:13:41 +08:00
CocosRobot 28d1bd1d70 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-24 01:37:06 +00:00
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