yangxiao
|
3b01222787
|
modify changelog
|
2015-04-08 16:27:26 +08:00 |
yangxiao
|
ac3e34144e
|
reset submodule
|
2015-04-08 16:25:01 +08:00 |
yangxiao
|
0d0bad186f
|
resolve conflict
|
2015-04-08 16:23:35 +08:00 |
yangxiao
|
427c15e53f
|
modify changelog
|
2015-04-08 16:13:41 +08:00 |
yangxiao
|
37d75654f4
|
modify changelog
|
2015-04-08 16:09:13 +08:00 |
XiaoYang
|
9856864ded
|
Merge pull request #289 from lvlonggame/v3
add getAABBRecursively
|
2015-04-08 16:04:16 +08:00 |
minggo
|
295d697f3c
|
Merge pull request #11332 from CocosRobot/update_cocosfiles_1428474985
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-08 14:50:33 +08:00 |
minggo
|
e4fb954fde
|
[ci skip]update CHANGELOG
|
2015-04-08 14:46:06 +08:00 |
CocosRobot
|
deb44cc0e8
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-08 06:36:26 +00:00 |
minggo
|
00c0e4c432
|
Merge pull request #10909 from babcca/webview_ios_load_data_fix
Webview ios load data fix
|
2015-04-08 14:34:42 +08:00 |
minggo
|
e4099acdc8
|
Merge pull request #11328 from CocosRobot/update_lua_bindings_1428464979
[AUTO]: updating luabinding automatically
|
2015-04-08 13:54:22 +08:00 |
minggo
|
01654f3298
|
Merge pull request #11329 from andyque/removeZlib
remove zlib
|
2015-04-08 13:33:43 +08:00 |
andyque
|
63da9ee63a
|
remove zlib
|
2015-04-08 13:01:04 +08:00 |
minggo
|
89fc177257
|
Merge pull request #11325 from CocosRobot/update_cocosfiles_1428464936
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-08 11:53:37 +08:00 |
CocosRobot
|
58ca1b7911
|
[AUTO]: updating luabinding automatically
|
2015-04-08 03:52:03 +00:00 |
minggo
|
c1d5185798
|
Merge pull request #11323 from CocosRobot/update_cocosfiles_1428464886
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-08 11:51:29 +08:00 |
CocosRobot
|
567af9d0d8
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-08 03:48:57 +00:00 |
CocosRobot
|
abf0a704be
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-08 03:48:08 +00:00 |
minggo
|
e9cdf333f9
|
Merge pull request #11246 from xiaofeng11/v3
V3 reader fix
|
2015-04-08 11:46:40 +08:00 |
minggo
|
f1429d21f8
|
Merge pull request #11321 from SunLightJuly/v3_fix
updated submodule
|
2015-04-08 11:46:14 +08:00 |
minggo
|
4bcfcb1d09
|
Merge pull request #11320 from samuele3hu/v3_terrain
#issue 10819:Add lua bindings for Terrain and two test cases about it.
|
2015-04-08 11:45:46 +08:00 |
SunLightJuly
|
5847325e2d
|
updated submodule
|
2015-04-08 11:37:33 +08:00 |
minggo
|
21c5bc96e5
|
Merge pull request #11319 from CocosRobot/update_lua_bindings_1428458531
[AUTO]: updating luabinding automatically
|
2015-04-08 10:53:07 +08:00 |
minggo
|
4d9e376a18
|
Merge pull request #11284 from perminovVS/v3-dev-image-format-detect-log
Log message can't detect image format
|
2015-04-08 10:52:56 +08:00 |
minggo
|
dff62e329e
|
Merge pull request #11313 from stari4ek/v3-FileUtils-constness
FileUtils: replace const_cast with mutable in path getters
|
2015-04-08 10:50:43 +08:00 |
CocosRobot
|
4bcf6b7b67
|
[AUTO]: updating luabinding automatically
|
2015-04-08 02:04:07 +00:00 |
samuele3hu
|
3a2601a1f8
|
Add lua bindings for Terrain and two test cases about it.
|
2015-04-08 10:03:50 +08:00 |
minggo
|
8f52d950de
|
Merge pull request #11309 from WenhaiLin/v3-autotest
Test automation support:Catch crash event on WIN32/MAC/IOS/ANDROID
|
2015-04-08 09:59:13 +08:00 |
minggo
|
66b6959c10
|
Merge pull request #11317 from CocosRobot/update_cocosfiles_1428458166
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-08 09:58:44 +08:00 |
CocosRobot
|
cfb11f2acf
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-08 01:56:07 +00:00 |
minggo
|
3d1cd76a06
|
Merge pull request #11315 from andyque/upgrade-3rd-party-libs-v3
Upgrade 3rd party libs
|
2015-04-08 09:54:17 +08:00 |
minggo
|
6892ec85ee
|
[ci skip]update CHANGELOG
|
2015-04-08 09:47:01 +08:00 |
andyque
|
8a4a7344b0
|
fix freetype include
|
2015-04-08 09:24:34 +08:00 |
andyque
|
1e7ec88c50
|
update config.json
|
2015-04-07 23:25:06 +08:00 |
andyque
|
ce204a11db
|
remove zlib in linux, because linux use system png and zlib
|
2015-04-07 23:20:03 +08:00 |
andyque
|
9457904fac
|
fixed freetype2 include issue
|
2015-04-07 23:20:02 +08:00 |
andyque
|
e4cf3885a5
|
use prebuilt zlib for android and mac
|
2015-04-07 23:20:02 +08:00 |
andyque
|
9f5932ceeb
|
resolve the chipmunk compile issue
|
2015-04-07 23:20:02 +08:00 |
andyque
|
b5d0b4df5e
|
upgrade libraries
|
2015-04-07 23:20:02 +08:00 |
Michael Sotnikov
|
f962e14b43
|
replace const_cast with mutable in path getters;
more getters (is*/get*) became const;
|
2015-04-07 17:15:15 +03:00 |
minggo
|
ca090281a4
|
Merge pull request #11307 from WenhaiLin/v3-label-effect
Add Label::disableEffect(LabelEffect effect) for better support disable the effect of Label.
|
2015-04-07 18:22:35 +08:00 |
minggo
|
31b21b56fe
|
[ci skip]update CHANGELOG
|
2015-04-07 18:18:22 +08:00 |
minggo
|
50fa15c0cd
|
Merge pull request #11301 from samuele3hu/v3_lua_jit
Add luajit support for iOS 64bit devices and related test cases
|
2015-04-07 18:17:09 +08:00 |
lvlong
|
c9014e12b4
|
Merge branch 'v3' of github.com:super626/cocos2d-x into v3
Conflicts:
CHANGELOG
|
2015-04-07 16:40:57 +08:00 |
lvlong
|
99ef79f940
|
modify INT_NEAR
|
2015-04-07 16:37:51 +08:00 |
WenhaiLin
|
6bcddbc779
|
Test automation support:Catch crash event on WIN32/MAC/IOS/ANDROID
|
2015-04-07 16:14:27 +08:00 |
minggo
|
01a9177d51
|
Merge pull request #11308 from minggo/update-release-note
[ci skip]update release note
|
2015-04-07 16:00:40 +08:00 |
minggo
|
8436ef1ab6
|
update release note
|
2015-04-07 15:59:40 +08:00 |
WenhaiLin
|
927cda3f0d
|
Add Label::disableEffect(LabelEffect effect) for better support disable the effect of Label.
|
2015-04-07 15:51:57 +08:00 |
minggo
|
ec3a114767
|
[ci skip]update CHANGELOG
|
2015-04-07 15:30:37 +08:00 |