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
56070da720
Merge pull request #11864 from flashjay/patch-3
...
Update AssetsManager.cpp
2015-05-18 09:34:22 +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
minggo
0eeeded6a6
Merge pull request #11861 from MSOpenTech/v3-winrt-js
...
fixed include paths for arm builds
2015-05-18 09:32:28 +08:00
minggo
d9107f8830
Merge pull request #11858 from samuele3hu/v3_updateccs
...
Update CocoStudioUIEditorTest for Lua to shorten csb file name and replace some deprecated functions.
2015-05-18 09:32:06 +08:00
Vladimir Perminov
d2b58dd39b
CaptureScreen save file in thread
...
Check already working
Start save file in AsyncTaskPool::TaskType::TASK_IO
2015-05-17 20:48:49 +03:00
Vladimir Perminov
bfb3fbb1c0
Revert _checkPath
2015-05-17 19:24:57 +03:00
joshuastray
ead74ac89e
add CC_ENABLE_BULLET_INTEGRATION=1 to js project
2015-05-17 23:11:17 +08:00
Vladimir Perminov
295e8532d2
FileUtilsWin32 correct use all unicode version winapi
...
Move to FileUtilsWin32 implements:
isDirectoryExistInternal
isDirectoryExist
createDirectory
removeDirectory
removeFile
renameFile
And use common convert to wide char.
2015-05-17 12:40:14 +03:00
HuaYang Huang
8212b1398f
Update AssetsManager.cpp
...
fix: crash when default constructor params packageUrl, versionFileUrl,.. is NULL
fix: percent
2015-05-16 11:48:34 +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
samuele3hu
562c711cda
Update CocoStudioUIEditorTest for Lua and replace some deprecated functions.
2015-05-15 18:26:21 +08:00
Jacky
19c5d2dc84
fixed some memory leakage and pixel cutting.
2015-05-15 17:18:19 +08:00
minggo
e99b99cc79
Merge pull request #11853 from joshuastray/fix-resource-path
...
fix resource path for js-tests
2015-05-15 16:53:47 +08: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
joshuastray
4d0ada1cac
fix resource path for js-tests
2015-05-15 16:23:43 +08:00
minggo
8f7a023233
Merge pull request #11848 from VisualSJ/v3-build
...
Add VideoPlayer and webview tests
2015-05-15 16:19:56 +08:00
minggo
200f42a4b9
Merge pull request #11852 from natural-law/v3
...
Update the reference of submodule cocos2d-console.
2015-05-15 16:07:32 +08:00
Bin Zhang
815120d95c
Update the reference of submodule cocos2d-console.
2015-05-15 16:06:11 +08:00
andyque
be62b3a8e2
Copy missing text color property of ui::Text.
2015-05-15 16:04:34 +08:00
VisualSJ
376a3f2866
[ci skip]Fix naming errors
2015-05-15 15:45:37 +08:00
VisualSJ
01203a8b1b
Increase the VideoPlayer and webview tests
2015-05-15 15:31:03 +08:00
minggo
35af3110bf
Merge pull request #11847 from yinjimmy/fix_console
...
Fixed: app crash when console ui trace nil string on mac platform #11211
2015-05-15 15:16:03 +08:00
yinjimmy
06bd26cb63
Fixed: app crash when console ui trace nil string on mac platform #11211
2015-05-15 15:08:42 +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
jianglong0156
729416fa15
Merge pull request #5 from cocos2d/v3
...
update v3
2015-05-15 11:06:02 +08:00
minggo
182877ff6a
[ci skip]update AUTHORS
2015-05-15 10:16:54 +08:00
minggo
2489ca176e
[ci skip]update CHANGELOG
2015-05-15 10:14:26 +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
minggo
973d169cd5
Merge pull request #11841 from xiaofeng11/v3
...
shorten csb file name in ccs-res
2015-05-15 09:33:31 +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
e14643afb2
Merge pull request #11844 from ricardoquesada/perf_fixes
...
fixes memory leak
2015-05-14 18:06:27 -07:00
Ricardo Quesada
989848a358
fixes memory leak
...
improves performance a little bit
2015-05-14 17:24:27 -07:00
minggo
3a223f0732
Merge pull request #11843 from CocosRobot/update_cocosfiles_1431599536
...
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-14 18:38:04 +08:00
CocosRobot
4240632c68
[AUTO][ci skip]: updating cocos2dx_files.json
2015-05-14 10:32:18 +00:00
minggo
c6a2c8f56a
Merge pull request #11840 from natural-law/v3
...
Update the reference of submodule cocos2d-console.
2015-05-14 18:29:10 +08:00
Huabing.Xu
66a97901d2
revert submodule commit
2015-05-14 18:18:35 +08:00
xiaofeng11
f15f8e8e6a
Merge pull request #22 from doomsdayer/v3
...
changed csb names in ccs-res to shorter
2015-05-14 18:17:12 +08: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
yusheng.lu
60190a1be6
changed csb names in ccs-res to shorter
2015-05-14 18:08:37 +08:00
Bin Zhang
65ef7cea88
Update the reference of submodule cocos2d-console.
2015-05-14 18:00:47 +08:00
Vincent Yang
efc3f7cb73
Add Scene3DTest source to cpp-tests win32/win8 project.
2015-05-14 15:19:39 +08:00
Huabing.Xu
9963480abd
linux works
2015-05-14 14:49:48 +08:00