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

17005 Commits

Author SHA1 Message Date
CaiWenzhi 943a636747 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 22:31:31 +08:00
CaiWenzhi 1d867d770b Modify Windows project 2014-03-06 22:27:57 +08:00
James Chen 9f31ecde07 Merge pull request #5597 from koowolf/editbox_dialog 
closed #4291：open CCEditBox as dialogbox
 2014-03-06 22:22:09 +08:00
koowolf 0aaa1dc0db closed #4291：open CCEditBox as modal dialog 2014-03-06 22:17:20 +08:00
CaiWenzhi 94339312ba Modify text filed size control 2014-03-06 21:58:45 +08:00
CaiWenzhi fea75444a7 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 21:43:33 +08:00
James Chen d1e7842545 Merge pull request #5593 from boyu0/iss4159_physics_position_rotation_bug 
closed #4159:  fix physics position/rotation tag bug.
 2014-03-06 21:05:49 +08:00
CaiWenzhi 8b7a5c3141 Add RichText sample 2014-03-06 20:52:29 +08:00
CaiWenzhi 03f5be47da Modify for editor 2014-03-06 17:21:09 +08:00
minggo 0bc0bbce01 Merge pull request #5594 from minggo/install 
check validation of ndk_root
 2014-03-06 17:20:40 +08:00
minggo 8f7a4ba64a check validation of ndk_root 2014-03-06 17:18:12 +08:00
minggo 461cfeb702 Merge pull request #5589 from natural-law/develop 
Solve the crash in WebSocketTest when the network in disconnected.
 2014-03-06 17:15:25 +08:00
boyu0 b926e4efad closed #4150: fix physics position/rotation tag bug. 2014-03-06 17:04:54 +08:00
zhangbin 7588a12f98 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-06 16:50:07 +08:00
zhangbin 99b2c5453e Solve the crash in WebSocketTest when the network in disconnected. 2014-03-06 16:49:51 +08:00
CaiWenzhi b02ed6fb1e Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 16:17:35 +08:00
CaiWenzhi bd5c11b5ee Modify mk file and solve warnings 2014-03-06 16:15:03 +08:00
minggo 62a121a54f Merge pull request #5573 from natural-law/develop 
Solve the crash in CocoStudioComponentsTest.
 2014-03-06 15:46:25 +08:00
CaiWenzhi dc7abd07c0 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 15:44:18 +08:00
James Chen 88cdbeed63 Merge pull request #5587 from CocosRobot/update_cocosfiles_1394089188 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-06 15:02:29 +08:00
CocosRobot e95ce5ab3d [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-06 06:59:49 +00:00
James Chen 57563b5973 Merge pull request #5586 from dumganhar/develop 
Uses 'generate-tempate-files.py' to generate cocos2dx_files.json
 2014-03-06 14:58:03 +08:00
James Chen c2cd349da5 Uses 'generate-tempate-files.py' to generate cocos2dx_files.json 2014-03-06 14:56:46 +08:00
minggo 08913b95a8 Merge pull request #5585 from minggo/develop 
update readme and release note
 2014-03-06 14:47:13 +08:00
minggo 56ceb4b6d5 update readme and release note 2014-03-06 14:44:33 +08:00
CaiWenzhi 0525320945 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 14:33:16 +08:00
James Chen 58553d67f5 Merge pull request #5583 from dumganhar/develop 
[travis ci] Updates generate-cocosfiles.sh.
 2014-03-06 14:16:21 +08:00
James Chen 5ca25d854f [travis ci] Updates generate-cocosfiles.sh. 2014-03-06 14:10:50 +08:00
James Chen 1edf6d5aae Merge pull request #5582 from CocosRobot/update_cocosfiles_1394086147 
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
 2014-03-06 14:10:09 +08:00
CocosRobot 5490e44192 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-03-06 06:09:07 +00:00
James Chen e6e9c5abfb Merge pull request #5581 from dumganhar/develop 
[travis ci] Uncomments '.generate-cocosfiles.sh'.
 2014-03-06 14:02:52 +08:00
James Chen 738a4f5deb Uncomments '.generate-cocosfiles.sh'. 2014-03-06 14:00:48 +08:00
minggo 43d85dc0d7 Merge pull request #5580 from lihex/develop 
rename template config file
 2014-03-06 13:58:39 +08:00
lihex c206384edd rename template config file 2014-03-06 13:56:18 +08:00
James Chen 3ea76abeb7 Merge pull request #5579 from dumganhar/develop 
[travis ci] Adds 'for-each-file-in-dir.sh' for generating file list in cocos2d. CocosRobot will send a PR for that change.
 2014-03-06 13:56:02 +08:00
James Chen dfdb6c4158 [travis ci] Adds 'for-each-file-in-dir.sh' for generating file list in cocos2d. CocosRobot will send a PR for that change. 2014-03-06 13:54:24 +08:00
minggo 6add5372aa Merge pull request #5577 from chuanweizhang2013/update-cocosfile 
update coocs2dx_files.json
 2014-03-06 13:44:27 +08:00
CaiWenzhi 2a5ecc2376 Fixed bugs of Flipping 2014-03-06 13:40:46 +08:00
CaiWenzhi bcdc0458a4 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 13:32:59 +08:00
minggo 2d890fe2ab Merge pull request #5578 from minggo/install 
setup improve
 2014-03-06 11:53:46 +08:00
minggo 4453e6e7fc setup improve 2014-03-06 11:51:50 +08:00
CaiWenzhi 3554dcd749 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 11:22:33 +08:00
zhangbin fec04dd6ae Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-06 11:03:49 +08:00
James Chen 87b657b5bb Merge pull request #5575 from dumganhar/iss4286-event-crash 
closed #4286: 'EventDispatcherTest/Issue 4129' crashes on Windows.
 2014-03-06 11:03:34 +08:00
Ricardo Quesada e0030d35b2 Merge pull request #5576 from ricardoquesada/perf_improvement_in_quad_command 
little performance improvement in quad command
 2014-03-05 18:50:54 -08:00
Ricardo Quesada 273d0d22f1 little performance improvement in quad command 2014-03-05 18:50:09 -08:00
James Chen 183622c718 'EventDispatcherTest/Issue 4129' crashes on Windows. 2014-03-06 10:45:29 +08:00
zhangbin 6da0afdd03 Solve the crash in CocoStudioComponentsTest. 2014-03-06 09:23:27 +08:00
Ricardo Quesada 4fe827e46b Merge pull request #5572 from ricardoquesada/ondraw_updated 
onDraw() updated
 2014-03-05 16:05:32 -08:00
Ricardo Quesada a0ab8fcdf3 onDraw() updated 
`onDraw()` receives `const kmMat4 &transform` and `bool
transformUpdated`.

`CC_NODE_DRAW_SETUP()` is no longer used in our code.
`_modelViewTransform` is only used as a cache.
 2014-03-05 15:49:08 -08:00