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

10655 Commits

Author SHA1 Message Date
子龙山人 cdf6fa8a54 Merge pull request #14052 from neokim/fix_listview_center_magnetic_issue 
Fix an issue that list view's Magnetic::CENTER is not working well when non-bounceable.
 2015-10-09 08:27:18 +08:00
pandamicro 4b66caaed8 Merge pull request #14084 from super626/v3 
correct spot light init value
 2015-10-08 17:15:03 +08:00
geron-cn 6b9890472b fix code error, redundant interface 2015-10-08 14:14:49 +08:00
pandamicro f730a38db6 Merge pull request #14086 from CocosRobot/update_lua_bindings_1444275958 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-10-08 11:51:04 +08:00
pandamicro 2d73bbd9d4 Merge pull request #14056 from Dimon4eg/fix-crash-if-csb-file-is-missing 
fix crash if csb file is broken
 2015-10-08 11:50:40 +08:00
CocosRobot 1919d1a679 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-10-08 03:50:33 +00:00
zilongshanren 7fd2ad7548 remove unneeded final temp string 2015-10-08 11:47:11 +08:00
pandamicro a68d07b968 Merge pull request #14075 from TheCodez/getname_byref 
Node::getName() now returns string by reference
 2015-10-08 11:43:03 +08:00
yangxiao d6eb1b938f correct spot light init value 2015-10-08 11:27:02 +08:00
pandamicro 5c816b5d9b Merge pull request #14063 from kammy/improve_spriteframecache 
Inprove SpriteFrameCache::addSpriteFramesWithDictionary
 2015-10-08 11:23:21 +08:00
pandamicro e32e8b95a4 Merge pull request #14055 from Dimon4eg/fix-crash-in-LoadingBar 
fix crash in LoadingBar
 2015-10-08 11:22:43 +08:00
pandamicro 2dbe0c1a90 Merge pull request #14016 from xiaofeng11/v3 
Fix quickly click mouse in "41:Node:Physics -> 6:joints" in cpp-test may cause program crash
 2015-10-08 11:12:36 +08:00
pandamicro c787e2c1b0 Merge pull request #14073 from mogemimi/fix-compiler-warning 
Fix -Wformat-security warning on Xcode
 2015-10-08 11:01:15 +08:00
pandamicro 255edd5b46 Merge pull request #14079 from ZeroHackeR/v3 
Fixing SocketIO - Connect failed after Disconnected
 2015-10-08 10:46:40 +08:00
pandamicro 6bafb2f6c2 Merge pull request #14082 from pandamicro/v3 
Fix simulator android x86 release compilation issue
 2015-10-08 10:43:35 +08:00
pandamicro 57ac40b9bc Fix simulator android x86 release compilation issue 2015-10-08 09:46:50 +08:00
Nikita 0042f9f5cd Fixed background size if scale9 enabled in Layout 
Fixes for issue: cocos2d#14001
 2015-10-06 16:14:47 +03:00
ZeroHackeR 4cfe139991 Fixing SocketIO - Connect failed after Disconnected 
Fixes for issue: https://github.com/cocos2d/cocos2d-x/issues/14077
 2015-10-06 13:21:22 +06:30
TheCodez eb747cf808 Node::getName() returns string by reference 2015-10-05 21:42:07 +02:00
mogemimi 8c04c01953 Fix -Wformat-security warning on Xcode 2015-10-05 19:53:03 +09:00
Dale Stammen 49e8abbc58 added #if _MSC_VER < 1900 2015-10-04 09:32:48 -07:00
pandamicro b38eec4d47 Merge pull request #13999 from igorzel/FixIntegerOverflowInIosDevice 
Fix crash (integer overflow) in Device::getTextureDataForText (ios)
 2015-10-04 11:00:07 +08:00
pandamicro 1e298a2c1a Merge pull request #14064 from MSOpenTech/v3-win10-fix 
V3: fixed Windows 10 UWP app manifest by correcting image asset paths
 2015-10-04 10:53:52 +08:00
Dale Stammen 32eeb560c3 clean up include files for WINRT platforms 2015-10-02 18:49:41 -07:00
Dale Stammen 548fc94eb8 added missing std includes 2015-10-02 18:17:11 -07:00
Dale Stammen 27f2397142 undefine ABSOLUTE for CC_PLATFORM_WINRT 2015-10-02 18:04:31 -07:00
KURA Shuichi 0469632cf8 Inprove addSpriteFramesWithDictionary 
- Moved initialization of image to an appropriate
  location, because it always called twice in
  SpriteFrameCache::addSpriteFramesWithFile()
 2015-10-03 03:18:07 +09:00
mogemimi 9f768bc1ab Add missing override keyword 2015-10-02 18:18:23 +09:00
dimon4eg 168b295b2e fix crash if csb file is missing 2015-09-30 14:44:30 +03:00
dimon4eg ec20b48775 fix crash in LoadingBar 2015-09-30 13:04:13 +03:00
Neo Kim 423cbb83a9 Fix an issue that list view's Magnetic::CENTER is not working well around boundaries if it is non-bounceable. 2015-09-30 16:55:48 +09:00
Liam 8368762b37 update for light3D 2015-09-29 18:33:28 +08:00
CocosRobot 246fa7ffd8 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-29 07:45:48 +00:00
Liam 87a406febe update for light3d reader 2015-09-29 11:27:01 +08:00
XiaoFeng 84347bb056 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-09-29 09:35:35 +08:00
Danut Chereches 8944f9e1cd removed scale factor for label shadow 2015-09-28 16:27:20 +03:00
CocosRobot b082620d85 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-27 15:24:49 +00:00
pandamicro 7b85211cfe Remove ScriptComponent 
Because windows platform can't successfully compile in previous architecture
 2015-09-27 22:18:59 +08:00
