zhangcheng
|
0121943c11
|
1. Adds SceneEditorTest hd version
|
2013-09-14 16:34:26 +08:00 |
chengstory
|
bdfde89ef8
|
Merge branch '#develop' into #4551
Conflicts:
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
|
2013-09-10 16:25:31 +08:00 |
Huabing.Xu
|
8e35e7cc27
|
issue #2782: shadertestSprite change test case textures and add normal sprite for comparison
|
2013-09-10 11:45:38 +08:00 |
zhangcheng
|
99f32077d2
|
1. upload SceneTest Resources.
|
2013-09-09 19:52:07 +08:00 |
carlo morgantini
|
ff56ad5435
|
fix bugs with new Label stuff and add new sample for unicode
|
2013-07-30 16:41:26 -07:00 |
samuele3hu
|
b48cf5997d
|
issue #2277: Add OpenGL lua test samples
|
2013-06-19 16:40:02 +08:00 |
yinkaile
|
af819c6db5
|
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
|
2013-06-08 22:09:34 +08:00 |
yinkaile
|
d29931dc4f
|
1.add hd resource
2.remove zobie resource
3.support frame event
|
2013-06-08 22:08:22 +08:00 |
James Chen
|
93ecfbbf7e
|
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into nacl-fix
|
2013-06-08 15:42:41 +08:00 |
James Chen
|
ed4b9b2bb3
|
Marmalade projects fix.
|
2013-06-06 14:26:35 +08:00 |
yinkaile
|
3cfba7bc9a
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Conflicts:
extensions/Android.mk
extensions/proj.win32/libExtensions.vcxproj.filters
samples/Cpp/TestCpp/Android.mk
samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
|
2013-06-06 12:35:18 +08:00 |
yinkaile
|
245b0395b1
|
1.upload CCArmature
|
2013-06-06 12:02:54 +08:00 |
chengstory
|
cfb424a6c9
|
1. add Component struct.
|
2013-06-04 17:38:43 +08:00 |
savdalion
|
bade1f086d
|
Added example for russian language in TestCpp / LabelTest / BMFontUnicode.
|
2013-05-04 15:28:24 +03:00 |
James Chen
|
2d1172814d
|
issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now.
|
2013-04-24 13:57:34 +08:00 |
James Chen
|
8b466f12a2
|
fixed #1838: Adding test for the new feature(Timeline callback & playing effect) of CocosBuilder.
|
2013-03-19 16:33:23 +08:00 |
James Chen
|
f69ef6182c
|
issue #1683: Adding FileUtilsTest.
|
2013-01-28 15:17:20 +08:00 |
James Chen
|
4660e72eda
|
issue #1603: Moved the position of some projects.
|
2012-12-20 12:58:21 +08:00 |