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

30686 Commits

Author SHA1 Message Date
WenhaiLin fbe1bd8253 Label should be invisible when the line height is set to zero. 2015-06-23 09:42:48 +08:00
Dale Stammen 0a5581b534 Merge branch 'v3' into v3-winrt-audio 2015-06-22 08:24:08 -07:00
samuele3hu 683c5b4cb2 Fix the LabeLTestNew error. 2015-06-22 22:32:21 +08:00
Neo Kim ff5dbd5a52 Merge branch 'feature/elastic_inertia_scroll' into feature/elastic_scrollview 
Apply elastic movement to inertia scroll
 2015-06-22 14:50:12 +09:00
Neo Kim 9757be0f81 Remove debugging logs 2015-06-22 14:49:30 +09:00
Neo Kim 71c98da2aa Apply ease out action on inertia scroll 2015-06-22 14:30:45 +09:00
Neo Kim c4fa99444c Simplify the inertia scroll implementation 2015-06-22 14:30:36 +09:00
Neo Kim c70c923674 Separate the inertia scroll from auto scroll. And implement auto scroll and bounce back as one logic. The bounce back movement is one of auto scroll feature. 2015-06-22 14:30:30 +09:00
Neo Kim 4cb4bf27c5 Merge branch 'feature/apply_new_bounce_back' into feature/elastic_scrollview 
Apply the new bounce back which is iOS-like.
 2015-06-22 14:28:55 +09:00
Neo Kim 7422b20da9 Refactor some functions 2015-06-22 14:27:19 +09:00
Neo Kim 85fc5b3f89 Change to comply to Cocos2d-x convention 2015-06-22 14:27:11 +09:00
Neo Kim 6c212a7ddb Replace the existing bounce back feature with another one like iOS bounce-back. The inner container moves smoother when bouncing back. 
It does what the existing code did including scroll event dispatching and attenuating.
 2015-06-22 14:27:00 +09:00
Neo Kim 1058ab9172 Add necessary member variables and methods 2015-06-22 14:26:51 +09:00
Neo Kim 98d5731efc Merge branch 'feature/remove_redundant_logics' into feature/elastic_scrollview 
Refactor existing scroll logic before add more features. Some redundant codes are removed.
 2015-06-22 14:23:59 +09:00
Neo Kim a8f77710f5 Refactor some functions and remove redundant codes 2015-06-22 14:10:25 +09:00
Neo Kim 876c94f352 Remove the boundary of bouncing and apply half-movement when out of boundary like iOS bounce back. 2015-06-22 14:05:53 +09:00
Neo Kim ff3f990142 Add isOutOfBoundary() functions 2015-06-22 14:05:53 +09:00
Neo Kim c3c6eeb6c1 Refactor some functions 2015-06-22 14:05:52 +09:00
pandamicro 0f5c343e1e Merge pull request #12460 from MSOpenTech/v3-winrt-readme 
Added Windows 10.0 UWP info to Readme
 2015-06-22 13:05:51 +08:00
Neo Kim a3ff9573b0 Remove duplicated logic in bounceScrollChildren() 2015-06-22 14:05:51 +09:00
Neo Kim 1971b01280 Make the event dispatch functions into one function after removing duplicated logic. 2015-06-22 14:05:50 +09:00
Neo Kim 31bf9f714d Merge bouncing and non-bouncing logics as one. 2015-06-22 14:05:50 +09:00
Neo Kim 6a0609a687 Merge the logics for bouncing of VERTICAL, HORIZONTAL and BOTH in one function. VERTICAL and HORIZONTAL can be processed as BOTH. 2015-06-22 14:05:49 +09:00
Neo Kim 368b5e8f12 Remove duplicated logics in scrollChildrenBoth(), and extract meaningful logic into separate functions. 2015-06-22 14:05:49 +09:00
pandamicro b1e24ee8f2 Merge pull request #12455 from natural-law/v3 
Solve the error when build tests projects with cocos command on win32.
 2015-06-22 13:04:17 +08:00
