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

5212 Commits

Author SHA1 Message Date
yangxiao 11a13ce9e2 Merge branch 'newcode' into v3 2014-08-04 15:41:21 +08:00
minggo 5deb273486 Merge pull request #7644 from 2youyouo2/v3 
update ActionTimeline
 2014-08-04 15:35:35 +08:00
samuele3hu e5f9c1b488 Adjust common script and related test cases 2014-08-04 15:22:07 +08:00
zii 20c43e5684 Update ccUtils.h 2014-08-04 15:21:10 +08:00
zii 7659a1623f Update ccUtils.h 2014-08-04 15:20:45 +08:00
zii e151795c43 Update ccUtils.cpp 2014-08-04 15:18:01 +08:00
yangxiao 47838ce945 reset 2014-08-04 14:37:26 +08:00
yangxiao 01e0192a2d reset 2014-08-04 14:29:55 +08:00
huangshiwu efcb8b9962 wp8 glview hook solution 1 2014-08-04 14:17:14 +08:00
yangxiao 4452d9579a merge cocos2d, fix lua 2014-08-04 12:07:27 +08:00
zii 825209dd04 Update ccUtils.cpp 2014-08-04 11:48:23 +08:00
zii 97f06306e3 Update ccUtils.cpp 
希望加入一个简单获得绝对时间的方法, 包装了gettimeofday.
 2014-08-04 11:45:50 +08:00
samuele3hu 6f4cafcc1b Add module register functions and adjust iOS and Mac test cases 2014-08-04 09:39:42 +08:00
huangshiwu 372479d812 wp8 GLView Hook 2014-08-02 16:31:16 +08:00
xuzhiqiang 85dd898319 bug fix 2014-08-02 08:04:29 +08:00
andyque d7b17c598d fix potential crash when user remove self in widgets callback 2014-08-01 20:58:42 +08:00
CocosRobot fda11428bf [AUTO]: updating luabinding automatically 2014-08-01 07:53:19 +00:00
huangshiwu 575c9787c0 Merge branch 'v3' into v3_pr 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-08-01 15:11:34 +08:00
kaile.yin 3dcdb1cde4 remove some update condition of Frame::apply function 2014-08-01 14:40:42 +08:00
CocosRobot 26c76f5cf1 [AUTO]: updating luabinding automatically 2014-08-01 04:02:13 +00:00
minggo 0b6254d095 Merge pull request #7587 from dzl-ian/fixTextWidgetColor 
Add getter and setter for TextColor to Text Widget
 2014-08-01 11:57:10 +08:00
kaile.yin d1407ca929 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-08-01 11:42:18 +08:00
maltium baba808391 RotateBy action now uses just Vec3() to keep track of the state 2014-07-31 23:28:33 +02:00
maltium 98354e9f8e RotateTo action now uses Vec3() to keep track of the state 2014-07-31 23:05:58 +02:00
yangxiao 52d3c4461f adjust 2014-07-31 20:20:29 +08:00
yangxiao 7562214c63 adjust 2014-07-31 20:19:43 +08:00
yangxiao 342dc05890 adjust 2014-07-31 20:17:51 +08:00
yangxiao 4aec1d37c8 code adjust 2014-07-31 20:14:43 +08:00
yangxiao e03d284e26 merge cocos2d 2014-07-31 18:55:41 +08:00
yangxiao 49052ab28d code adjust 2014-07-31 18:42:58 +08:00
yangxiao ca0afcfa92 add Quaternion::ZERO 2014-07-31 18:36:30 +08:00
yangxiao 17304b4775 add comment 2014-07-31 18:28:52 +08:00
yangxiao 780914687e code style adjust according minggo 2014-07-31 18:14:01 +08:00
kaile.yin 2fc082cac1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-31 17:52:49 +08:00
samuele3hu 6bb21c0f4d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	tools/tolua/cocos2dx.ini
 2014-07-31 17:52:22 +08:00
zhangbin d224c77bd4 Move the CCProtectedNode.cpp & .h from ui to cocos2d on wp8. 2014-07-31 17:51:06 +08:00
kaile.yin 170e1a5d7b init widget properties 2014-07-31 17:48:45 +08:00
minggo d44a359a1f Merge pull request #7635 from samuele3hu/v3_new_module 
Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting
 2014-07-31 17:39:01 +08:00
samuele3hu 2b562ace1a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-07-31 17:22:33 +08:00
minggo 2851bd9193 Merge pull request #7627 from andyque/fixScale9Sprite 
refactor ui::widgets to use ui::Scale9Sprite instead of extension::Scale9Sprite
 2014-07-31 16:58:56 +08:00
samuele3hu ee4e479ce1 Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting 2014-07-31 16:38:55 +08:00
samuele3hu a47e52b5bc Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-07-31 15:22:46 +08:00
samuele3hu 9666f1ad7f Split luabindings module to some independent modules 2014-07-31 15:20:23 +08:00
minggo 0e7eb3614e Merge pull request #7618 from dabingnn/v3_buildAllTarget 
add target to build All target
 2014-07-31 14:25:37 +08:00
