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

1047 Commits

Author SHA1 Message Date
James Chen 5e6130c92c issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +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
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 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 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
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
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 2ee1330479 closed #4054: Adds test for removing child from TMXLayer. 2014-02-17 21:16:25 +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
zhangbin e02f488224 Merge branch 'develop' into issue3964 2014-02-16 11:01:07 +08: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 a5aa547c7b Merge pull request #5316 from natural-law/ScenarioTest 
closed #3738: Add performance test case on game scenario.
 2014-02-14 11:12:01 +08:00
James Chen f04e604a51 Updates JS-Tests. 2014-02-14 10:27:19 +08:00
James Chen ea7a27fdf7 Updates JS-Tests. 2014-02-14 09:59:54 +08:00
James Chen 17dab13502 Resets JS-Tests. 2014-02-14 09:36:27 +08:00
James Chen acefa4e237 Merge commit 'refs/pull/5343/head' of git://github.com/cocos2d/cocos2d-x into merge5343 2014-02-14 09:33:42 +08:00
James Chen 4837b2dd2d issue #3990: setTotalParticles works as expected. _emissionRate has to be updated in setTotalParticles. 2014-02-13 17:01:38 +08:00
zhangbin 8ae5d2a049 closed #3964, Solve the bug of logic code in method Image::saveImageToPNG(). 2014-02-13 16:22:41 +08:00
ucchen 6e742077c2 add spine setAnimationListener test; 2014-02-13 11:58:54 +08:00
heliclei 9befe56a7e update unit test 2014-02-13 11:10:23 +08:00
James Chen 5da57e4c7d closed #3990: Adds test case for issue 3990. 2014-02-13 11:03:35 +08:00
ucchen 2c961bdfbf add spine manual binding; 2014-02-13 11:01:54 +08:00
Éloi Rivard 8adca38efa Linux javascript bindings support. 
- Adds Linux javascript test.
- Adds Linux javascript template.
- Adds Travis CI test.
 2014-02-13 01:42:14 +01:00
samuele3hu 3d0fabe08c issue #3708:Performance Test: data structure conversion in lua binding 2014-02-12 18:19:06 +08:00
boyu0 e7c077bb16 closed #3988: fix indent. 2014-02-12 16:21:26 +08:00
zhangbin bfce75f534 Merge branch 'develop' into ScenarioTest 2014-02-12 16:17:03 +08:00
zhangbin d99af40c32 issue #3738, Improve the performance test of game scenario. 2014-02-12 16:14:04 +08:00
boyu0 4fda8a2635 closed #3988: add bug test 2014-02-12 15:57:02 +08:00
zhangbin 89cc82c332 Merge branch 'develop' into ScenarioTest 2014-02-10 14:26:31 +08:00
James Chen 51ba0cbb17 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5268 2014-02-10 14:09:57 +08:00
zhangbin 11dbb37414 issue #3738, Add move actions for the tile map in PerformanceScenarioTest. 2014-02-10 14:04:21 +08:00
Dhilan007 6a662a6330 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop 2014-02-10 11:47:05 +08:00
zhangbin 926f84d385 issue #3738, Add game scenario performance test case. 2014-02-10 11:42:15 +08:00
James Chen 99c20c4e30 Merge commit 'refs/pull/5268/head' of git://github.com/cocos2d/cocos2d-x into merge5268 
Conflicts:
	tests/test-javascript/tests
 2014-02-10 11:38:56 +08:00
Ricardo Quesada 907446d8d0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into gl_vertices 2014-02-09 19:32:35 -08:00
Ricardo Quesada 24f655f9b1 Better 'vertices drawn' 2014-02-09 19:31:45 -08:00
Dhilan007 e12c1f57ac Label::reduce unnecessary calculation amount. 2014-02-10 11:21:54 +08:00
James Chen eda4c9a420 Merge pull request #5302 from Pisces000221/improve-label-chinese 
closed #3933 :A string which only contains CJK characters can't make a line-break when it's needed
 2014-02-10 11:03:03 +08:00
Dhilan007 a8387a12f0 Merge branch 'improve-label-chinese' of https://github.com/Pisces000221/cocos2d-x into develop 2014-02-10 10:09:56 +08:00
Ricardo Quesada 9d5393631c Merge branch 'develop' into fast_tmx 
Conflicts:
	tests/test-cpp/Classes/ConsoleTest/ConsoleTest.cpp
	tests/test-cpp/Classes/VisibleRect.cpp
 2014-02-08 12:49:56 -08:00
Ricardo Quesada 560abe77c8 better Console support 
* Arguments are passed as std::string
* Adds `resolution` and `projection` command
* `texture` and `fileutils` supports the `flush` argument
 2014-02-08 12:46:44 -08:00
Ricardo Quesada 13aa3ad2b5 Adds new commands to Console 
* resolution
* projection
 2014-02-08 12:35:11 -08:00
Ricardo Quesada c7a999335c Console. Less error prone, easier to use, more documentation 2014-02-08 10:20:12 -08:00
Ricardo Quesada ceba63db8b Merge branch 'develop' into fast_tmx 2014-02-08 09:08:33 -08:00
Pisces000221 03be459376 Update LabelTestNew.lua 2014-02-08 17:17:35 +08:00
Pisces000221 cef84f05af Add LabelTTFCJKWrappingTest 2014-02-08 17:16:59 +08:00