samuele3hu bc964c96da Fix the error about the Camera3D Test 2015-06-22 09:28:18 +08:00
samuele3hu 0181a84883 Fix the bugs about the particle3DTest 2015-06-22 09:27:34 +08:00
pandamicro d59db14370 Merge pull request #12462 from WenhaiLin/v3-UIRichTextTest-fix 
[ci skip]UIRichTextTest:Fixed text don't render properly in the Windows 8.1 Store App.
 2015-06-21 09:55:38 +08:00
WenhaiLin 6bd46fcfcc [ci skip]UIRichTextTest:Fixed text don't render properly in the Windows 8.1 Store App. 2015-06-20 17:07:11 +08:00
Anniruddh 4a15d57093 Fixed issue #168 2015-06-20 00:20:15 -07:00
Dale Stammen a052af355a Merge branch 'v3-winrt-readme' of github.com:MSOpenTech/cocos2d-x into v3-winrt-readme 2015-06-19 09:24:22 -07:00
Dale Stammen d438bd6f49 added app name to 150x150 windows tile 2015-06-19 09:23:50 -07:00
Dale Stammen a1bc973e6d Added Windows 10.0 UWP info 2015-06-19 09:08:57 -07:00
yangxiao d252250968 quaternion instead of euler angle 2015-06-19 18:46:14 +08:00
Bin Zhang 85fe9e8816 Solve the error when build tests projects with cocos command on win32. 2015-06-19 18:32:32 +08:00
子龙山人 e0ea8a460a Merge pull request #12454 from andyque/improve-samsung-api-docs 
[ci skip]add more docs for samsung enhanced API
 2015-06-19 18:11:15 +08:00
andyque 55b86b2e14 add more docs for samsung enhanced API 2015-06-19 18:09:42 +08:00
pandamicro 77fefbfd16 Merge pull request #12453 from CocosRobot/update_lua_bindings_1434707583 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-19 18:05:28 +08:00
CocosRobot c635881257 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-19 09:59:19 +00:00
pandamicro f75809f913 Merge pull request #12452 from natural-law/framework 
[ci skip] Solve the error in the scripts of modify templates for framework.
 2015-06-19 17:48:48 +08:00
Bin Zhang 53ca264eff Solve the error in the scripts of modify templates for framework. 2015-06-19 17:43:06 +08:00
子龙山人 8e1a70fffd Merge pull request #12450 from CocosRobot/update_cocosfiles_1434705879 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-19 17:33:01 +08:00
CocosRobot 7486c74209 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-19 09:24:40 +00:00
子龙山人 8ca0f18575 Merge pull request #12446 from pandamicro/v3 
Add auto bindings for navmesh
 2015-06-19 17:21:00 +08:00
子龙山人 776dd1dd09 Merge pull request #12449 from WenhaiLin/v3-37-resoucesfix 
[ci skip]Fixed resources.
 2015-06-19 16:30:05 +08:00
WenhaiLin 45de0b650a [ci skip]Fixed resources. 2015-06-19 16:26:03 +08:00
子龙山人 869e3c5243 Merge pull request #12444 from WenhaiLin/v3-37-label-linewrapfix 
Label:Fixed line wrap error without space.
 2015-06-19 15:08:13 +08:00
pandamicro 7b1694bfeb Merge pull request #12443 from VisualSJ/v3-aa 
[ci skip]Studio parser: Code for defense
 2015-06-19 14:24:39 +08:00
pandamicro 8afba07820 Merge pull request #12445 from natural-law/framework 
[ci skip] Optimize the implementation of framework-compile scripts.
 2015-06-19 13:48:11 +08:00
Bin Zhang 146b99fda8 Support build VS project with VS2013 & VS2015. 2015-06-19 13:42:48 +08:00