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

34375 Commits

Author SHA1 Message Date
Ricardo Quesada 3eb7d62e6e fix: compile in Windows 
Github issue #15372
 2016-04-15 09:33:19 +08:00
zilongshanren e987f13d56 Merge pull request #15422 from CocosRobot/update_cocosfiles_1460599040 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-04-13 21:02:18 -05:00
CocosRobot d1ced49baa [AUTO][ci skip]: updating cocos2dx_files.json 2016-04-14 01:57:22 +00:00
zilongshanren 637d5f5362 Merge pull request #15421 from zilongshanren/update-3rd-party-libs-311 
upgrade deps to 90
 2016-04-13 20:53:20 -05:00
zilongshanren 2b4f3cf898 upgrade deps to 90 2016-04-14 09:16:51 +08:00
minggo 61a83aca2e Merge pull request #15407 from minggo/sync-to-v3.11 
Sync to v3.11
 2016-04-11 12:53:52 +08:00
minggo 3b5c1eb0f2 update web submodule 2016-04-11 11:55:45 +08:00
James Chen f3e6e8331a Fixes wrong usage of std::vector's constructor in EventDispatcher::removeAllEventListener. 2016-04-11 11:54:15 +08:00
Juan Luis Boya García 9c4f3ffa8d Make selectedSprite optional in JSB too 2016-04-11 11:53:53 +08:00
minggo d2519b9342 Merge pull request #15406 from pandamicro/v3.11 
Sync necessary changes to v3.11 and update web engine
 2016-04-11 11:36:34 +08:00
Бесшапошников Никита 54e457f1be Fixed ccui scroll widgets constants for JS bindings 2016-04-11 11:29:00 +08:00
Бесшапошников Никита 32b64831da Fixed ccui.ListView Test 2016-04-11 11:28:46 +08:00
Бесшапошников Никита cf32f8a2f0 Add PageView js tests 2016-04-11 11:27:50 +08:00
Бесшапошников Никита 273281ecce Add ListView js tests 2016-04-11 11:27:38 +08:00
Бесшапошников Никита 8ae6d68640 Add scroll view bar js test 2016-04-11 11:27:25 +08:00
pandamicro e2baba2d7b Update web engine ref 2016-04-11 11:18:55 +08:00
Ricardo Quesada fea84b8af3 fix: use chipmunk v6.2 API whenever possible 
fix: make it more compatible with chipmunk v6.2 code

fix: make it more compatible with chipmunk v6.2.2
 2016-04-11 11:12:34 +08:00
pandamicro 79cfe8ac0e Fix a issue in cc.CallFunc JSB implementation 2016-04-11 11:12:13 +08:00
CocosRobot 150ec2e7ce [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-11 11:11:54 +08:00
pandamicro f9f9551645 Fix some issues 
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
 2016-04-11 11:11:34 +08:00
pandamicro bb2cfc7308 Update engine version 2016-04-11 11:11:17 +08:00
pandamicro f450405d4e Fix AssetsManagerEx issue with failed asset 2016-04-11 11:11:00 +08:00
pandamicro 4bd6834ad6 Merge pull request #15405 from CocosRobot/update_cocosfiles_1460338764 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-04-11 10:17:22 +08:00
CocosRobot 02e3fca1fa [AUTO][ci skip]: updating cocos2dx_files.json 2016-04-11 01:39:26 +00:00
minggo ef7f38b6a9 compile v3.11 2016-04-11 09:36:44 +08:00
minggo 5c0efd7b2e Merge pull request #15400 from MSOpenTech/v3.11-winrt-websockets 
v3.11 updated version and filesize to get latest winrt websockets builds
 2016-04-09 09:07:32 +08:00
Dale Stammen acf6dbc77c updated version and filesize 2016-04-08 08:26:18 -07:00
minggo 018e657676 Merge pull request #15371 from cocos2d/slackmoehrle-patch-1 
updated some of the links
 2016-04-06 11:06:31 +08:00
Ricardo Quesada 6a47bee623 Merge pull request #15373 from ricardoquesada/buoyancy_js_fix 
buoyancy fix for Chipmunk-JS test
 2016-04-05 17:53:35 -07:00
Ricardo Quesada 88ff4da348 buoyancy fix. 
first commit
 2016-04-05 17:52:19 -07:00
Slack-Moehrle 13ab82f3d0 updated some of the links 
updated some of the links.
 2016-04-05 16:17:52 -04:00
zilongshanren f488eabb8f Merge pull request #15362 from CocosRobot/update_lua_bindings_1459598673 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-04-02 20:07:39 +08:00
CocosRobot 81448cd1b8 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-04-02 12:06:57 +00:00
zilongshanren 3192267af0 Merge pull request #15358 from zilongshanren/fixTextFieldPasswordStyle 
fix textField password bug
 2016-04-02 20:01:45 +08:00
pandamicro 3d7d5de95d Merge pull request #15317 from pandamicro/v3 
Fix Socket IO handshake issue with latest version libwebsocket
 2016-04-01 22:27:57 +08:00
zilongshanren 8587440e31 remove unneed c_str call 2016-04-01 10:01:37 +08:00
zilongshanren 90087ae5a7 improve textfield code 2016-04-01 09:31:18 +08:00
zilongshanren dcb7c58216 fix textField password bug 2016-04-01 00:52:55 +08:00
pandamicro d93fbea0f6 Fix Socket IO connection issue on iOS 2016-03-31 21:21:20 +08:00
minggo 08383628cc Merge pull request #15356 from minggo/crash 
[ci skip]fix crash issue
 2016-03-31 15:37:27 +08:00
minggo 8694a15a72 fix crash issue 2016-03-31 15:36:00 +08:00
minggo 5f4e8a65c4 Merge pull request #15348 from minggo/action_issue 
some bugs fixed of Repeat
 2016-03-31 14:47:54 +08:00
minggo 67e2eb12eb Merge pull request #15355 from xiaofeng11/v3 
rollback chipmunk export change
 2016-03-31 11:47:06 +08:00
肖峰 5b10ab3c2d rollback chipmunk export change 2016-03-31 11:01:58 +08:00
zilongshanren 7afcecc8cc Merge pull request #15353 from zilongshanren/fixTextField 
fix TextField password issue
 2016-03-30 22:02:06 +08:00
zilongshanren 016979af3b fix TextField password issue 2016-03-30 18:19:28 +08:00
minggo b80ebebc06 Merge pull request #15351 from natural-law/v3 
Update the submodule cocos2d-console
 2016-03-30 16:02:10 +08:00
minggo a11bf8b32e Merge pull request #15352 from minggo/js_version 
[ci skip]upgrade engine version
 2016-03-30 15:19:11 +08:00
minggo 48d24f14d7 upgrade engine version 2016-03-30 15:17:49 +08:00
zhangbin bb4e9869d1 Update the submodule cocos2d-console 2016-03-30 15:14:05 +08:00