Huabing.Xu
2a75b7192a
enable neon on IOS and refactor code
2014-09-24 16:12:47 +08:00
yestein
b19b2c5786
replace tab to 4 spaces
2014-09-24 15:14:47 +08:00
minggo
79446999bb
Merge pull request #8116 from Dhilan007/v3-labelfix
...
Cocos2d-x used a deprecated method to calculates the bounding rect of a string on iOS 7.
2014-09-24 15:03:40 +08:00
minggo
dd3c295caa
Merge pull request #8125 from cpascal/fix_invalid_windows_definition
...
Fixed invalid use of CC_TARGET_PLATFORM in the CCClippingNode
2014-09-24 15:02:30 +08:00
minggo
f88685be8e
[ci skip]
2014-09-24 15:02:03 +08:00
minggo
fdb30f1ee7
Merge pull request #8115 from Dhilan007/v3-audio903
...
New Audio Engine -MAC
2014-09-24 15:00:53 +08:00
minggo
20c0ec7301
Merge pull request #8132 from CocosRobot/update_cocosfiles_1411537404
...
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-24 13:50:55 +08:00
CocosRobot
78b51b3ffd
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-24 05:43:25 +00:00
minggo
0dd889683e
Merge pull request #8129 from andyque/fixSubmodule
...
remove submodule, use download.py instead
2014-09-24 13:41:33 +08:00
andyque
a158b79fb6
add more prompt to debug
2014-09-24 12:57:47 +08:00
andyque
d066d02be5
add downloading prompt
2014-09-24 12:53:30 +08:00
andyque
f8a05c9e1e
recheck download.py
2014-09-24 12:42:53 +08:00
andyque
972c5f8ab2
adjust config
2014-09-24 12:03:17 +08:00
andyque
a0d6bbbf9a
add back config.json
2014-09-24 12:01:34 +08:00
honghui
b513dbafb5
read config.json may failed caused by syntax error
2014-09-24 11:43:21 +08:00
yestein
72c5d77273
Add Cocostudio Armature getOffsetPoints API for Lua
2014-09-24 11:20:36 +08:00
minggo
2f3e64ab0c
Merge pull request #8128 from CocosRobot/update_cocosfiles_1411527466
...
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-24 11:16:32 +08:00
Huabing.Xu
e1d11ae5c3
move sse code to mathUtil.cpp
2014-09-24 11:06:07 +08:00
minggo
8ce2b152c2
[ci skip]
2014-09-24 10:58:06 +08:00
CocosRobot
671739e9a8
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-24 02:57:48 +00:00
minggo
5d59890455
Merge pull request #8127 from newnon/v3_precompiled_headers
...
Precompiled headers improvements
2014-09-24 10:55:45 +08:00
Huabing.Xu
b18e0501fc
move code to mathUtil.cp
2014-09-24 10:32:29 +08:00
andyque
ceb4932fd1
remove submodule
2014-09-24 10:27:53 +08:00
andyque
7e9ede728f
revert download.py and delete submodule
2014-09-24 10:26:56 +08:00
Sergey Perepelitsa
0a46a83794
fix missing includes
2014-09-23 23:19:25 +04:00
Sergey Perepelitsa
d8216149de
precompiled headers improvements for iOS & Mac
2014-09-23 23:19:25 +04:00
Dale Stammen
b9c57f7e28
changed background-music-aac.wav to background.wav. background-music-acc.wav does not exist
2014-09-23 10:39:17 -07:00
Dale Stammen
2226aa5c8a
need to reset the accelerometer before trying to enable it again
2014-09-23 10:01:42 -07:00
Huabing.Xu
e74b2f3164
add macro to enable neon on IOS
2014-09-23 18:15:26 +08:00
minggo
a5724a5be4
Merge pull request #8126 from minggo/v3
...
update submodule
2014-09-23 17:22:22 +08:00
songchengjiang
d956148a94
Tab Format
2014-09-23 17:19:27 +08:00
minggo
a711ca1b3d
update submodule
2014-09-23 17:14:52 +08:00
minggo
a51254decf
Merge pull request #8124 from Dhilan007/v3-res
...
Add audio resource.
2014-09-23 17:10:50 +08:00
songchengjiang
b51dc584d5
Light optimization
2014-09-23 17:08:28 +08:00
cpascal
a70f51b1e3
Fixed invalid use of CC_TARGET_PLATFORM in the CCClippingNode
...
I modified CC_PLATFORM_WINDOWS to CC_PLATFORM_WIN32.
--
In the CCPlatformConfig.h,
the definitions are..
// win32
#if defined(WIN32) && defined(_WINDOWS)
#undef
CC_TARGET_PLATFORM
#define CC_TARGET_PLATFORM
CC_PLATFORM_WIN32
#endif
2014-09-23 17:35:57 +09:00
Dhilan007
ed4e800d70
Add audio resource.
2014-09-23 15:38:40 +08:00
minggo
62697bbb42
Merge pull request #8122 from andyque/fixJenkins
...
uncomment 3rd part bins check
2014-09-23 11:57:57 +08:00
minggo
bb1771a000
[ci skip]
2014-09-23 11:18:56 +08:00
minggo
34799958b5
Merge pull request #8101 from SunLightJuly/get_cascade_bounding_box
...
added utils::getCascadeBoundingBox()
2014-09-23 11:13:09 +08:00
andyque
0267712531
uncomment 3rd part bins check
2014-09-23 10:55:34 +08:00
minggo
db0e203447
Merge pull request #8121 from CocosRobot/update_cocosfiles_1411435563
...
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-23 10:18:45 +08:00
CocosRobot
2c1649f773
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-23 01:26:04 +00:00
minggo
66896fd4f6
Merge pull request #8119 from SmartCat/v3
...
* added default value for _batchNode in CCSprite
2014-09-23 09:23:56 +08:00
Dmitry Bushtets
d242d79443
* added default value for _batchNode in CCSprite
2014-09-22 19:00:21 +03:00
SmartCat
76fffb9402
Merge pull request #1 from cocos2d/v3
...
- fastforward
2014-09-22 18:54:53 +03:00
Sergey
b8b5397e4e
Tests for Mac/iOS android Linux & Windows
2014-09-22 17:54:49 +04:00
Guy Kogus
908311ff7f
Added tests for opening a URL.
2014-09-22 17:51:05 +04:00
Guy Kogus
6e91c65e74
Windows Phone 8 can now open URLs.
2014-09-22 17:47:38 +04:00
Guy Kogus
a9a0ff35f6
Added method for converting from std::string to Platform::String.
2014-09-22 17:47:38 +04:00
Sergey
2255cf91ba
openUrl function for all platform but on windows RT empty function
2014-09-22 17:47:38 +04:00