samuele3hu
|
bc699c1c1e
|
issue #2103 modify AudioEngine framework and CocosDenshionTest sample
|
2013-06-09 10:32:23 +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 |
chengstory
|
86f4b96f05
|
Merge branch 'master111'
Conflicts:
samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj
samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj
|
2013-06-08 20:01:25 +08:00 |
James Chen
|
4edd35e2b1
|
Merge pull request #2829 from dumganhar/nacl-fix
Fixing some issues in https://github.com/cocos2d/cocos2d-x/pull/2788
|
2013-06-08 03:00:04 -07:00 |
James Chen
|
8e29638435
|
Merge pull request #2821 from samuele3hu/audioEngine
Encapsulating SimpleAudioEngine to AudioEngine in lua and updating CocosDenshionTest.lua
|
2013-06-08 02:59:30 -07:00 |
James Chen
|
3550244399
|
Merge branches 'nacl-fix' and 'nacl-fix' of https://github.com/dumganhar/cocos2d-x into nacl-fix
|
2013-06-08 17:28:40 +08:00 |
James Chen
|
aee8e829ca
|
[Android] Updating Application.mk for HelloLua and TestLua.
|
2013-06-08 17:28:03 +08:00 |
James Chen
|
646d0aa1cf
|
[LINUX] Fix a compilation error in spine/extension.cpp.
|
2013-06-08 17:22:49 +08:00 |
chengstory
|
c2e85c1ae4
|
1. adds support for iOS and Mac.
2. Modify position of some examples.
|
2013-06-08 17:11:11 +08:00 |
minggo
|
6eaa1f97ec
|
Merge pull request #2828 from minggo/develop
fixed #2161: fixed crash of loading ETC file
|
2013-06-08 02:02:52 -07:00 |
minggo
|
d5bfe10379
|
fixed #2161: fixed crash of loading ETC file
|
2013-06-08 17:01:45 +08:00 |
minggo
|
2e9c4c55de
|
Merge pull request #2827 from minggo/master
fixed crash of loading ETC file
|
2013-06-08 02:00:19 -07:00 |
minggo
|
2b3f3b6744
|
fixed #2161: fixed crash of loading ETC file
|
2013-06-08 16:58:18 +08:00 |
James Chen
|
ab15cd8c7b
|
[CCArmature] Updating CCDatas.h. Why to name it 'CCDatas.h" ?????
|
2013-06-08 16:45:25 +08:00 |
James Chen
|
aec713ac4e
|
[CCArmature] Ignoring a warning of 'delete-non-virtual-dtor' for linux build.
|
2013-06-08 16:44:37 +08:00 |
James Chen
|
bf781feba1
|
[NaCL] Updating project.
|
2013-06-08 16:08:55 +08:00 |
James Chen
|
bb8a0d2859
|
Updating iOS Project after adding Armature support.
|
2013-06-08 16:08:05 +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
|
51aa2433fc
|
Updating makefile for native client.
|
2013-06-08 15:35:45 +08:00 |
James Chen
|
d3253dd161
|
Fixing compilation errors for native client port.
|
2013-06-08 15:28:58 +08:00 |
James Chen
|
13c70281f7
|
Update AUTHORS [ci skip]
|
2013-06-08 15:03:31 +08:00 |
James Chen
|
32609aeeef
|
Merge pull request #2824 from edwardzhou/master
Cast variables to their own type, and print warning info if no corresponding lua callback function instead of crash
|
2013-06-08 00:01:55 -07:00 |
samuele3hu
|
836bfe1d3f
|
issue #2103 modify audioEngine table name to AudioEngine
|
2013-06-08 14:06:19 +08:00 |
minggo
|
52f55802b7
|
Merge pull request #2826 from minggo/develop
make CCFileUtil::getFileData() get data correctly
|
2013-06-07 22:44:01 -07:00 |
minggo
|
f56c20657b
|
fixed #2266:make CCFileUtil::getFileData() get data correctly
|
2013-06-08 13:42:52 +08:00 |
minggo
|
ababa5e885
|
Merge pull request #2825 from minggo/master
make CCFileUtil::getFileData() get data correctly
|
2013-06-07 22:41:54 -07:00 |
minggo
|
6d3615157a
|
fixed #2266:make CCFileUtil::getFileData() get data correctly
|
2013-06-08 13:40:03 +08:00 |
Edward Zhou
|
00629f6cb9
|
1) cast variables to their own type; 2) print warning info if no corresponding lua callback function instead of crash;
|
2013-06-08 13:28:06 +08:00 |
yinkaile
|
8ff088da53
|
Standardize code
|
2013-06-08 12:14:43 +08:00 |
yinkaile
|
cba46082ce
|
Standardize code
|
2013-06-08 11:48:45 +08:00 |
James Chen
|
4e9cbdf52f
|
Merge pull request #2822 from CocosRobot/updategeneratedsubmodule_1370662398
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-06-07 20:38:01 -07:00 |
CocosRobot
|
b7fdf5a0a8
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-06-08 03:33:22 +00:00 |
samuele3hu
|
34b4cb48ab
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into audioEngine
|
2013-06-08 11:25:51 +08:00 |
minggo
|
f2be4c62ee
|
Merge pull request #2820 from minggo/develop
fixed #2161: don't close AssetManager
|
2013-06-07 20:24:27 -07:00 |
samuele3hu
|
4be415cc04
|
issue #2103 encapsulate SimpleAudioEngine to audioEngine in lua and modify CocosDenshionTest.lua
|
2013-06-08 11:23:21 +08:00 |
minggo
|
b023158c85
|
fixed #2161: don't close AssetManager
|
2013-06-08 11:23:13 +08:00 |
yinkaile
|
f2021982f4
|
Change CCAnimation to CCArmatureAnimation
|
2013-06-08 11:16:17 +08:00 |
James Chen
|
d85da8725e
|
Merge pull request #2818 from dumganhar/develop
[develop] Minor fix for CCSprite::draw(), checking whether texture is valid, if it's invalid, don't set the attribute for it.
|
2013-06-07 20:12:19 -07:00 |
James Chen
|
2fae3db792
|
Minor fix for CCSprite::draw(), checking whether texture is valid, if it's invalid, don't set the attribute for it.
|
2013-06-08 11:10:39 +08:00 |
James Chen
|
cc1bbd9508
|
Merge pull request #2816 from dumganhar/develop
[develop] new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it
|
2013-06-07 20:02:22 -07:00 |
James Chen
|
35e11ae9ff
|
Merge pull request #2814 from CocosRobot/updategeneratedsubmodule_1370659717
[AUTO] : updating submodule reference to latest autogenerated bindings [ci skip]
|
2013-06-07 20:00:56 -07:00 |
James Chen
|
e1b6832a79
|
Update AUTHORS [ci skip]
|
2013-06-08 10:59:32 +08:00 |
carlo morgantini
|
494ec43fe8
|
new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it
|
2013-06-08 10:59:07 +08:00 |
minggo
|
cdf24ceba1
|
Merge pull request #2815 from minggo/master
fix a bug of Cocos2dxETCLoader.java
|
2013-06-07 19:58:47 -07:00 |
minggo
|
206502dccb
|
fixed #2161: don't close AssetManager
|
2013-06-08 10:57:19 +08:00 |
James Chen
|
1a5de55d39
|
Merge pull request #2813 from dumganhar/ricardoquesada-tests_less_warnings
Merge https://github.com/cocos2d/cocos2d-x/pull/2812
|
2013-06-07 19:49:30 -07:00 |
CocosRobot
|
f036f7b881
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-06-08 02:48:40 +00:00 |
James Chen
|
96bcfcbf19
|
Update AUTHORS [ci skip]
|
2013-06-08 10:45:57 +08:00 |
James Chen
|
6938b27ab5
|
Merge pull request #2811 from carlomorgantinizynga/finalTTFLabelChanges
fixed #2265: new CCLabelTTF createWithFontDefinition method, and new test
|
2013-06-07 19:44:23 -07:00 |