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 |
Sergey
|
a6dc241986
|
On activity result listener added
it is strongly need fro most extensions like Game Center and In app billing
|
2014-04-09 11:27:53 +04: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 |
chuanweizhang2013
|
8ac09f0631
|
modify build-cfg.json
|
2014-04-09 14:56:46 +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 |
shujunqiao
|
2c2876698d
|
add wait/send/addCommand function for manual-console in lua_cocos2dx_manual.cpp.
|
2014-04-09 14:20:02 +08:00 |
James Chen
|
2c7ea5e729
|
Update CHANGELOG [ci skip]
|
2014-04-09 14:10:19 +08:00 |
James Chen
|
c344a1e349
|
Merge pull request #6182 from Dhilan007/develop_activity
closed #4714:Fixed Cocos2dxHelper.runOnGLThread() can not work
|
2014-04-09 14:08:06 +08:00 |
zhangbin
|
43eaccca09
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue4703
|
2014-04-09 13:47:18 +08:00 |
Darragh Coy
|
50be1ca3ad
|
Fix win32 build
|
2014-04-08 22:47:08 -07:00 |
zhangbin
|
ddffa3b120
|
closed #4703, Solve the incorrect effect of test case : RenderTexture test issue 937.
|
2014-04-09 13:40:43 +08:00 |
Darragh Coy
|
d64603a856
|
Attempt to fix the linux build.
|
2014-04-08 22:29:40 -07:00 |
James Chen
|
8e428d7321
|
Merge pull request #6163 from heliclei/fix-autotest
fix autotest touch hang:run test scene constructor in cocos thread
|
2014-04-09 13:28:30 +08:00 |
James Chen
|
d93a7e6445
|
Merge pull request #6177 from DarraghCoy/small_dangling_ptr_fix
Small dangling ptr fix to EventDispatcher::removeEventListenersForTarget
|
2014-04-09 13:22:24 +08:00 |
James Chen
|
5fae622209
|
Merge pull request #6181 from shujunqiao/console-std
modify const char* to std::string in CCConsole.
|
2014-04-09 13:21:27 +08:00 |
Huabing.Xu
|
8d01d4e07d
|
remove kmMat4 interface in cocos/2d folder
|
2014-04-09 11:53:01 +08:00 |
Huabing.Xu
|
491c97bfeb
|
remove kmMat4 interface in class RenderTexture and TextureFieldTTF file
|
2014-04-09 11:41:20 +08:00 |
Huabing.Xu
|
092d8d9ae9
|
remove kmMat4 interface in class Sprite
|
2014-04-09 11:28:34 +08:00 |
Huabing.Xu
|
e3a9972c4c
|
remove kmMat4 interface in class MotionStreak and ProgressTimer
|
2014-04-09 11:21:05 +08:00 |
Huabing.Xu
|
9496399cd0
|
remove kmMat4 interface in class Layer
|
2014-04-09 10:37:41 +08:00 |
Huabing.Xu
|
be4901d078
|
remove kmMat4 interface in class Label
|
2014-04-09 10:06:30 +08:00 |
Huabing.Xu
|
3e16857c92
|
remove kmMat4 interface in class DrawNode
|
2014-04-09 09:59:56 +08:00 |
chuanweizhang2013
|
c75466f555
|
Merge pull request #20 from cocos2d/develop
update cocos2d-x
|
2014-04-09 09:43:01 +08:00 |
Darragh Coy
|
93724b3806
|
Add in missing template parameter in function arg.
|
2014-04-08 12:34:22 -07:00 |
Darragh Coy
|
cbf85259cd
|
Convert tabs to spaces
|
2014-04-08 11:44:54 -07:00 |
Darragh Coy
|
14b210a082
|
RefPtr<T> - add move semantics
Add support for move semantics to the RefPtr<T> class. Implement a move constructor and a move assignment operator.
|
2014-04-08 11:34:27 -07:00 |
Nick Barrios
|
9c2a148256
|
CCGLView: Remove createWithFullScreen(const std::string& viewName, Size size) overload. Use more specific createWithFullScreen(const std::string& viewName, const GLFWvidmode &videoMode, GLFWmonitor *monitor) instead.
|
2014-04-08 14:02:36 -04:00 |