songmiao 58c32e52c7 windows works 2014-07-31 14:08:05 +08:00
CocosRobot 095d4ed3c5 [AUTO]: updating luabinding automatically 2014-07-31 05:49:25 +00:00
minggo a77b8e7320 Merge pull request #7608 from andyque/fixTextFieldUtf8Issue 
add utf8 support for TextField widget
 2014-07-31 13:41:57 +08:00
yangxiao f6ad1df092 android work 2014-07-31 11:47:47 +08:00
andyque 1de2b78d61 refactor, optimize Scale9Sprite 2014-07-31 11:07:20 +08:00
yangxiao 38c86f7697 skeleton retain 2014-07-31 10:57:19 +08:00
yangxiao 2c29560514 add CC_DLL 2014-07-31 10:28:39 +08:00
yangxiao 44c501ca2a merge cocos2d 2014-07-31 09:56:23 +08:00
maltium 3d44439e2a added 3D rotation support to the RotateTo action 2014-07-30 21:42:47 +02:00
huangshiwu ef69faf3ba GLView Hook 2014-07-31 00:53:04 +08:00
yangxiao 9f1cfbfca5 add skeleton and refactor skin 2014-07-30 18:32:34 +08:00
andyque 03368d42f2 refactor, improve imageView stability 2014-07-30 17:29:22 +08:00
andyque e6b85fbd77 fix minor bugs of UISlider and remove unused header include in ListView 2014-07-30 16:55:16 +08:00
Huabing.Xu 65775f2d30 remove CC_CONSTUCTOR_ACCESS fow win32 release 2014-07-30 16:39:21 +08:00
andyque 83298171d9 refactor Layout 2014-07-30 16:33:37 +08:00
Ningyu d53cdc39df tab to spaces 2014-07-30 16:20:58 +08:00
Ningyu 52ca596b3d code tidy 2014-07-30 16:19:05 +08:00
andyque 7bcb31f225 refactor loadingBar 2014-07-30 16:08:29 +08:00
andyque c5d2585049 refactor Slider control 2014-07-30 15:52:27 +08:00
andyque 6492167974 refactor ImageView 2014-07-30 15:27:18 +08:00
andyque a6e376f93c refactor UIButton 2014-07-30 15:19:39 +08:00
Huabing.Xu 428e9b1b1a Merge branch 'v3' into v3_buildAllTarget 2014-07-30 14:12:28 +08:00
Ningyu 61a87e7e8b fix LabelTTF::getBoundingBox() position error 2014-07-30 14:00:01 +08:00
andyque f2b0528cc9 refactor 2014-07-30 10:45:35 +08:00
andyque e7da7b3e42 change unsigned long to size_type 2014-07-30 10:34:37 +08:00
andyque 7abea5dc58 add utf8 support for UITextField 2014-07-30 10:34:37 +08:00
andyque 955da5d3cc move utf8_substr to ui::helper class. 2014-07-30 10:34:37 +08:00
andyque 4a40604955 refactor getScale9Enabled to isScale9Enabled 2014-07-30 10:31:40 +08:00
Huabing.Xu d86cc0a811 decouple libcocos2d and cocosdenshion 2014-07-29 18:08:40 +08:00
andyque 5a22636441 fix windows compile error 2014-07-29 17:51:34 +08:00
Ningyu aebe8317bd spaces 2014-07-29 17:22:13 +08:00
Ningyu d5242ef4fa add 
SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
 2014-07-29 17:06:43 +08:00
Ningyu 23e0ed3767 add 
SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
 2014-07-29 16:58:33 +08:00
gin0606 ef4852b7ec Fix iOS VideoPlayer memory leak. 2014-07-29 17:56:03 +09:00
andyque c5ca0dbf10 fix android and linux compile error 2014-07-29 16:24:27 +08:00
andyque 1daaea1410 remove extension::Scale9Sprite dependency 2014-07-29 16:24:27 +08:00
andyque ebf05d1acc add UIScale9Sprite tests 2014-07-29 16:24:27 +08:00
andyque 717f20571b add UIScale9Sprite implementation 2014-07-29 16:24:27 +08:00
andyque 32ed796657 add UIScale9Sprite 2014-07-29 16:24:27 +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
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 5d63ce17ad Merge pull request #7610 from dabingnn/v3_windowChangeModule 
V3 window change module
 2014-07-29 14:29:01 +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
dzl-ian b8248a165b Correct some typos/mistakes in declarations 2014-07-29 13:47:21 +09:00
Huabing.Xu c722c0fcd0 libcocostudio for windows 2014-07-29 11:31:37 +08:00
Huabing.Xu e91fa0e9fc libcocosbuilder rename for windows 2014-07-29 11:09:02 +08:00
yangxiao da4ba95806 SubMesh and Attachment 2014-07-29 10:49:06 +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
Unai Orbe 406a718a4c reuse file utils when resolving video path (ios) 2014-07-28 15:24:17 +01:00
Huabing.Xu d6bc2f4998 liuGUI->libui for windows 2014-07-28 22:12:07 +08:00