WenhaiLin f4c56e8605 Fixed compile errors 2015-09-26 19:43:36 +08:00
pandamicro 2a3526a3fd Fix lua project 2015-09-26 19:43:36 +08:00
pandamicro 91928aa23d Add ComponentJS test case and fix windows platforms 2015-09-26 19:43:36 +08:00
pandamicro ddb636a022 Add ScriptComponent and ComponentJS 2015-09-26 19:43:36 +08:00
pandamicro 7e2b8c71a7 Improve lua script component 2015-09-26 19:43:35 +08:00
minggo 26632ec69a linjia demo finish 2015-09-26 19:43:35 +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
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 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
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
CocosRobot b09b146f97 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-22 09:23:14 +00: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
pandamicro 08204ec0bd Merge pull request #13991 from MSOpenTech/v3-win10-fix 
V3 Win10 UWP fixes
 2015-09-22 02:44:45 +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 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
dimon4eg 09b5b7fcc3 Fix crash in destructor of FontFreeType 2015-09-21 18:18:58 +03:00
CocosRobot 9ef7991b99 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-21 10:43: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
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
CocosRobot 0af77fca90 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-21 08:35:18 +00:00
Neo Kim b09a0bd0e3 Add a missing parameter in comment for document. 2015-09-21 17:07:32 +09:00
pandamicro 5511d42cd4 Merge pull request #13716 from fusijie/particle_performance 
Refactory particle system update.
 2015-09-21 14:19:55 +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
pandamicro 6ab7f3804e Merge pull request #13960 from TimothyZhang/jsb-writeDataToFile 
Add jsb.fileUtils.writeDataToFile()
 2015-09-21 10:48:25 +08:00
zilongshanren 511b58a3b2 fix missing override keyword 2015-09-21 09:51:27 +08:00
pandamicro 9246d50a7f Merge pull request #13234 from perminovVS/v3-dev-check-create-window 
glfwCreateWindow not guarantee create
 2015-09-20 23:22:47 +08:00
pandamicro fa9afd6c2b Merge pull request #13953 from himynameschris/fix-socketio 
Fix socketio to work with servers v1.0+
 2015-09-20 23:15:27 +08:00
pandamicro c2214e56af Merge pull request #13954 from geron-cn/v3 
format apis added in https://github.com/cocos2d/cocos2d-x/pull/13770
 2015-09-20 17:01:41 +08:00
fusijie d871b1aa8a Refactory particle system. 2015-09-20 16:46:09 +08:00
pandamicro 44329d96ba Merge pull request #13946 from WenhaiLin/v3-binding-tool-refine 
Refine lua/js binding tool
 2015-09-20 16:42:40 +08:00
geron-cn f93cfac0f7 rename setAnimationEndCallFunc 2015-09-20 16:24:41 +08:00
zhangting caaf912a28 add writeDataToFile() for jsb 2015-09-20 15:38:15 +08:00
geron-cn 0cfc33e4d3 format apis added in https://github.com/cocos2d/cocos2d-x/pull/13770 2015-09-20 12:34:34 +08:00
Chris Hannon bd7f90f993 adds initializing value and corrects spelling of variable _endpointseparator 
Signed-off-by: Chris Hannon <chris@channon.us>
 2015-09-19 20:47:54 -04:00
Chris Hannon e7c2436d85 fixes bug in socketio extension when connecting to socketio servers v1+ (incorrect separator in v1 packet strings) 
Signed-off-by: Chris Hannon <chris@channon.us>
 2015-09-19 20:31:48 -04:00
WenhaiLin b77d04f593 Fixed link errors 2015-09-19 00:59:28 +08:00
CocosRobot c562a57030 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 16:32:43 +00:00
pandamicro 6bf54a3eda Merge pull request #13770 from geron-cn/v3 
add  Frame End Call Back and Animation Clip End Call Back
 2015-09-19 00:24:21 +08:00
CocosRobot 37cb9afb3f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 14:04:49 +00:00
pandamicro 0cbc1e5f40 Merge pull request #13923 from WenhaiLin/v3-physics-refine 
Refine components to improve physics performance
 2015-09-18 21:56:36 +08:00
pandamicro ce0166ef6e Merge pull request #13940 from CocosRobot/update_lua_bindings_1442584025 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-18 21:55:21 +08:00
pandamicro cc8e944050 Merge pull request #12220 from hanxi/v3 
add UIEditBox support linux platform
 2015-09-18 21:53:09 +08:00
CocosRobot ad65343814 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 13:51:58 +00:00
pandamicro add24ccf95 Merge pull request #13913 from fusijie/revert-12889-fix_clippingRectangle_bug 
Revert "remove CCClippingRectangleNode transform error support."
 2015-09-18 21:43:42 +08:00
pandamicro 724011f19b Merge pull request #12071 from waiter/v3 
Fix a bug in Scheduler which may case Force Close
 2015-09-18 21:39:36 +08:00
pandamicro 7ac0b861c9 Merge pull request #13905 from perminovVS/win32-remove-dir-correct-point 
FileUtilsWin32 removeDirectory correct remove file begins with point
 2015-09-18 18:14:20 +08:00