Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,677 Commits 2 Branches 34 Tags 1.2 GiB
Commit Graph

16677 Commits

Author SHA1 Message Date
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
Dhilan007 4f94064242 closed #4048:fixed LabelTTFMultiline test case show nothing on mac. 2014-02-17 14:35:49 +08:00
boyu0 a261ba9df2 issue #2920: Change internal ios keyboard type EditBox::InputMode::NUMERIC from UIKeyboardTypeNumbersAndPunctuation to UIKeyboardTypeDecimalPad 2014-02-17 14:33:26 +08:00
James Chen cae938bd4e Update CHANGELOG [ci skip] 2014-02-17 12:56:28 +08:00
James Chen 2b6e1aaca6 Merge pull request #5368 from xingsenma/develop 
closed#3947: Simulates 'setTimeout' and 'setInterval' in JSB.
 2014-02-17 12:54:12 +08:00
samuele3hu 4d35c8626c issue #3708:Remove some comments 2014-02-17 10:36:30 +08:00
samuele3hu 69ec932cd4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developPerformance 2014-02-17 10:25:24 +08:00
samuele3hu 3f8bc8cc43 issue #3708:Remove the useless test case 2014-02-17 10:24:58 +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
James Chen 426876180f Merge pull request #5363 from CocosRobot/updategeneratedsubmodule_1392358937 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-14 14:26: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
James Chen d628e7082b Merge pull request #5360 from CocosRobot/updategeneratedsubmodule_1392348248 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-14 11:25:01 +08:00
CocosRobot 104e0b4b29 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-14 03:24:11 +00:00
James Chen e016b897c3 Merge pull request #5359 from CocosRobot/update_cocosfiles_1392347985 
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
 2014-02-14 11:21:04 +08:00
James Chen 5ba38b1320 Update CHANGELOG [ci skip] 2014-02-14 11:20:34 +08:00