samuele3hu
|
c52f3b972b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
|
2014-10-29 09:43:55 +08:00 |
samuele3hu
|
9d0c8d97f9
|
Update vs project setting for lua-empty-test
|
2014-10-29 09:42:48 +08:00 |
minggo
|
baff367c94
|
Merge pull request #8918 from dumganhar/iss8843-drawpoint
closed #8843: Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
|
2014-10-27 11:38:11 +08:00 |
Dale Stammen
|
d4b4452bae
|
copy pch files to template folder
|
2014-10-24 06:08:20 -07:00 |
James Chen
|
13b51f7c73
|
Small fixes in Sprite3DTest
|
2014-10-24 12:03:42 +08:00 |
James Chen
|
603700179e
|
closed #8843: Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
|
2014-10-24 12:03:11 +08:00 |
Dale Stammen
|
f42afaa6bb
|
updated project files with new pch files
|
2014-10-23 19:40:57 -07:00 |
Dale Stammen
|
3290d75ab7
|
removed unused pch files
|
2014-10-23 19:34:55 -07:00 |
Dale Stammen
|
f8a00c8605
|
added project files for windows 8.1 universal apps
|
2014-10-23 07:41:29 -07:00 |
Dale Stammen
|
af98442e1f
|
added projects Assets
|
2014-10-23 07:35:22 -07:00 |
Dale Stammen
|
fdfc05a823
|
removed old files
|
2014-10-23 07:35:19 -07:00 |
Dale Stammen
|
96daa12a42
|
added projects Assets
|
2014-10-23 07:35:05 -07:00 |
Dale Stammen
|
4f01036bc9
|
removed old files
|
2014-10-23 07:34:21 -07:00 |
Dale Stammen
|
3795d6ac28
|
removed old files
|
2014-10-23 07:33:14 -07:00 |
Dale Stammen
|
6005ffd89d
|
remove PhoneDirect3DXamlAppComponent namespace refactor
|
2014-10-23 07:30:13 -07:00 |
Dale Stammen
|
068e574090
|
cocos2d namespace refactor
|
2014-10-23 07:26:59 -07:00 |
Dale Stammen
|
d0891a9973
|
remove PhoneDirect3DXamlAppComponent namesapce refactor
|
2014-10-23 07:24:23 -07:00 |
Dale Stammen
|
f2d9fd2746
|
enabled tests for winrt
|
2014-10-23 07:23:13 -07:00 |
Dale Stammen
|
75d37a9cc4
|
no mp3 for winrt
|
2014-10-23 07:22:05 -07:00 |
Dale Stammen
|
f359c7285e
|
remove PhoneDirect3DXamlAppComponent namespace refactor
|
2014-10-23 07:21:48 -07:00 |
samuele3hu
|
01e44c440c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
|
2014-10-22 17:07:18 +08:00 |
samuele3hu
|
d29388eb30
|
Fix some lua-tests error
|
2014-10-22 17:04:18 +08:00 |
minggo
|
b3288f7c27
|
Merge pull request #8893 from dabingnn/v3_fixTypo
[ci skip] fix typo
|
2014-10-22 14:16:07 +08:00 |
Huabing.Xu
|
ff27c3539d
|
[ci skip] fix typo
|
2014-10-21 17:37:00 +08:00 |
minggo
|
09cc636d82
|
Merge pull request #8886 from Dhilan007/v3-testcase-android
Replace CCLOG with log in ConfigurationTest
|
2014-10-21 16:06:23 +08:00 |
Dhilan007
|
4e7d03f0e5
|
Replace CCLOG with log in ConfigurationTest
|
2014-10-21 15:56:52 +08:00 |
samuele3hu
|
2f9dbb7142
|
Update cocos2d basic lua files and LabelTestNew.lua
|
2014-10-21 15:56:38 +08:00 |
minggo
|
5c2ad2b151
|
Merge pull request #8878 from minggo/fix-warning
fix warning
|
2014-10-21 13:54:49 +08:00 |
samuele3hu
|
c5abef0a60
|
Fix LuaBridgeTest require error
|
2014-10-21 11:52:33 +08:00 |
minggo
|
f3e4c705eb
|
more warnings fixed
|
2014-10-21 11:47:28 +08:00 |
minggo
|
6313f9a622
|
Merge pull request #8868 from samuele3hu/v3_new_spine
Update LuaMinXmlHttpRequest and remove some useless rename functions in the cocos2dx.ini and cocos2dx_studio.ini
|
2014-10-21 09:33:40 +08:00 |
minggo
|
b2d1549686
|
Merge pull request #8869 from Dhilan007/v3-movefile
Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d
|
2014-10-20 18:10:52 +08:00 |
samuele3hu
|
20bcafa143
|
Fix the bug that callbacks aren’t triggered when response failed
|
2014-10-20 17:43:04 +08:00 |
minggo
|
0dd8e89bb2
|
Merge pull request #8863 from Dhilan007/v3-labelfix
Fix wrong text color for system font on Linux/Window
|
2014-10-20 16:38:32 +08:00 |
Dhilan007
|
a5f838496c
|
Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d
|
2014-10-20 16:25:24 +08:00 |
minggo
|
8a76be13e4
|
Merge pull request #8865 from huangshiwu/v3_fixbug
add two missing image files for TexturePerfermancTest
|
2014-10-20 15:27:12 +08:00 |
minggo
|
f224f275ec
|
Merge pull request #8851 from pipu/#8838
Fixed #8838
|
2014-10-20 15:14:07 +08:00 |
huanghsiwu
|
8e6000ef56
|
add two missing image files for TexturePerfermancTest
|
2014-10-20 15:03:30 +08:00 |
Dhilan007
|
ae997f52ee
|
update test case of LabelTTF
|
2014-10-20 14:58:15 +08:00 |
samuele3hu
|
37ba316d0a
|
Update Lua AssetsManagerEx test
|
2014-10-20 14:12:55 +08:00 |
pipu
|
8072328ca6
|
Modify that record path of .csb file
|
2014-10-20 11:56:48 +08:00 |
Huabing.Xu
|
ede7f75f5d
|
change lua asset manager test cases
|
2014-10-20 11:54:10 +08:00 |
Huabing.Xu
|
86fedffd56
|
change asset manager to use a new resource, which will not affect other test cases
|
2014-10-20 11:03:13 +08:00 |
samuele3hu
|
66a9d1c52e
|
Fix FontTest' output error message-> “cocos2d: removeChildByTag(tag = 0): child not found!”
|
2014-10-19 22:35:30 +08:00 |
samuele3hu
|
1194873b60
|
Fix Camera3DTest has not effect on the Linux
|
2014-10-19 22:20:34 +08:00 |
samuele3hu
|
634d42775e
|
Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning
|
2014-10-19 17:00:05 +08:00 |
minggo
|
8218804c52
|
Merge pull request #8820 from Dhilan007/v3-audioengine-lua
[LUA]Add New AudioEngine on window
|
2014-10-18 15:11:29 +08:00 |
andyque
|
0dc7bbe861
|
fix long file path on WP8
|
2014-10-18 14:48:27 +08:00 |
samuele3hu
|
e74c3cd1e4
|
Remove some comments
|
2014-10-18 00:29:04 +08:00 |
samuele3hu
|
6502beaf95
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
|
2014-10-18 00:14:53 +08:00 |