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
|
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 |
samuele3hu
|
34b4cb48ab
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into audioEngine
|
2013-06-08 11:25:51 +08:00 |
samuele3hu
|
4be415cc04
|
issue #2103 encapsulate SimpleAudioEngine to audioEngine in lua and modify CocosDenshionTest.lua
|
2013-06-08 11:23:21 +08:00 |
yinkaile
|
f2021982f4
|
Change CCAnimation to CCArmatureAnimation
|
2013-06-08 11:16:17 +08: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 |
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 |
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 |
James Chen
|
c4b051a885
|
Update AUTHORS [ci skip]
|
2013-06-08 10:39:26 +08:00 |
James Chen
|
007a33f89a
|
Merge pull request #2809 from edwardzhou/master
issue #2103: correct the type detecting order for Lua CCBProxy::getNodeTypeName.
|
2013-06-07 19:37:19 -07:00 |
carlo morgantini
|
b7ffb5b810
|
new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it
|
2013-06-07 16:33:01 -07:00 |
yinkaile
|
7c924c714f
|
Standardize code
|
2013-06-07 22:56:54 +08:00 |
James Chen
|
2107fdddf1
|
Merge pull request #2810 from dumganhar/master
Fixing compilation errors in TestLua for Win32.
|
2013-06-07 06:25:02 -07:00 |
James Chen
|
5c8d4378a6
|
Fixing compilation errors in TestLua for Win32.
|
2013-06-07 21:23:15 +08:00 |
yinkaile
|
a959c621f2
|
Standardize code
|
2013-06-07 21:00:45 +08:00 |
yinkaile
|
1be7827d03
|
Standardize code
|
2013-06-07 20:54:35 +08:00 |
yinkaile
|
d66a3870d4
|
Standardize code
|
2013-06-07 20:07:01 +08:00 |
yinkaile
|
718a8e763e
|
Standardize code
|
2013-06-07 19:57:15 +08:00 |
Edward Zhou
|
9cc351f47b
|
correct the type detecting order forgetNodeTypeName
|
2013-06-07 19:49:22 +08:00 |
yinkaile
|
a10d0734f2
|
Standardize code
|
2013-06-07 19:48:31 +08:00 |
yinkaile
|
ba09c20434
|
Standardize code
|
2013-06-07 18:50:35 +08:00 |
James Chen
|
43e8573d8b
|
Merge pull request #2807 from dumganhar/master
[BB] Updating project configuration.
|
2013-06-07 03:49:10 -07:00 |
James Chen
|
7c650d7f28
|
[BB] Updating project configuration.
|
2013-06-07 18:45:58 +08:00 |
James Chen
|
3fc675a6df
|
[BB] Updating project configuration. especially for multi-platform-cpp/lua template.
|
2013-06-07 18:38:00 +08:00 |
yinkaile
|
6a6245eefd
|
Standardize code
|
2013-06-07 18:29:47 +08:00 |
James Chen
|
47eeed0631
|
Merge pull request #2805 from samuele3hu/test_sample_of_http_bind
Add restrictions on the use of edit box
|
2013-06-07 03:19:13 -07:00 |
James Chen
|
fc2c068a66
|
[BB] Updating project configuration.
|
2013-06-07 18:17:07 +08:00 |
James Chen
|
e3e90db71c
|
[BB] Adding extra lua script resource folder for TestLua.
|
2013-06-07 18:16:10 +08:00 |
samuele3hu
|
567d1aa039
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind
|
2013-06-07 17:49:52 +08:00 |
samuele3hu
|
dda3c34be8
|
issue #2103 add webSocket lua test sample
|
2013-06-07 17:48:07 +08:00 |
yinkaile
|
850ea39107
|
Standardize code
|
2013-06-07 17:10:53 +08:00 |
James Chen
|
39a21625ec
|
Merge pull request #2803 from samuele3hu/test_sample_of_http_bind
fixed #2103: Lua bind of websocket and add a test sample
|
2013-06-07 02:05:55 -07:00 |
samuele3hu
|
50f44db9a8
|
issue #2103 add webSocket lua test sample
|
2013-06-07 17:02:00 +08:00 |
James Chen
|
9298492384
|
Updating project configuration for Blackberry port.
|
2013-06-07 16:52:49 +08:00 |
samuele3hu
|
16a34b0da3
|
issue #2103 add webSocket lua test sample
|
2013-06-07 16:51:50 +08:00 |
yinkaile
|
2418afc96d
|
conform declare and initialize order
|
2013-06-07 16:13:08 +08:00 |
James Chen
|
942c797749
|
Removing unused codes.
|
2013-06-07 15:39:18 +08:00 |
samuele3hu
|
a2cf4933c4
|
issue #2103 add webSocket lua test sample
|
2013-06-07 14:57:36 +08:00 |
yinkaile
|
e1e41f7124
|
move const value to CCDataReaderHelper.cpp
|
2013-06-07 14:47:08 +08:00 |
yinkaile
|
d4116f8478
|
1.remove #pragma endregion
2.change str.compare("")==0 to str.length()==0
|
2013-06-07 14:01:03 +08:00 |
samuele3hu
|
cdbf8b7250
|
issue #2103 add webSocket lua test sample
|
2013-06-07 13:55:36 +08:00 |
samuele3hu
|
f58d0a04aa
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind
|
2013-06-07 12:57:04 +08:00 |