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

32733 Commits

Author SHA1 Message Date
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
ZhangMenghe 26358c9c2c DrawLabel Mode testcase 2015-09-21 11:05:21 +08:00
pandamicro 6ab7f3804e Merge pull request #13960 from TimothyZhang/jsb-writeDataToFile 
Add jsb.fileUtils.writeDataToFile()
 2015-09-21 10:48:25 +08:00
ZhangMenghe 4054686903 Testcase for multiple items in scrollView 2015-09-21 10:24:44 +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
zhangting bb8d9a4145 add testcase for writeDataToFile to jstests 2015-09-20 16:46:54 +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
pandamicro cf342a830a Merge pull request #13947 from CocosRobot/update_cocosfiles_1442593566 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-09-19 00:33:23 +08:00
pandamicro 21a8cb1849 Merge pull request #13949 from CocosRobot/update_lua_bindings_1442593660 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-09-19 00:33:02 +08:00
CocosRobot c562a57030 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-09-18 16:32:43 +00:00
pandamicro 07edc1f81d Merge pull request #13948 from pandamicro/v3 
[ci skip] Update web reference
 2015-09-19 00:27:46 +08:00
CocosRobot 50052856f2 [AUTO][ci skip]: updating cocos2dx_files.json 2015-09-18 16:26:08 +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
pandamicro 6b8d400517 Merge pull request #13804 from ZhangMenghe/v3-UItestcase 
[ci skip] UItestcase modification to be friendly
 2015-09-19 00:22:41 +08:00
WenhaiLin a3f363735e Refine lua/js binding tool 2015-09-19 00:08:15 +08:00
pandamicro 3fc1349561 Merge pull request #13945 from WenhaiLin/v3-physics-testcase-fix 
[ci skip]Lua-tests:Fixed physical test cases.
 2015-09-19 00:05:26 +08:00
WenhaiLin db102f2030 [ci skip]Lua-tests:Fixed physical test cases. 2015-09-19 00:03:21 +08:00