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

22324 Commits

Author SHA1 Message Date
andyque 32ed796657 add UIScale9Sprite 2014-07-29 16:24:27 +08:00
minggo ba567c05da Merge pull request #7615 from CocosRobot/update_cocosfiles_1406621347 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-29 16:14:22 +08:00
minggo 4c2fd90286 Merge pull request #7614 from andyque/fixBindingGenerate 
fix binding generator can nott regonize unsigned long arguments
 2014-07-29 16:13:26 +08:00
CocosRobot a743590ac5 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-29 08:09:10 +00:00
minggo 38240b64c5 Merge pull request #7612 from dabingnn/v3_copysqllitedll 
add script to copy sqllite3.dll to output dir on windows
 2014-07-29 16:07:27 +08:00
andyque 98ef180ca8 add default value to luaval_to_ulong 2014-07-29 15:59:49 +08:00
andyque cfe7e57561 fix binding generator can nott regonize unsigned long arguments 2014-07-29 15:48:12 +08:00
Huabing.Xu bca92772dd remove unused windows localstorage project file 2014-07-29 15:23:07 +08:00
Huabing.Xu ea802580a2 add script to copy sqllite3.dll to output dir on windows 2014-07-29 15:02:34 +08:00
minggo 08627dbbe2 Merge pull request #7611 from CocosRobot/update_cocosfiles_1406615438 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-29 14:31:22 +08:00
CocosRobot 3d7cced94e [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-29 06:30:39 +00:00
minggo 5d63ce17ad Merge pull request #7610 from dabingnn/v3_windowChangeModule 
V3 window change module
 2014-07-29 14:29:01 +08:00
minggo 21ea77fb6f [ci skip] 2014-07-29 14:04:36 +08:00
minggo 52dfb7224e Merge pull request #7609 from boyu0/bug5762_setTotalParticles 
Closed #5762: ParticleSystemQuad::setTotalParticles() can't set a value larger than the initialized value.
 2014-07-29 13:55:33 +08:00
minggo 00346b5efb Merge pull request #7607 from shinriyo/patch-1 
typo function
 2014-07-29 13:47:27 +08:00
Huabing.Xu c722c0fcd0 libcocostudio for windows 2014-07-29 11:31:37 +08:00
boyu0 1b6cda488a add ParticleResetTotalParticles test. 2014-07-29 11:21:11 +08:00
Huabing.Xu d53ce4d664 libcocosbuilder rename for windows 2014-07-29 11:09:17 +08:00
Huabing.Xu e91fa0e9fc libcocosbuilder rename for windows 2014-07-29 11:09:02 +08:00
Huabing.Xu 6d0b8852d1 libSpine rename for windows 2014-07-29 10:53:39 +08:00
boyu0 c63d64e385 set emission rate when setTotalParticles() 2014-07-29 10:48:20 +08:00
Huabing.Xu aaa65dcae4 Merge branch 'v3' into v3_windowChangeModule 2014-07-29 10:20:23 +08:00
Huabing.Xu eacf003eed change libExtensions for windows 2014-07-29 10:07:46 +08:00
Huabing.Xu bf287252df change libnetwork and libSpine 2014-07-29 09:31:52 +08:00
shinriyo 3da15a7f92 typo function 
however it is not the dog.
squirrel....
 2014-07-29 00:37:55 +09:00
Huabing.Xu d6bc2f4998 liuGUI->libui for windows 2014-07-28 22:12:07 +08:00
Huabing.Xu c6956504bf change CocosDenshion to libcocosdenshion 2014-07-28 21:35:16 +08:00
Huabing.Xu 8f9ce2e282 change cocosbuilder to lowercase 2014-07-28 21:09:43 +08:00
Huabing.Xu 4a4f05c827 change cocos2d to libcocos2d for windows 2014-07-28 20:55:58 +08:00
minggo ba3a467c3f Merge pull request #7604 from minggo/xcode-project-fix 
Xcode project fix
 2014-07-28 16:17:48 +08:00
minggo a5c8450a16 Merge pull request #7603 from heliclei/dailybuild-email 
[ci skip]send email to report build result
 2014-07-28 16:00:17 +08:00
minggo 98b0797c0e add shared xcscheme 2014-07-28 15:41:33 +08:00
minggo bf6e706ab9 fix xcode project setting 2014-07-28 15:37:00 +08:00
heliclei 5b4ca604c2 [ci skip]send email to report build result 2014-07-28 14:26:49 +08:00
minggo cb68b00634 [ci skip] 2014-07-28 14:16:39 +08:00
minggo 4249311c0c [ci skip] 2014-07-28 14:07:40 +08:00
minggo b2e705acd8 Merge pull request #7567 from andyque/fixWidgetCallbackDeleteSelf 
fix remove self in Widget touch callback issue
 2014-07-28 14:04:20 +08:00
minggo 152a9a0464 [ci skip] 2014-07-28 14:02:16 +08:00
minggo 191f7a57e1 Merge pull request #7078 from reckhou/v3 
Optimize FPS control algorithm under Android.
 2014-07-28 14:00:55 +08:00
Huabing.Xu 030d48ea32 change Project name to libbox2d 2014-07-28 12:13:52 +08:00
Huabing.Xu 2795c10627 rename box2d->libbox2d 2014-07-28 12:05:58 +08:00
minggo 116591f0ca Merge pull request #7601 from CocosRobot/update_lua_bindings_1406518595 
[AUTO]: updating luabinding automatically
 2014-07-28 11:43:07 +08:00
CocosRobot 12042bfd9d [AUTO]: updating luabinding automatically 2014-07-28 03:38:12 +00:00
minggo af3955f60c [ci skip] 2014-07-28 11:37:59 +08:00
minggo 3688ff5d23 [ci skip] 2014-07-28 11:36:50 +08:00
minggo 9efbd6e4ef Merge pull request #7600 from pandamicro/FileUtils_FILE_API 
Refactor #5580: Improve searchFullPathForFilename and comments
 2014-07-28 11:34:13 +08:00
pandamicro 823bd437d8 Refactor #5580: Improve searchFullPathForFilename and comments 2014-07-28 11:14:11 +08:00
minggo cf7de08f22 Merge pull request #7594 from boyu0/image_premulti_alpha_refactor 
Image premultiplied alpha refactor
 2014-07-28 11:02:33 +08:00
minggo 7ad7b5b3f7 Merge pull request #7585 from wagulu/patch-1 
Update CCParticleSystem.cpp
 2014-07-28 10:54:05 +08:00
minggo a878bd27db [ci skip] 2014-07-28 10:50:13 +08:00