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 |
minggo
|
11012478ad
|
Merge pull request #7597 from Dhilan007/v3-video-android
Fix the size of VideoPlayer is incorrect on android.
|
2014-07-28 10:47:19 +08:00 |
minggo
|
a6d5f7cca8
|
[ci skip]
|
2014-07-28 10:44:30 +08:00 |
minggo
|
a8bb2462de
|
Merge pull request #7052 from gin0606/videoPlayerScaleIssue
Fix video scale issue in iOS
|
2014-07-28 10:43:13 +08:00 |
minggo
|
b58569151b
|
Merge pull request #7590 from andyque/fixWidgetContentSize
Simplify Widget ContentSize cascade change algorithm
|
2014-07-28 10:40:05 +08:00 |
Dhilan007
|
f02b80bc2c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-newaudio
|
2014-07-28 10:39:20 +08:00 |
boyu0
|
85b9765b8f
|
Change Image::PVRImagesHavePremultipliedAlpha() to Image::setPVRImagesHavePremultipliedAlpha()
|
2014-07-28 10:38:22 +08:00 |
minggo
|
9805a4bbf2
|
Merge pull request #7588 from Dhilan007/v3
fix warn
|
2014-07-28 10:33:01 +08:00 |
Dhilan007
|
f7a08d5697
|
Fix the size of VideoPlayer is incorrect on android.
|
2014-07-28 10:09:46 +08:00 |
Huabing.Xu
|
3e9b900665
|
Merge branch 'v3' into v3_windowChangeModule
|
2014-07-28 09:23:45 +08:00 |
Huabing.Xu
|
7f5782c207
|
chang module name for windows project file
|
2014-07-28 09:20:02 +08:00 |
Dhilan007
|
66e54c3a77
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-newaudio
|
2014-07-27 22:07:16 +08:00 |
dzl-ian
|
bc30519812
|
Add missing space in function definition
|
2014-07-27 08:23:16 +09:00 |
minggo
|
6217748f1c
|
[ci skip]
|
2014-07-25 23:16:27 +08:00 |
minggo
|
4a969c4afe
|
[ci skip]
|
2014-07-25 23:14:18 +08:00 |
minggo
|
31af102f26
|
Merge pull request #7532 from lite3/object_to_luaval
replace dynamic_cast to std::is_base_of
|
2014-07-25 23:11:55 +08:00 |
minggo
|
568698a1be
|
Merge pull request #7593 from heliclei/pull-request-builder
[ci skip][jenkins]merge pull request to latest baseline before build
|
2014-07-25 22:58:01 +08:00 |
minggo
|
732bd407a2
|
Merge pull request #7589 from dabingnn/v3_renameModule
change mac/ios target name
|
2014-07-25 22:45:49 +08:00 |
boyu0
|
34a8d26124
|
Deprecate Texture2D::PVRImagesHavePremultipliedAlpha(), move Texture2D::PVRImagesHavePremultipliedAlpha() to Image.
|
2014-07-25 18:19:04 +08:00 |
boyu0
|
e3b79f4150
|
delete Image::_preMulti, Deprecate Image::isPremultipliedAlpha(), change Image::hasPremultipliedAlpha() meaning.
|
2014-07-25 18:01:32 +08:00 |
Dhilan007
|
154be91808
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-newaudio
|
2014-07-25 17:58:40 +08:00 |
heliclei
|
aba0a12413
|
[ci skip][jenkins]merge pull request to latest baseline before build
|
2014-07-25 16:38:22 +08:00 |
gin0606
|
c66ebbf528
|
Fix void* casting
|
2014-07-25 16:41:12 +09:00 |
andyque
|
7353f8685a
|
Simplify Widget ContentSize cascade change algorithm
|
2014-07-25 14:59:58 +08:00 |
dzl-ian
|
7048bc515b
|
Remove update of content size as it won't change
|
2014-07-25 15:52:35 +09:00 |
andyque
|
e56e015be2
|
minor modification of tests
|
2014-07-25 14:40:58 +08:00 |