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

19879 Commits

Author SHA1 Message Date
cw 3207d841a3 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime 2014-05-13 18:01:38 +08:00
cocoscodeide 0b301d6602 Merge pull request #5 from cocos2d/v3 
update cocos2d-x
 2014-05-13 17:59:18 +08:00
andyque 31a2194dcb closed #4900, add TTF font to UIText 2014-05-13 17:45:15 +08:00
chuanweizhang2013 21483b1a47 add start search config.json 2014-05-13 17:44:35 +08:00
James Chen 24524cb5be issue #5160: Updates actiontest 2014-05-13 17:30:48 +08:00
James Chen 1ced31a2d3 issue #5160: Don't use static variables, use member variables 2014-05-13 17:29:05 +08:00
heliclei 35b19a239a exit gracefully after running all tests 2014-05-13 17:20:12 +08:00
andyque 41fe56ee70 closed #5005, fix a null pointer exception 2014-05-13 17:12:48 +08:00
James Chen 0dd22af688 closed #5160: Updates ActionTest 2014-05-13 17:08:52 +08:00
James Chen 0cd2196b88 closed #5160: Dispatch a custom event after an animation frame is displayed 2014-05-13 17:08:30 +08:00
James Chen d0c98d6269 Adds ValueVectorNull, ValueMapNull, ValueMapIntKeyNull global variables. 2014-05-13 17:03:48 +08:00
Dhilan007 fbfbcaffc8 update project 2014-05-13 16:43:19 +08:00
andyque 2d88c8ea92 closed #5005, fix visible and enable issue 2014-05-13 16:37:41 +08:00
Dhilan007 1a7ca64be2 Merge branch 'reparentChildren' of https://github.com/darkdukey/cocos2d-x into v3_nodefix 2014-05-13 16:36:42 +08:00
James Chen 86411837c6 PLEASE NEVER `using namespace cocos2d;` in header file 2014-05-13 16:15:21 +08:00
cocoscodeide a300194d8f Merge pull request #4 from chuanweizhang2013/v3luaruntime 
V3luaruntime
 2014-05-13 16:03:12 +08:00
chuanweizhang2013 f35d69805f Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime 2014-05-13 15:57:24 +08:00
chuanweizhang2013 c8d871a60b modify read config time 2014-05-13 15:56:39 +08:00
chuanweizhang2013 4518185a7b modify read config time 2014-05-13 15:30:55 +08:00
minggo f36f224d46 Merge pull request #6710 from natural-law/v3 
Modify the lua runtime template for the implementation of downloading runtime files.
 2014-05-13 15:25:34 +08:00
Ricardo Quesada cd194cad9f Merge pull request #6711 from ricardoquesada/indent_issues 
fixes more indentation issues
 2014-05-13 00:10:30 -07:00
Ricardo Quesada 8aea6fe89f fixes more indentation issues 2014-05-13 00:10:01 -07:00
zhangbin b0adc6fe51 Modify the lua runtime template for the implementation of downloading runtime files. 2014-05-13 15:06:56 +08:00
James Chen 58fd1a05b3 Merge pull request #6709 from CocosRobot/update_lua_bindings_1399964508 
[AUTO]: updating luabinding automatically
 2014-05-13 15:05:30 +08:00
CocosRobot 7ad48b632a [AUTO]: updating luabinding automatically 2014-05-13 07:03:12 +00:00
Ricardo Quesada b456701451 Merge pull request #6708 from ricardoquesada/multitexturingsupport 
Multi texturing support
 2014-05-12 23:58:10 -07:00
Ricardo Quesada f25de7869b indentation issues 2014-05-12 23:57:46 -07:00
andyque 1c47c833c6 issue #5005, fixed widget visit method 2014-05-13 14:56:44 +08:00
andyque 810c25b85e Merge branch 'v3' into issue5005 2014-05-13 14:52:49 +08:00
andyque 1a319b3f12 issue #5005, deprecated setTouchEnabled 2014-05-13 14:52:27 +08:00
Ricardo Quesada cdac920b5f Merge remote-tracking branch 'cocos2d/v3' into multitexturingsupport 2014-05-12 23:52:02 -07:00
Ricardo Quesada 71848aca93 Initial multitexturing support 2014-05-12 23:51:37 -07:00
heliclei 17cd12f8b1 fix win32 compile 2014-05-13 14:43:11 +08:00
James Chen 7cf54c4e1f Merge pull request #6704 from dumganhar/make-package-support-insert-extra-zip 
Adds a comment before making archive file
 2014-05-13 14:38:50 +08:00
James Chen 45d845f559 Adds a comment before making archive file 2014-05-13 14:33:53 +08:00
Nite Luo fca0ec696f Undo project file changes 2014-05-12 23:32:19 -07:00
James Chen f85446b8ec Merge pull request #6702 from dumganhar/make-package-support-insert-extra-zip 
[ci skip] The tool of making package supports to insert the content of another zip file
 2014-05-13 14:30:51 +08:00
James Chen 4f886e8ebf [ci skip] The tool of making package supports to insert the content of 
another zip file
 2014-05-13 14:28:29 +08:00
Nite Luo 7d8cfc4cca set parent transform dirty when addChild 2014-05-12 23:28:20 -07:00
chuanweizhang2013 1c0968bbc4 Merge pull request #27 from cocoscodeide/v3 
update cocos2d-x
 2014-05-13 14:25:02 +08:00
heliclei 13f3c9705a Merge remote-tracking branch 'upstream/v3' into autotest-autorun 2014-05-13 14:24:00 +08:00
heliclei 8cc224dcef change default auto-run config to false 2014-05-13 14:17:43 +08:00
heliclei 45d8547622 add config item 2014-05-13 14:16:06 +08:00
heliclei eaa879a9f3 fix for winrt build 2014-05-13 14:08:49 +08:00
bofeng-song e1ec7a9377 Merge pull request #1 from cocoscodeide/v3 
meger ide
 2014-05-13 13:58:02 +08:00
minggo 4bb9fb2396 [ci skip] 2014-05-13 13:56:42 +08:00
minggo a75550aaba [ci skip] 2014-05-13 13:55:29 +08:00
minggo 4356727465 Merge pull request #6619 from myourys/v3 
update cpp-default-template for android *Eclipse*
 2014-05-13 13:52:28 +08:00
Nite Luo 0b7b9f6131 Merge branch 'v3' into reparentChildren 2014-05-12 22:52:19 -07:00
Nite Luo e1f82c174b add TestCase for reparentChildren bug 2014-05-12 22:50:31 -07:00