heliclei
1a1f92106a
add more console output
2014-02-20 16:29:04 +08:00
heliclei
02af73dd46
add main directive to return main menu
2014-02-20 13:43:28 +08:00
heliclei
e7209fbfa4
add autotest help
2014-02-19 17:55:32 +08:00
heliclei
f9dceb5c2d
use '==' to do string compare
2014-02-19 16:54:42 +08:00
heliclei
0eb957e89c
add console autotest support
2014-02-19 16:34:33 +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
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
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
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
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
e9c003663f
Update AUTHORS [ci skip]
2014-02-17 22:15:25 +08:00
James Chen
568d980027
Merge pull request #5375 from dumganhar/merge5289
...
Merge PR #5289 : fix string size check and assert condition
2014-02-17 22:12:07 +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
332baa2ddc
Update AUTHORS [ci skip]
2014-02-17 22:00:44 +08:00
James Chen
27542731e2
Merge pull request #5374 from justmao945/develop
...
Correcting the definition of CMake variables.
2014-02-17 21:59:44 +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
189ead7400
Merge pull request #5372 from dumganhar/iss4054-tmxlayer
...
closed #4054 : Removing child from TMXLayer may cause crash.
2014-02-17 21:30:39 +08:00
JianjunMao
789ebffb14
fix string concatenation
...
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++11") which leads to list of strings.
The result is "-stdlib=libc++;-std=c++11" if CMAKE_CXX_FLAGS is defined as "-stdlib=libc++"
2014-02-17 21:23:29 +08:00
James Chen
2ee1330479
closed #4054 : Adds test for removing child from TMXLayer.
2014-02-17 21:16:25 +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
James Chen
e550ff7741
Merge pull request #5367 from samuele3hu/developPerformance
...
issue #3708:Performance Test: data structure conversion in lua binding
2014-02-17 15:16:31 +08:00