Huabing.Xu
|
84cf5ca895
|
remove kmMat4 in Director.cpp
|
2014-04-10 17:36:47 +08:00 |
Huabing.Xu
|
4e0be639a2
|
remove typo
|
2014-04-10 17:09:48 +08:00 |
Huabing.Xu
|
7441c06680
|
change matrix projection compatible with kazmath logic
|
2014-04-10 17:02:36 +08:00 |
Huabing.Xu
|
231cdcb906
|
adjust comment message
|
2014-04-10 11:14:46 +08:00 |
Huabing.Xu
|
5475a0fc02
|
fix compile error after merge
|
2014-04-10 10:58:43 +08:00 |
Huabing.Xu
|
07ac817a7c
|
Merge branch 'develop' into develop_migrate_math_lib_merge
|
2014-04-10 10:52:15 +08:00 |
Huabing.Xu
|
d865341694
|
remove kmMat4 interface in cpp-tests
|
2014-04-10 10:16:16 +08:00 |
James Chen
|
9a25613eb2
|
Merge pull request #6203 from dumganhar/develop
Fix for CC_CALLBACK_3 macro
|
2014-04-10 10:08:34 +08:00 |
James Chen
|
7db741cf42
|
Fix for CC_CALLBACK_3 macro
|
2014-04-10 10:07:01 +08:00 |
James Chen
|
3fca2a2c35
|
Merge pull request #6202 from natural-law/develop
Update the reference of submodule cocos2d-console.
|
2014-04-10 09:56:49 +08:00 |
zhangbin
|
cd6ff8f391
|
Update the reference of submodule cocos2d-console.
|
2014-04-10 09:51:46 +08:00 |
James Chen
|
a2fcc79ad0
|
Merge pull request #6201 from iSevenDays/patch-6
Fix potential memory leak in SimpleAudioEngine::preloadEffect
|
2014-04-10 09:37:12 +08:00 |
Anton Sokolchenko
|
eb568998b2
|
Update SimpleAudioEngineOpenAL.cpp
|
2014-04-10 01:00:23 +03:00 |
Anton Sokolchenko
|
5fadd6f9ab
|
Fix memory leak
471: If this executed "if (!file.file) ", then
473: dynamically allocated variable "data" is leaked.
|
2014-04-09 23:25:54 +03:00 |
minggo
|
2beed5d398
|
Merge pull request #6166 from dabingnn/develop_fix_rendererBug
Develop fix renderer bug
|
2014-04-10 00:27:33 +08:00 |
James Chen
|
a9714f1859
|
Merge pull request #6198 from dumganhar/xcode-analyze-fix
Some fixes detected by xcode analyze
|
2014-04-09 21:03:12 +08:00 |
James Chen
|
61134426a8
|
Some fixes detected by xcode analyze
|
2014-04-09 20:41:09 +08:00 |
James Chen
|
2c4d17a3e8
|
Merge pull request #6195 from iSevenDays/patch-3
Incompatible pointer type fix in cpArrayNew
|
2014-04-09 20:37:35 +08:00 |
James Chen
|
8fadeeb3e8
|
Update CHANGELOG [ci skip]
|
2014-04-09 16:49:48 +08:00 |
James Chen
|
ae02555120
|
Update AUTHORS [ci skip]
|
2014-04-09 16:47:36 +08:00 |
Anton Sokolchenko
|
e063e97a5d
|
Incompatible pointer type?
Why sizeof(void**) and not sizeof(void*)?
|
2014-04-09 11:44:01 +03:00 |
James Chen
|
1eae592ed8
|
Merge pull request #6194 from iSevenDays/patch-2
Result of 'malloc' is incompatible with type 'unsigned char *' in Image::saveImageToPNG.
|
2014-04-09 16:43:13 +08:00 |
James Chen
|
cb2f48c1e0
|
Merge pull request #6193 from shujunqiao/autotest-mac
not excute android autotest now.[ci skip]
|
2014-04-09 16:40:05 +08:00 |
Anton Sokolchenko
|
87015ae888
|
2026:72: Result of 'malloc' is incompatible with type 'unsigned char *'
2026:72: Result of 'malloc' is converted to a pointer of type 'unsigned char', which is incompatible with sizeof operand type 'unsigned char *'
|
2014-04-09 11:37:56 +03:00 |
James Chen
|
9bd3be1d03
|
Merge pull request #6186 from samuele3hu/develop_new_label
close #4721:clone for EventListeners of lua didn't clone the related property and add more EventDispatcher test cases
|
2014-04-09 16:34:37 +08:00 |
shujunqiao
|
71bc948369
|
not excute android autotest now.
|
2014-04-09 16:30:08 +08:00 |
samuele3hu
|
b6579aa322
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
|
2014-04-09 16:25:44 +08:00 |
James Chen
|
804c436433
|
Merge pull request #6192 from CocosRobot/update_cocosfiles_1397030961
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-04-09 16:23:43 +08:00 |
samuele3hu
|
7de6552f54
|
Update the NewEventDispatcherTest
|
2014-04-09 16:22:03 +08:00 |
CocosRobot
|
e272c66932
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-04-09 08:09:22 +00:00 |
James Chen
|
83eed34537
|
Merge pull request #6191 from CocosRobot/update_cocosfiles_1397030339
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-04-09 15:59:35 +08:00 |
CocosRobot
|
2a32a7a149
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-04-09 07:59:00 +00:00 |
James Chen
|
10b06c6494
|
Merge pull request #6190 from dumganhar/develop
Updates bindings-generator to the latest version.
|
2014-04-09 15:45:01 +08:00 |
James Chen
|
82333e357e
|
Updates bindings-generator to the latest version.
|
2014-04-09 15:44:07 +08:00 |
James Chen
|
d71483632f
|
Merge pull request #6187 from Dhilan007/develop_activity
closed #4659:Remove the usage of OpenSL
|
2014-04-09 15:39:06 +08:00 |
James Chen
|
ac98dc7203
|
Update CHANGELOG [ci skip]
|
2014-04-09 15:37:02 +08:00 |
James Chen
|
13c2a2d680
|
Update AUTHORS [ci skip]
|
2014-04-09 15:29:32 +08:00 |
James Chen
|
39cca5012c
|
Merge pull request #6188 from Mazyod/develop-cocos2dx
[FIX]: HTTPClient should not report 2xx status codes as errors!
|
2014-04-09 15:27:52 +08:00 |
James Chen
|
671832acb7
|
Merge pull request #6184 from shujunqiao/lua-manual-console
[lua] add wait/send/addCommand function for manual-console in lua_cocos2dx_manual.cpp
|
2014-04-09 15:16:27 +08:00 |
James Chen
|
0e505aee48
|
Merge pull request #6185 from natural-law/develop
Add environment variable into file .bashrc on Linux.
|
2014-04-09 15:11:05 +08:00 |
Mazyad Alabduljaleel
|
1928a0cb07
|
= [FIX]: HTTPClient should not report 2xx status codes as errors!
|
2014-04-09 11:07:51 +04:00 |
Dhilan007
|
d310d8d099
|
closed #4659:Remove the usage of OpenSL
|
2014-04-09 14:57:07 +08:00 |
James Chen
|
b444cd3b82
|
Merge pull request #6183 from natural-law/issue4703
Solve the incorrect effect of test case : RenderTexture Test issue 937
|
2014-04-09 14:55:40 +08:00 |
James Chen
|
3ba71c9595
|
Merge pull request #6175 from shujunqiao/cocos-console-test-package
[ci skip]add get package size in cocos-console-test.py.
|
2014-04-09 14:55:02 +08:00 |
Huabing.Xu
|
a269ac2864
|
remove kmMat4 interface in cocostudio and UI
|
2014-04-09 14:44:54 +08:00 |
zhangbin
|
9d5b36145b
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2014-04-09 14:37:15 +08:00 |
zhangbin
|
f1080c1366
|
Add environment variable into file .bashrc on Linux.
|
2014-04-09 14:33:10 +08:00 |
samuele3hu
|
1c124f52ad
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
|
2014-04-09 14:29:04 +08:00 |
samuele3hu
|
dbd01051d8
|
close #4721:clone for EventListeners of lua didn't clone the related property
|
2014-04-09 14:26:05 +08:00 |
Huabing.Xu
|
504fa2aa60
|
remove kmMat4 interface in AffineTransform
|
2014-04-09 14:21:41 +08:00 |