子龙山人
|
6f72a39eaf
|
Merge pull request #11985 from CocosRobot/update_cocosfiles_1432286362
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-22 17:57:18 +08:00 |
CocosRobot
|
b9ffada9cc
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-22 09:19:24 +00:00 |
minggo
|
311f453ea0
|
Merge pull request #11973 from dabingnn/v3_fixCameraVisitError
Fix visiting scene error with multiple camera
|
2015-05-22 17:16:30 +08:00 |
minggo
|
0fa89b94d5
|
Merge pull request #11979 from CocosRobot/update_lua_bindings_1432277469
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-22 16:24:19 +08:00 |
CocosRobot
|
f18b8bfd95
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-22 06:55:54 +00:00 |
minggo
|
35374ef7ef
|
Merge pull request #11976 from CocosRobot/update_cocosfiles_1432277244
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-22 14:50:02 +08:00 |
minggo
|
1eb8d59666
|
Merge pull request #11966 from samuele3hu/v3_httpclient
fix the memory leak of s_requestSentinel for httpclient and adjust the global static var into the object to avoid some unexpected result.
|
2015-05-22 14:47:44 +08:00 |
CocosRobot
|
3c96bbbd80
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-22 06:47:26 +00:00 |
minggo
|
e1823fb66d
|
Merge pull request #11968 from jianglong0156/rebuildAutoBindingCons
add the notification node test in sceneTest
|
2015-05-22 14:43:01 +08:00 |
minggo
|
698428e0a1
|
Merge pull request #11971 from joshuastray/physics
Physics3d js binding
|
2015-05-22 14:42:34 +08:00 |
minggo
|
11f8f0fc21
|
Merge pull request #11963 from CocosRobot/update_lua_bindings_1432259998
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-22 14:41:28 +08:00 |
minggo
|
de5cdb34d5
|
[ci skip]update CHANGELOG
|
2015-05-22 14:40:05 +08:00 |
minggo
|
27b7f2dd19
|
Merge pull request #11969 from WenhaiLin/v3-TMXTiledMap-crash
TileMap:Fixed crash if referring a non-existent layer in TMX.
|
2015-05-22 14:37:23 +08:00 |
Huabing.Xu
|
0644efc55e
|
isVisitableByVisitingCamera should not affect the calculation of transform
|
2015-05-22 13:59:45 +08:00 |
joshuastray
|
b1169c7d56
|
win32 and universal compile
|
2015-05-22 11:58:28 +08:00 |
WenhaiLin
|
fdde58386f
|
experimental::TileMap:Fixed crash if referring a non-existent layer in TMX.
|
2015-05-22 11:14:34 +08:00 |
minggo
|
bf25a0429d
|
Merge pull request #11964 from WenhaiLin/v3-console-crash
[ci skip]Add comment.
|
2015-05-22 11:05:54 +08:00 |
jianglong0156
|
6915213b86
|
add jsb binding parms which can support null object.
add the notification node test in sceneTest
|
2015-05-22 11:01:39 +08:00 |
WenhaiLin
|
2f558b5793
|
Merge branch 'tmx-crash-fix' of https://github.com/dumganhar/cocos2d-x into v3-support-android-studio
|
2015-05-22 11:01:13 +08:00 |
子龙山人
|
0ea7cd9a3c
|
Merge pull request #11961 from CocosRobot/update_cocosfiles_1432259821
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-22 10:54:08 +08:00 |
samuele3hu
|
27e7101322
|
fix the memory leak of s_requestSentinel for httpclient and adjust the global static var into the object to avoid some unexpected result.
|
2015-05-22 10:47:52 +08:00 |
joshuastray
|
1366f615dd
|
mac && ios works
|
2015-05-22 10:43:37 +08:00 |
WenhaiLin
|
a94a6baf87
|
[ci skip]Add comment.
|
2015-05-22 10:35:34 +08:00 |
CocosRobot
|
59807629d9
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-22 02:04:38 +00:00 |
CocosRobot
|
ff6f505a61
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-22 01:57:03 +00:00 |
minggo
|
d7a00b686a
|
[ci skip]update CHANGELOG
|
2015-05-22 09:53:47 +08:00 |
minggo
|
d5d329b74f
|
Merge pull request #11946 from andyque/v3-final-android-9-patch-feature
add Android 9-patch image format support
|
2015-05-22 09:52:12 +08:00 |
minggo
|
1a1860e126
|
Merge pull request #11949 from jianglong0156/modifyTestResource
Modify test resource
|
2015-05-22 09:49:08 +08:00 |
minggo
|
10fb660fca
|
Merge pull request #11947 from dabingnn/v3_bugForCameraVisitingScene
add test case to reproduce the bug for visiting scene by multiple camera
|
2015-05-22 09:47:18 +08:00 |
minggo
|
3df546a9c7
|
Merge pull request #11945 from CocosRobot/update_cocosfiles_1432191678
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-22 09:45:03 +08:00 |
minggo
|
678b279754
|
Merge pull request #11953 from MSOpenTech/v3-winrt-settings
V3: Windows 8.1 Universal App CCUserDefault implementation
|
2015-05-22 09:44:41 +08:00 |
minggo
|
36089b9bc3
|
Merge pull request #11950 from WenhaiLin/v3-console-crash
Console:Fixed crash
|
2015-05-22 09:42:41 +08:00 |
Dale Stammen
|
6c02e46865
|
fix deprecated method
|
2015-05-21 13:30:51 -07:00 |
Ricardo Quesada
|
648ca590bf
|
Merge pull request #11954 from CocosRobot/update_cocosfiles_1432238465
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-21 13:03:13 -07:00 |
CocosRobot
|
7e392635ce
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-21 20:01:07 +00:00 |
Ricardo Quesada
|
bee7eee04d
|
Merge pull request #11934 from ricardoquesada/compiler_warning_fix
adds `virtual` to destructor
|
2015-05-21 12:52:31 -07:00 |
Dale Stammen
|
7d0ca21167
|
use stringstream instead to to_string
|
2015-05-21 12:39:00 -07:00 |
Dale Stammen
|
8bb393f16f
|
use stringstream instead to to_string
|
2015-05-21 12:20:43 -07:00 |
Dale Stammen
|
382d681250
|
added winrt version of CCUserDefault
|
2015-05-21 11:23:36 -07:00 |
Dale Stammen
|
2e5b604d2f
|
added CC_PLATFORM_WINRT to comments
|
2015-05-21 11:23:20 -07:00 |
Dale Stammen
|
52546112a5
|
added tests for saving cocos2d::Data buffers
|
2015-05-21 11:22:37 -07:00 |
Dale Stammen
|
992e292338
|
added winrt version of CCUserDefault
|
2015-05-21 11:21:46 -07:00 |
joshuastray
|
342734e3b5
|
Merge remote-tracking branch 'upstream/v3' into physics
|
2015-05-21 21:15:42 +08:00 |
WenhaiLin
|
158181d4eb
|
Console:Fixed crash
|
2015-05-21 18:14:21 +08:00 |
jianglong0156
|
cf5f3c321c
|
fix invalid native object error
|
2015-05-21 18:10:00 +08:00 |
joshuastray
|
83237b8dbd
|
add physics3d js manual binding and tests
|
2015-05-21 18:05:49 +08:00 |
jianglong0156
|
9ed290e64e
|
Merge branch 'jsTest' into modifyTestResource
|
2015-05-21 17:35:13 +08:00 |
Huabing.Xu
|
2d147f0b97
|
[ci skip] and an empty line at the end of file
|
2015-05-21 17:12:35 +08:00 |
jianglong0156
|
1c32d9ed0d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into 2d-xv3
|
2015-05-21 17:01:06 +08:00 |
Huabing.Xu
|
c202cad712
|
add test case to reproduce the bug for visiting scene by multiple camera
|
2015-05-21 16:57:13 +08:00 |