Huabing.Xu
|
6d9f850e2c
|
use trianglescommand for sprite
|
2015-05-22 15:54:56 +08:00 |
CocosRobot
|
f18b8bfd95
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-22 06:55:54 +00: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 |
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
|
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 |
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 |
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 |
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
|
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 |
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
|
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 |
joshuastray
|
83237b8dbd
|
add physics3d js manual binding and tests
|
2015-05-21 18:05:49 +08:00 |
andyque
|
0352a7a3ea
|
add Android 9-patch image format support
commit c214c4a7a457275785d6377031b5a267d543ffbb
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 17:16:09 2015 +0800
Add Android 9-patch format support.
Squashed commit of the following:
commit a5a5a7a8f25b5bddae0ba21c56676a3f8d84102a
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 17:08:05 2015 +0800
finish refactoring
commit 730bf817f833de56999c616779fc0279890e14bf
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 11:47:08 2015 +0800
refactoring 9-patch
commit b45be6d54ac6e70a3fb9aa3eb700b252e4e72a54
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 09:42:06 2015 +0800
refactor
commit 384110193f1d581c4a0fb7a2c771c55f1db63cbf
Author: andyque <guanghui8827@126.com>
Date: Fri May 15 17:59:21 2015 +0800
fix lua and Android compile error
commit 2877538fb3a436f95400b2ad637ea147b9df81d7
Author: andyque <guanghui8827@126.com>
Date: Fri May 15 11:32:43 2015 +0800
Add Android 9-patch image format support.
The 9-patch format is used for creating Scale9Sprite.
|
2015-05-21 16:04:37 +08:00 |
andyque
|
03e8f16a8a
|
add vs2015 support
|
2015-05-21 13:55:01 +08:00 |
CocosRobot
|
ad301891f0
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-21 02:46:49 +00:00 |
minggo
|
22f0e2fbbf
|
Merge pull request #11918 from WenhaiLin/v3-37
AudioEngine: Fixed play with a large audio file may fail on Win32
|
2015-05-21 10:36:08 +08:00 |
minggo
|
69b6c9a3e5
|
Merge pull request #11906 from samuele3hu/v3_check
Give more detailed tips by adding function name for luaval_to_object and update the bindings-generator submodule
|
2015-05-21 10:35:38 +08:00 |
CocosRobot
|
cb6abaa14c
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-21 01:52:51 +00:00 |
minggo
|
f1eae8f724
|
Merge pull request #11929 from namezero111111/patch-1
Fixed missing const-correctness
|
2015-05-21 09:38:24 +08:00 |
子龙山人
|
9ac23a5436
|
Merge pull request #11933 from kobake/fix-typo-angel
Fix typo: "angel" to "angle"
|
2015-05-21 09:37:53 +08:00 |
minggo
|
bfbc8d28f2
|
Merge pull request #11928 from MSOpenTech/v3-winrt-bullet3d
V3: Windows 8.1 Universal App version of Bullet 3D physics lib
|
2015-05-21 09:36:42 +08:00 |
kobake
|
d6f7a0a8a1
|
Fix typo. angel -> angle
|
2015-05-21 09:22:59 +09:00 |
Ricardo Quesada
|
f2d3ecad48
|
Removes state from MeshCommand.
MeshCommand can be reused from other objects either by passing a
`Material` or a `RenderState::StateBlock`
|
2015-05-20 15:57:26 -07:00 |
Dale Stammen
|
d70a9bf369
|
resolve full path for audio file
|
2015-05-20 11:18:54 -07:00 |
Namezero
|
89152ef514
|
Fixed missing const-correctness
|
2015-05-20 17:19:42 +02:00 |
Dale Stammen
|
209e7c62f4
|
added libbullet to Windows 8.1 Universal App projects
|
2015-05-20 08:01:01 -07:00 |
Dale Stammen
|
46a69cf00b
|
ignore warning 4996
|
2015-05-20 07:59:17 -07:00 |
Dale Stammen
|
3523173594
|
removed CC_PLATFORM_WP8
|
2015-05-20 07:58:39 -07:00 |
Dale Stammen
|
aa7876aefc
|
remove deprecated methods
|
2015-05-20 07:55:10 -07:00 |
Dale Stammen
|
14e812c7d4
|
enable CC_USE_3D_PHYSICS for CC_PLATFORM_WINRT
|
2015-05-20 07:53:49 -07:00 |
Dale Stammen
|
1b9a36f041
|
removed CC_PLATFORM_WP8 code
|
2015-05-20 07:52:59 -07:00 |
Dale Stammen
|
cada493685
|
remove deprecated methods
|
2015-05-20 07:51:52 -07:00 |
WenhaiLin
|
a569d877ba
|
[ci skip]Remove unnecessary code.
|
2015-05-20 18:05:46 +08:00 |
felixjingga
|
9c264ab64b
|
include algorithm header file
|
2015-05-20 16:42:48 +07:00 |
felixjingga
|
ee13dd82b8
|
fix compile error, and fix check of the fontname
|
2015-05-20 16:34:45 +07:00 |
WenhaiLin
|
02946a55a1
|
Fixed crash.
|
2015-05-20 17:13:04 +08:00 |
felixjingga
|
dcf4492ff0
|
add implementation detail to support BMFont
|
2015-05-20 15:56:07 +07:00 |
felixjingga
|
2d0fc637fc
|
add BMFont FontType to support BMFont
|
2015-05-20 15:50:20 +07:00 |
WenhaiLin
|
81dc551fe9
|
AudioEngine: Fixed play with a large audio file may fail on Win32.
|
2015-05-20 15:13:31 +08:00 |
minggo
|
7024d3129c
|
Merge pull request #11893 from MSOpenTech/v3-winrt-audio
New audio engine support in winrt win8.1-universal
|
2015-05-20 13:40:41 +08:00 |
minggo
|
79f70c49ce
|
Merge pull request #11905 from WenhaiLin/v3-37
Remove unnecessary files.
|
2015-05-20 13:39:36 +08:00 |
James Chen
|
07f6774cee
|
Crash fix for referring a non-existent layer in tmx.
|
2015-05-20 11:29:52 +08:00 |
minggo
|
ba694beccb
|
Merge pull request #11895 from super626/v3
fix #10767
|
2015-05-20 11:20:47 +08:00 |
minggo
|
dbf1b415a5
|
Merge pull request #11898 from WenhaiLin/v3-console-crash
Console:Fixed crash
|
2015-05-20 11:19:38 +08:00 |
joshuastray
|
712ba4f64c
|
add physics3d auto binding
|
2015-05-20 10:36:26 +08:00 |
HuaYang Huang
|
acb29ed5a8
|
fix: luaLoadChunksFromZIP should just remove .lua or .luac extension
last version may filter modules like 'framework.luaj', 'framework.luaoc'
|
2015-05-20 10:36:05 +08:00 |
samuele3hu
|
dec9acfd87
|
Give more detailed tips by adding function name for luaval_to_object and update the bindings-generator submodule
|
2015-05-20 10:26:54 +08:00 |
WenhaiLin
|
df3548673f
|
Remove unnecessary files.
|
2015-05-20 10:19:32 +08:00 |
Ricardo Quesada
|
ae413a6f6d
|
Merge pull request #11904 from ricardoquesada/meshcommand_fixes
MeshCommand uses StateBlock
|
2015-05-19 18:51:03 -07:00 |
Ricardo Quesada
|
ac54dad9a0
|
MeshCommand uses StateBlock
When MeshCommand is used with GLProgramState, it will use the StateBlock
internally, instead of the manual and error prone way of keeping state
|
2015-05-19 18:13:18 -07:00 |
Ricardo Quesada
|
5d90a8725e
|
Merge pull request #11903 from ricardoquesada/cleaner_code_properties
Terrain uses StateBlock
|
2015-05-19 18:07:50 -07:00 |
Ricardo Quesada
|
5924a917a1
|
Terrain uses StateBlock
cleaner code, conforms to new way of setting the state
|
2015-05-19 17:18:44 -07:00 |
CocosRobot
|
61aad4581a
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-19 23:02:24 +00:00 |
anniruddh.koppal
|
8432323450
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-audio
|
2015-05-19 16:01:10 -07:00 |
Ricardo Quesada
|
c28c1ffbfb
|
Merge pull request #11901 from ricardoquesada/cleaner_code_properties
Properties fixes
|
2015-05-19 15:48:08 -07:00 |
Ricardo Quesada
|
aa027fbe0f
|
Properties fixes
`createNonRefCounted` instead of `CrateWithoutAutorelease`
`readlines()` code is easier to read. Same performance
|
2015-05-19 13:51:52 -07:00 |
WenhaiLin
|
80367e978d
|
Console:Fixed crash
|
2015-05-19 18:33:06 +08:00 |
tangziwen
|
8d791390ff
|
fix crash when visiting camera is not exist
|
2015-05-19 14:47:28 +08:00 |
anniruddh.koppal
|
ea345717c7
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-audio
|
2015-05-18 23:40:28 -07:00 |
minggo
|
bb3ad7d249
|
Merge pull request #11677 from tankorsmash/patch-1
Fix setSprite never updating progress on ProgressTimer
|
2015-05-19 11:42:20 +08:00 |
Wenhai Lin
|
17f2fcd201
|
Add more comment.
|
2015-05-19 11:01:23 +08:00 |
anniruddh.koppal
|
3a8d2ffc9e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-audio
|
2015-05-18 19:23:48 -07:00 |
anniruddh.koppal
|
e0b3091dcf
|
Merge branch 'v3' of https://github.com/MSOpenTech/cocos2d-x into v3-winrt-audio
Conflicts:
tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
|
2015-05-18 19:21:48 -07:00 |
minggo
|
38773e2164
|
Merge pull request #11869 from samuele3hu/v3_updateccs
Fix the bug that tableCellSizeForIndex of tableview get the wrong result in the Lua
|
2015-05-19 09:26:09 +08:00 |
dkorchinskiy
|
03aa73d68f
|
Feature #11886 add title alignment for button
|
2015-05-18 13:33:48 +03:00 |
minggo
|
e3e78b039a
|
Merge pull request #11851 from andyque/fixIssue11769
Copy missing text color property of ui::Text.
|
2015-05-18 18:14:29 +08:00 |
samuele3hu
|
349f9bde11
|
Fix the compile error in the release mode
|
2015-05-18 17:43:20 +08:00 |
minggo
|
e700ef6d30
|
Merge pull request #11856 from WenhaiLin/v3-support-android-studio
Add Android Studio support
|
2015-05-18 16:17:24 +08:00 |
WenhaiLin
|
26f094b1a7
|
Remove unnecessary files
|
2015-05-18 16:02:05 +08:00 |
CocosRobot
|
3e08ec4c11
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-18 07:04:27 +00:00 |
WenhaiLin
|
6dd3108e42
|
Rename module
|
2015-05-18 15:01:20 +08:00 |
minggo
|
f30cb9ac19
|
Merge pull request #11877 from CocosRobot/update_lua_bindings_1431927557
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-18 14:48:42 +08:00 |
minggo
|
7b76d5fc41
|
Merge pull request #11871 from walzer/v3
fixed #11821, after release StateBlock::_defaultState, set it to null.
|
2015-05-18 14:47:16 +08:00 |
CocosRobot
|
9572de26d4
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-18 05:43:08 +00:00 |
minggo
|
c2f245733c
|
Merge pull request #11872 from xiaofeng11/v3
Fix ArmatureAnimation crash
|
2015-05-18 13:32:52 +08:00 |
minggo
|
8068a2c220
|
Merge pull request #11836 from dabingnn/v3_CameraMaskFor2DAnd3DRendering
V3 camera mask for2 d and3 d rendering
|
2015-05-18 13:32:26 +08:00 |
XiaoFeng
|
be20666b65
|
Fix ArmatureAnimation crash
|
2015-05-18 12:08:26 +08:00 |
walzer
|
02f295dfbf
|
fixed #11821, after release StateBlock::_defaultState, set it to null, because developers would reconstruct it.
|
2015-05-18 10:44:49 +08:00 |
Huabing.Xu
|
384041a950
|
improve the perfermance of clear background for camera
|
2015-05-18 10:31:17 +08:00 |
samuele3hu
|
da2314b00a
|
Fix the bug that tableCellSizeForIndex of tableview get the wrong result in the Lua
|
2015-05-18 09:41:35 +08:00 |
minggo
|
2dbe375380
|
Merge pull request #11868 from joshuastray/bullet-preprocessor-macro
add CC_ENABLE_BULLET_INTEGRATION=1 to js project
|
2015-05-18 09:33:00 +08:00 |
joshuastray
|
ead74ac89e
|
add CC_ENABLE_BULLET_INTEGRATION=1 to js project
|
2015-05-17 23:11:17 +08:00 |
anniruddh.koppal
|
2db5a89b87
|
Added new audio engine with wav support
|
2015-05-15 18:17:52 -07:00 |
unknown
|
91432f0ddf
|
fixed include paths for arm builds
|
2015-05-15 15:35:36 -07:00 |
WenhaiLin
|
dc8492948e
|
Add Android Studio support
|
2015-05-15 16:37:43 +08:00 |
samuele3hu
|
71595898ed
|
Update the Lua binding for Physics3D ,related test cases and the template project
|
2015-05-15 16:25:07 +08:00 |
andyque
|
be62b3a8e2
|
Copy missing text color property of ui::Text.
|
2015-05-15 16:04:34 +08:00 |
iris-wy
|
68ec7c8ca1
|
Add enhance service API
Add enhance service API
|
2015-05-15 14:29:22 +08:00 |
minggo
|
70cefb1589
|
Merge pull request #11845 from MSOpenTech/v3-winrt-js-fix
V3: WinRT added ignore warning 4996 to Universal App libcocos2d-jsb
|
2015-05-15 11:34:44 +08:00 |
minggo
|
5e776381aa
|
Merge pull request #11820 from Dimon4eg/v3
Fix crash in web view if illegal character in url (Android only)
|
2015-05-15 10:12:54 +08:00 |
Huabing.Xu
|
fbe49f538d
|
remove WP8 code which is added by accident when resolve merge conflicts
|
2015-05-15 10:06:44 +08:00 |
Dale Stammen
|
46c69c7793
|
added ignore warning 4996 to hide the 200 deprecated warnings in libcocos2d-jsb
|
2015-05-14 19:00:53 -07:00 |
Huabing.Xu
|
c994f28914
|
Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering
|
2015-05-15 09:55:51 +08:00 |
samuele3hu
|
fa63471c0a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d
Conflicts:
tests/cpp-tests/Classes/Physics3DTest/Physics3DTest.cpp
|
2015-05-15 09:31:53 +08:00 |
samuele3hu
|
8db62c82f8
|
Add Lua bindings for Physics3D and related test cases
|
2015-05-15 09:28:03 +08:00 |
Ricardo Quesada
|
989848a358
|
fixes memory leak
improves performance a little bit
|
2015-05-14 17:24:27 -07:00 |
minggo
|
9f3284d62f
|
Merge pull request #11833 from super626/v3
getTriangleList to bundle and add terrain to 3d render queue
|
2015-05-14 18:16:27 +08:00 |
minggo
|
0a3e6338f1
|
Merge pull request #11834 from pandamicro/v3_origin
Sync fixes in Cocos2d-JS
|
2015-05-14 13:38:18 +08:00 |
Huabing.Xu
|
84540c1ff4
|
Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering
Conflicts:
cocos/renderer/CCGLProgramCache.cpp
tests/cpp-tests/Classes/controller.cpp
|
2015-05-14 11:55:10 +08:00 |
pandamicro
|
4146a6edf4
|
Fix incorrect property of cc.Texture2D
|
2015-05-14 10:41:10 +08:00 |
pandamicro
|
2685df73f2
|
Fix spine crash issue
|
2015-05-14 10:40:37 +08:00 |
pandamicro
|
8577055d5a
|
Implement localStorage.clear on Android
|
2015-05-14 10:40:25 +08:00 |
CocosRobot
|
006f9fcd36
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-14 02:30:32 +00:00 |
yangxiao
|
e659373648
|
add getTriangleList to bundle
|
2015-05-14 10:30:20 +08:00 |
yangxiao
|
0f0f85b33c
|
terrain to 3d render queue
|
2015-05-14 10:29:50 +08:00 |
minggo
|
cbab1074fa
|
Merge pull request #11819 from cpascal/fix_defined
Fix compile error: using any of CC_USE_JPEG=0, CC_USE_PNG=0, CC_USE_TIFF=0, CC_USE_WIC=0
|
2015-05-14 10:21:38 +08:00 |
minggo
|
7732cd6e77
|
Merge pull request #11814 from super626/issue9767
add issue9767 test
|
2015-05-14 10:20:09 +08:00 |
minggo
|
1eaacd27c5
|
Merge pull request #11818 from joshuastray/fix-js-compilation
fix script binding code generation
|
2015-05-14 10:19:27 +08:00 |
Ricardo Quesada
|
fde5f8d63c
|
Adds better sample
adds clone support as well
|
2015-05-13 17:39:39 -07:00 |
Ricardo Quesada
|
aeea7ade14
|
RenderState can be part of Material and Technique
|
2015-05-13 14:12:37 -07:00 |
Ricardo Quesada
|
e95de4de62
|
fixes mipmap issue with parsing Sampler
|
2015-05-13 10:24:32 -07:00 |
dkorchinskiy
|
9d7e5e5edc
|
Fix crash in web view if illegal character in url (Android only)
|
2015-05-13 14:56:07 +03:00 |
cpascal
|
134355d763
|
Fix compile error: using any of CC_USE_JPEG=0, CC_USE_PNG=0, CC_USE_TIFF=0, CC_USE_WIC=0
When I don't want to use TIF file,
Cocos2d-x ccConfig.h's style is..
#define CC_USE_TIF 0
But CCImage.cpp just check wheather defined or not..
|
2015-05-13 20:52:32 +09:00 |
cpascal
|
7e9019f9d6
|
Revert "Fixed ogg filepath has unicode in Win32"
This reverts commit 382fd48b6a .
|
2015-05-13 20:49:46 +09:00 |
joshuastray
|
4699b0cfb5
|
fix script binding code generation
|
2015-05-13 17:51:30 +08:00 |
cpascal
|
14f8b02d9b
|
Merge remote-tracking branch 'upstream/v3' into v3
|
2015-05-13 18:28:38 +09:00 |
minggo
|
1007c0bfdb
|
Merge pull request #11813 from CocosRobot/update_lua_bindings_1431504407
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-13 17:05:27 +08:00 |
minggo
|
3d0c7705f7
|
Merge pull request #11763 from Dimon4eg/v3
Fix web view leak on iOS
|
2015-05-13 17:02:50 +08:00 |
yangxiao
|
ec69a34c51
|
add issue9767 test
|
2015-05-13 16:16:45 +08:00 |
CocosRobot
|
6bf984f3d3
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-13 08:11:34 +00:00 |
Ricardo Quesada
|
f23b15c6d3
|
Merge pull request #11810 from ricardoquesada/api_fixes
More material samples
|
2015-05-12 23:03:40 -07:00 |
minggo
|
384c20f390
|
Merge pull request #11805 from super626/physics3d2
pass parameter by reference
|
2015-05-13 13:39:49 +08:00 |
Ricardo Quesada
|
c693573d77
|
more samples
and API fixes
|
2015-05-12 22:24:52 -07:00 |
Ricardo Quesada
|
a83c10fdbf
|
Merge pull request #11807 from ricardoquesada/material_vertexattrib
Adds support of VertexAttribBinding per Pass
|
2015-05-12 21:05:02 -07:00 |
Ricardo Quesada
|
d23ff0ea2c
|
Adds support of VertexAttribBinding per Pass
|
2015-05-12 19:58:09 -07:00 |
yangxiao
|
f2eacc154b
|
use reference param
|
2015-05-13 10:13:46 +08:00 |
minggo
|
5c227f4c92
|
Merge pull request #11528 from hobogenized/my_fix_branch
Minor changes in variable names to fix Xcode warnings
|
2015-05-13 10:03:33 +08:00 |
minggo
|
56d21b6040
|
Merge pull request #11680 from kaplad/vk_fix_logical_bug
Fix a logical bug that may make wrong behavior
|
2015-05-13 09:41:20 +08:00 |
minggo
|
a587b28e38
|
Merge pull request #11792 from super626/v3
particle3d can not be seen when added to scene with terrain
|
2015-05-13 09:38:21 +08:00 |
minggo
|
5e87bd307b
|
Merge pull request #11798 from WenhaiLin/v3-support-vs2015
Add support for visual studio 2015.
|
2015-05-13 09:37:12 +08:00 |
minggo
|
b51f78aa42
|
Merge pull request #11797 from super626/physics3d2
fix wrong indent and add const
|
2015-05-13 09:36:51 +08:00 |
minggo
|
b0c7531897
|
Merge pull request #11795 from CocosRobot/update_lua_bindings_1431410101
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-13 09:35:25 +08:00 |
Dale Stammen
|
f1fe802442
|
updated winrt keyboard support to support physical keyboard
|
2015-05-12 09:20:10 -07:00 |
pandamicro
|
3190d0e5fb
|
Add localStorage.clear test case
|
2015-05-12 19:02:22 +08:00 |
pandamicro
|
c7f3c2fa8b
|
Fix Scale9Sprite's inheritance issue triggered by its constructor
|
2015-05-12 18:04:01 +08:00 |
pandamicro
|
ef0854545b
|
Fix cc.EventMouse constants issue
|
2015-05-12 18:02:36 +08:00 |
pandamicro
|
c9ee849a2c
|
Add localStorage.clear in JSB
|
2015-05-12 18:02:14 +08:00 |