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

21017 Commits

Author SHA1 Message Date
samuele3hu b23e1384f6 Update the implementation of Lua bindings for `lua_cocos2dx_ListView_addScrollViewEventListener` 2014-06-23 17:42:04 +08:00
CocosRobot 6681d26540 [AUTO]: updating luabinding automatically 2014-06-23 09:37:28 +00:00
minggo 886b66f759 Merge pull request #7167 from heliclei/post-build-mail 
[ci skip] Send email notification if pull request build fail
 2014-06-23 17:30:29 +08:00
samuele3hu 9126608138 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_bug_fix 2014-06-23 17:30:24 +08:00
samuele3hu dce4c8a0a8 Add Lua bindings for `addScrollViewEventListener` of `ui.ListView` and related test cases 2014-06-23 17:29:56 +08:00
minggo 8991ff739b [ci skip] 2014-06-23 17:22:56 +08:00
minggo 7ef217ee4d Merge pull request #7168 from andyque/fixListView 
fix addEventListener hidden problem
 2014-06-23 17:20:56 +08:00
andyque 3e5ab0ec8e fix linux compile error 2014-06-23 17:09:54 +08:00
andyque dcc650a6f8 fix android compile error 2014-06-23 17:04:59 +08:00
andyque ce58c2ddd6 remove unused header file 2014-06-23 16:53:06 +08:00
minggo dc96be969f [ci skip] 2014-06-23 16:45:47 +08:00
minggo 87dd434045 Merge pull request #7170 from samuele3hu/v3SequenceCreate 
Fix the error that lua binding for create function of Sequence would lead to endless loop
 2014-06-23 16:44:05 +08:00
samuele3hu 0d7c453878 Fix the error that lua binding for create function of Sequence would lead to endless loop 2014-06-23 16:38:35 +08:00
minggo c579fbf845 Merge pull request #7169 from natural-law/v3 
Solve the error in Xcode project of lua runtime template.
 2014-06-23 16:04:06 +08:00
andyque 808c4bd763 remove unused override method 2014-06-23 15:46:07 +08:00
zhangbin dd49c4ccbc Solve the error in Xcode project of lua runtime template. 2014-06-23 15:41:58 +08:00
andyque e72d89ba2f fix windows tests compile error 2014-06-23 15:21:25 +08:00
andyque 93319f3a3b fix lua ui binding compile error 2014-06-23 14:56:41 +08:00
boyu0 c40c461848 closed #5541: add warning code and comment. 2014-06-23 13:55:52 +08:00
andyque c9bcbfb265 fix addEventListener hidden problem 2014-06-23 12:09:49 +08:00
heliclei 41c8a5e33b send email notification if build failed 2014-06-23 11:01:41 +08:00
heliclei 39ee23795e send email notification if pull request build fail 2014-06-23 10:26:36 +08:00
andyque 87455b0ecb add constness to some function 2014-06-23 10:12:54 +08:00
andyque 8a463e7964 remove Hungry style 2014-06-23 10:02:09 +08:00
andyque 5624da5448 Merge branch 'v3' into cleanupBinaryLoader 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.h
	cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
 2014-06-23 09:37:39 +08:00
Nite Luo 21330860a9 Fix NodeReader will crash when encountered unknown NodeType 2014-06-20 17:24:34 -07:00
minggo b65991bf85 Merge pull request #7162 from CocosRobot/update_cocosfiles_1403281523 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-21 00:27:24 +08:00
CocosRobot 2c04d00425 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-20 16:25:25 +00:00
minggo dbfbba87de Merge pull request #7161 from MSOpenTech/wp8-v3-fix 
Wp8 v3 fix
 2014-06-21 00:22:51 +08:00
Dale Stammen 113f20094f added building wp8 shaders instructions 2014-06-20 09:12:16 -07:00
Dale Stammen 5e1f0b5799 added missing files and tests that broke wp8 build 2014-06-20 09:07:51 -07:00
Dale Stammen 83c5b7bdb0 updated wp8 precompiled shaders 2014-06-20 09:07:29 -07:00
Dale Stammen aa4ffc33ac updated WP8 shader compiler tool 2014-06-20 09:06:49 -07:00
boyu0 2fa266e917 closed #5541: change PhysicsActionTest for rotate action. 2014-06-20 18:42:36 +08:00
boyu0 2fc8889791 issue #5541: change RotateTo/RotateBy for Physics. 2014-06-20 18:40:21 +08:00
Huabing.Xu bb4128036c use quad command for tile map rendering 2014-06-20 18:10:18 +08:00
minggo d99c30a0cc Merge pull request #7155 from natural-law/v3 
Optimize the win32 projects configuration.
 2014-06-20 17:35:32 +08:00
andyque 9b945683b5 fix contentSize not set properly problem 2014-06-20 14:55:42 +08:00
andyque 5f5b705bee refactor setSize to setContentSize and deprecated the old interface 2014-06-20 14:03:33 +08:00
yinkaile 1aa07906a1 add new line at the end of the file 2014-06-20 11:36:48 +08:00
yinkaile aac4ded898 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-20 11:24:12 +08:00
yinkaile 510bc23b16 1.fixed action may shake a little 
2.fixed frame event will emit even they do not in current play section
 2014-06-20 11:23:26 +08:00
andyque 4ca184b58a issue #5161, deprecated getSize 2014-06-20 11:18:53 +08:00
yinkaile 043c640037 fixed warning and logic error 2014-06-20 10:52:14 +08:00
zhangbin ec62f05b12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-20 10:51:13 +08:00
zhangbin 0019d9a061 Optimize the win32 projects configuration. 2014-06-20 10:50:43 +08:00
andyque 585ccf2c71 issue #5161, replace all _size to _contentSize 2014-06-20 10:40:16 +08:00
minggo d7e7a73fec Merge pull request #7154 from Mazyod/fix-cc-log-info 
CCLOGINFO compilation fix
 2014-06-20 10:01:31 +08:00
Mazyad Alabduljaleel c7ec43202a restore COCOS_DEBUG macro 2014-06-19 21:00:56 +04:00
Mazyad Alabduljaleel 433dc140cd CCLOGINFO compilation fix 2014-06-19 20:59:08 +04:00