Dhilan007
|
dfc6522f5c
|
update XCode project for add miss file on Mac and IOS.
|
2014-02-19 17:11:28 +08:00 |
Dhilan007
|
f086f39319
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into new_label
|
2014-02-19 17:00:26 +08:00 |
samuele3hu
|
e1387f40eb
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
|
2014-02-19 16:57:18 +08:00 |
heliclei
|
f9dceb5c2d
|
use '==' to do string compare
|
2014-02-19 16:54:42 +08:00 |
James Chen
|
557fbe43da
|
Merge pull request #5392 from CocosRobot/updategeneratedsubmodule_1392798454
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-19 16:37:34 +08:00 |
heliclei
|
0eb957e89c
|
add console autotest support
|
2014-02-19 16:34:33 +08:00 |
CocosRobot
|
1f45dd4349
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-19 08:27:37 +00:00 |
samuele3hu
|
d7b0efd6d7
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
|
2014-02-19 16:27:08 +08:00 |
James Chen
|
fe6ec12d59
|
Merge pull request #5391 from samuele3hu/developBinding
fix: The lua binding of getPropertiesForGID would lead to compile error
|
2014-02-19 16:22:43 +08:00 |
samuele3hu
|
ce1656fa8d
|
fix: The lua binding of getPropertiesForGID would lead to compile error
|
2014-02-19 15:47:45 +08:00 |
James Chen
|
ba479b788b
|
Merge pull request #5389 from CocosRobot/updategeneratedsubmodule_1392789491
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-19 14:56:01 +08:00 |
boyu0
|
810196d25b
|
closed #2920: add a variable to save shared director.
|
2014-02-19 14:23:41 +08:00 |
boyu0
|
49cb2ce9d5
|
closed #2920: fix compile error after merge.
|
2014-02-19 14:12:57 +08:00 |
samuele3hu
|
52a0b906da
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
|
2014-02-19 13:58:15 +08:00 |
CocosRobot
|
4ecd7ba58d
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-19 05:58:15 +00:00 |
samuele3hu
|
d28e8485ec
|
issue #3229:Lua version of GLGetUniformTest raise error on iOS when calling glGetUniformfv
|
2014-02-19 13:56:06 +08:00 |
James Chen
|
e1a256d6f1
|
Merge pull request #5319 from samuele3hu/developDynamic
issue #3956:Add the conversional functions which are used in the templates of lua binding-generator
|
2014-02-19 13:52:08 +08:00 |
boyu0
|
0b07d376f6
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7
|
2014-02-19 13:42:02 +08:00 |
heliclei
|
dd9f072429
|
add more commands: resume, pause, stopanimation and startanimation
|
2014-02-19 11:19:29 +08:00 |
Nick Barrios
|
cd524d25ff
|
CCImage.cpp: initWithS3TCData() - When there is s3tc hardware support, set PixelFormat before loading mipmaps, to allow for textures with no mipmaps.
|
2014-02-18 17:42:41 -05:00 |
James Chen
|
58d3311da0
|
Merge pull request #5342 from heliclei/console-user-command
closed #4063 :revise CCConsole to support more easily for adding custom command.
|
2014-02-18 16:54:56 +08:00 |
Dhilan007
|
5361413383
|
replace [auto] with [const auto&] in FOR loop.
|
2014-02-18 16:41:01 +08:00 |
James Chen
|
6c1923562c
|
Merge pull request #5379 from CocosRobot/update_cocosfiles_1392710438
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
|
2014-02-18 16:29:20 +08:00 |
James Chen
|
977e69a841
|
Merge pull request #5380 from CocosRobot/updategeneratedsubmodule_1392710650
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-18 16:28:49 +08:00 |
CocosRobot
|
97ff6c5bdf
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-18 08:04:14 +00:00 |
CocosRobot
|
d35f7626a6
|
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
|
2014-02-18 08:00:39 +00:00 |
James Chen
|
609b937b39
|
Update CHANGELOG [ci skip]
|
2014-02-18 15:59:56 +08:00 |
James Chen
|
ee4972ae96
|
Merge pull request #5371 from andyque/refactorActionEase
closed #3620: Merge cocostudio/CCActionXxx to CCAction。
|
2014-02-18 15:58:49 +08:00 |
James Chen
|
2c49d1ae91
|
Merge pull request #5377 from samuele3hu/developEventTrigger
close #3593:Add more test cases about SceneReader of cocoStudio
|
2014-02-18 15:31:26 +08:00 |
Dhilan007
|
2ad81b0edb
|
closed #4060:fixed Label wasn't implemented correctly when Label::_fontAtlas contains multiple texture.
|
2014-02-18 14:30:51 +08:00 |
andyque
|
143f5975a6
|
fix cross-platform comiple error
details:
remove CCActionEaseEx dependency
fix compile errors on android platform
fix a few inproper decalare
fix linux compile error
fix win32 compile error
|
2014-02-18 14:22:15 +08:00 |
andyque
|
0b932f4f5f
|
fixed #3620. merge cocostudio/CCActionXXX to CCAction
|
2014-02-18 14:22:14 +08:00 |
andyque
|
e1ca972d3a
|
add tests of all the new added CCActionEaseEx in CCActionEase
|
2014-02-18 14:22:14 +08:00 |
andyque
|
6d392766a2
|
refactor easeIn, easeOut and easeInOut, elastic, bounce, back, quartic etc with free tween functions
finish refactor all ease action with tween functions
|
2014-02-18 14:22:14 +08:00 |
andyque
|
bcfa32f4e9
|
remove unused std::function declare
|
2014-02-18 14:22:14 +08:00 |
andyque
|
68b1c9f2c1
|
change CCTweenFunction class to tweenfunc namespace
|
2014-02-18 14:22:13 +08:00 |
andyque
|
838c71b135
|
refactor EaseIn with CCTweenFunction
|
2014-02-18 14:22:13 +08:00 |
andyque
|
ab11147eeb
|
rename namespace of CCTweenFunction to cocos2d and fix some compile errors
|
2014-02-18 14:22:13 +08:00 |
andyque
|
f16b0022a3
|
move CCActionEaseEx content to CCActionEase
|
2014-02-18 14:22:13 +08:00 |
andyque
|
895b2a0055
|
move CCActionEaseEx and CCTweenFunction to core engine
|
2014-02-18 14:22:12 +08:00 |
samuele3hu
|
5acb556c74
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger
|
2014-02-18 13:46:21 +08:00 |
samuele3hu
|
8cb424b535
|
close #3593:Add more test cases about SceneReader of cocoStudio
|
2014-02-18 13:44:11 +08:00 |
heliclei
|
8bad243903
|
remove redudant prompt
|
2014-02-18 12:00:23 +08:00 |
James Chen
|
19205e3db8
|
Merge pull request #5365 from natural-law/issue3964
closed #3964: Solve the bug of Image::saveImageToPNG().
|
2014-02-18 11:49:09 +08:00 |
James Chen
|
1428cea4df
|
Merge pull request #5376 from dumganhar/free-new-mistake
new[] free mismatching after PR #5326.
|
2014-02-18 11:40:40 +08:00 |
James Chen
|
34f8f0a308
|
Uses `malloc` instead of `new[]`, keep malloc/free matching.
|
2014-02-18 11:14:02 +08:00 |
James Chen
|
297fe597e1
|
Updates mac / iOS project.
|
2014-02-18 11:08:27 +08:00 |
James Chen
|
b4121f47fc
|
[Android] Don't free BitmapDC::_data in BitmapDC's destructor. Remove unused BitmapDC::env.
|
2014-02-18 11:07:58 +08:00 |
zhangbin
|
650331769a
|
closed #3964, Use GL methods instead in function RenderTexture::newImage()
|
2014-02-18 10:47:14 +08:00 |
heliclei
|
007d2c507c
|
use local variable to reduce coupling
|
2014-02-18 10:32:32 +08:00 |