CocosRobot
|
66906c3f66
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-20 03:38:12 +00:00 |
Dhilan007
|
fd528b389d
|
fix warning
|
2014-02-20 10:24:35 +08:00 |
Dhilan007
|
ddd02b463c
|
optimize label:
1.remove unnecessary API
2.reduces object-creation and function calls.
|
2014-02-19 20:26:14 +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 |
CocosRobot
|
1f45dd4349
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-19 08:27:37 +00:00 |
samuele3hu
|
ce1656fa8d
|
fix: The lua binding of getPropertiesForGID would lead to compile error
|
2014-02-19 15:47:45 +08:00 |
CocosRobot
|
4ecd7ba58d
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-19 05:58:15 +00: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 |
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 |
CocosRobot
|
97ff6c5bdf
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-18 08:04:14 +00: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 |
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
|
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
|
34f8f0a308
|
Uses `malloc` instead of `new[]`, keep malloc/free matching.
|
2014-02-18 11:14:02 +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 |
James Chen
|
905443d17c
|
new[] free mismatching after PR #5326.
|
2014-02-18 10:11:04 +08:00 |
heliclei
|
7283e9fdc1
|
fix console hang
|
2014-02-17 23:29:09 +08:00 |
James Chen
|
f67f324378
|
Merge commit 'refs/pull/5289/head' of git://github.com/cocos2d/cocos2d-x into merge5289
Conflicts:
cocos/2d/platform/win32/CCImage.cpp
|
2014-02-17 22:10:45 +08:00 |
James Chen
|
01b9d9be56
|
Merge pull request #5369 from Dhilan007/develop_labttfMultiline
closed #4048:fixed LabelTTFMultiline test case show nothing on mac.
|
2014-02-17 21:45:24 +08:00 |
James Chen
|
19b1945efb
|
closed #4054: Removing child from TMXLayer may cause crash.
|
2014-02-17 21:15:26 +08:00 |
heliclei
|
35ae3702f4
|
fix console readline
|
2014-02-17 16:49:57 +08:00 |
Dhilan007
|
4f94064242
|
closed #4048:fixed LabelTTFMultiline test case show nothing on mac.
|
2014-02-17 14:35:49 +08:00 |
xingsenma
|
1ec2d35631
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_20140103
|
2014-02-17 10:12:49 +08:00 |
zhangbin
|
e02f488224
|
Merge branch 'develop' into issue3964
|
2014-02-16 11:01:07 +08:00 |
heliclei
|
daf9c3f868
|
delete un-used code
|
2014-02-14 14:57:12 +08:00 |
heliclei
|
2ec75919c0
|
use stl map to oprate command
|
2014-02-14 14:54:26 +08:00 |
CocosRobot
|
a5a8ff2d87
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-14 06:22:19 +00:00 |
James Chen
|
c7b1ab4525
|
Merge pull request #5362 from ucchen/develop
closed #4037: fix copy-paste error, all spxxx_to_jsval use lower case;
|
2014-02-14 14:17:33 +08:00 |
ucchen
|
185ed86214
|
fix copy-paste error, all spxxx_to_jsval use lower case and add missing data structs getAttachment;
|
2014-02-14 13:24:56 +08:00 |
CocosRobot
|
104e0b4b29
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-14 03:24:11 +00:00 |
James Chen
|
78163e604e
|
Merge pull request #5358 from dumganhar/merge5343
closed #4037:Exposed the missing data structures of Spine to JS
|
2014-02-14 11:17:38 +08:00 |
James Chen
|
32012ee72a
|
Adds missing files for vs.
|
2014-02-14 10:53:30 +08:00 |
James Chen
|
79e7d218cb
|
Updates Android.mk
|
2014-02-14 10:37:50 +08:00 |
James Chen
|
2078f6de57
|
Updates CMakeLists.
|
2014-02-14 10:34:28 +08:00 |
James Chen
|
bc222774d8
|
Merge pull request #5354 from CocosRobot/updategeneratedsubmodule_1392341386
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-02-14 09:44:22 +08:00 |
James Chen
|
8700d0f64e
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5343
|
2014-02-14 09:44:06 +08:00 |