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

12765 Commits

Author SHA1 Message Date
minggo d8d7d0b5a5 Merge pull request #3884 from samuele3hu/developPerformace 
[ci skip]issue #2792:Performance Test: Sprite drawing
 2013-10-08 19:08:48 -07:00
minggo b414caf499 Merge pull request #3889 from Dhilan007/di2895 
[ci skip]issues #2895:Synchronize JSB from master to developer
 2013-10-08 19:04:29 -07:00
rablwupei 5ea249a265 fix memory leak 2013-10-08 20:03:10 +08:00
rablwupei dee3065dbe fix memory leak 2013-10-08 19:56:03 +08:00
rablwupei 98fc2e61d2 add feature: cc.Sequence.create() and cc.Spawn.create() can pass Array actions. 
eg: cc.Sequence.create([cc.Show.create(), cc.Delay.create(1),
cc.Hide.create()]);
 2013-10-08 19:50:24 +08:00
Dhilan007 20971b0ad2 issues #2895:Synchronize JSB from master to developer 2013-10-08 15:57:34 +08:00
samuele3hu 508654738a issue #2768:Modify armature test sample and skip some functions to lua 2013-10-08 15:45:13 +08:00
minggo a92db78c11 Merge pull request #3885 from Dhilan007/di2677 
[ci skip]issues #2677:Use CoreMotion's API to replace UIAccelerometer.
 2013-10-07 23:08:38 -07:00
LinWenhai 5a5dd2da14 Update CCDevice.mm 2013-10-08 13:44:35 +08:00
minggo 80d8eaadc7 Merge pull request #3887 from dabingnn/iss2425_HoleDemo_UniformError 
[ci skip]closed #2425: fix hole demo test error, we should use GLprogram before w...
 2013-10-07 20:55:00 -07:00
Huabing.Xu 44a63bb885 closed #2425: fix hole demo test error, we should use GLprogram before we set uniform to them 2013-10-08 11:48:57 +08:00
Dhilan007 8dc55b3773 issues #2677:Use CoreMotion's API to replace UIAccelerometer. 2013-10-08 11:08:45 +08:00
samuele3hu 4c1bd825af Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature 2013-10-08 10:17:58 +08:00
Dhilan007 5acac436f9 issues #2677:Use CoreMotion's API to replace UIAccelerometer. 2013-10-08 10:11:52 +08:00
boyu0 35259588a3 issue #2771: fix some bugs in PhysicsShape 2013-09-30 21:48:25 +08:00
boyu0 9c16a45f33 issue #2771: separate the PhysicsBody and the PhysicsShape. 2013-09-30 20:43:19 +08:00
samuelhu 01ee83364e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developPerformace 2013-09-30 16:23:37 +08:00
samuelhu 6aa18423e6 issue #2792 : Performance Test: Sprite drawing 2013-09-30 16:22:55 +08:00
boyu0 18a4b18368 issue #2771: move _physicsBody from sprite to node 2013-09-30 13:02:17 +08:00
minggo 97315900b0 Merge pull request #3865 from Dhilan007/develop 
[ci skip]Fix use create_project.py to create project not rename APPNAME at build_...
 2013-09-29 18:30:50 -07:00
LinWenhai 24fbe415aa Fix use create_project.py to create project not rename APPNAME at build_native.cmd. 2013-09-29 18:26:43 +08:00
boyu0 3dbe74db1a issue #2771: refactor PhysicsTest 2013-09-29 15:09:53 +08:00
minggo 0f85831997 Merge pull request #3863 from minggo/change-download-addr 
[ci skip]modify download addresss in README
 2013-09-28 20:09:14 -07:00
minggo bcff7b8568 modify download addresss in README 2013-09-29 10:54:46 +08:00
minggo aee440b4aa Merge pull request #3857 from Dhilan007/develop 
issues #2834:Use Android standalone toolchain on windows to remove the d...
 2013-09-28 19:48:21 -07:00
boyu0 fcb2c9b919 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-09-29 09:55:11 +08:00
Dhilan007 cafe930026 issues #2774:AssetsManager Test downloading progress label not sync with actual download. 2013-09-29 09:48:55 +08:00
Dhilan007 4509a4746a issues #2861:fix memory leak when loading plist file using SpriteFrameCache. 2013-09-29 09:47:34 +08:00
boyu0 dbfd05ef77 issue #2771: add tag and enable functions to physics classes 2013-09-29 09:39:20 +08:00
James Chen 7fba762f81 Update AUTHORS [ci skip] 2013-09-27 22:01:27 +08:00
James Chen eaafe91bd0 Merge pull request #3854 from pktangyue/patch3 
add *.xccheckout to gitignore
 2013-09-27 07:00:38 -07:00
Dhilan007 9727436a5d issues #2834:Use Android standalone toolchain on windows to remove the dependence of cygwin 2013-09-27 21:54:48 +08:00
pktangyue 4c1864daa3 add *.xccheckout to gitignore 2013-09-27 17:22:55 +08:00
Ricardo Quesada 8989e5ce58 Merge pull request #3853 from ricardoquesada/test_compiles_with_box2d 
Test compiles with box2d enabled
 2013-09-26 16:23:50 -07:00
Ricardo Quesada cc4695507a Test compiles with box2d enabled 2013-09-26 16:23:13 -07:00
minggo 34db4dc955 Merge pull request #3842 from nutty898/develop_nutty_modify_version 
[ci skip]Modify version
 2013-09-25 23:17:51 -07:00
CaiWenzhi 72f02f47a0 Modify version 2013-09-26 14:16:22 +08:00
James Chen 48c77328b4 Update AUTHORS [ci skip] 2013-09-26 11:01:53 +08:00
James Chen 93436eea3c Merge pull request #3553 from DarraghCoy/ccset_leak_fix 
Fix a memory leak in Set::removeAllObjects.
 2013-09-25 20:00:08 -07:00
James Chen 610379de54 Merge pull request #3826 from michaelcontento/emscripten-fixes 
Various small Emscripten fixes
 2013-09-25 17:12:03 -07:00
Ricardo Quesada 6def9e5eb3 Merge pull request #3828 from ricardoquesada/develop 
removes unneeded comments from coding_style
 2013-09-25 13:10:35 -07:00
Ricardo Quesada f3f3771dd9 removes unneeded comments from coding_style 2013-09-25 13:09:26 -07:00
Ricardo Quesada 662f56a2fe Merge pull request #3827 from ricardoquesada/adds_missing_files 
Adds missing files
 2013-09-25 13:06:34 -07:00
Ricardo Quesada 06ff62662c Updates CHANGELOG with the new misc changes 2013-09-25 13:05:17 -07:00
Ricardo Quesada 341178cb91 Removes unneeded log 
This log is already part of `CCConfiguration`
 2013-09-25 13:03:47 -07:00
Ricardo Quesada a3c33e4728 Adds RELEASE_NOTES and CODING_SYTLE.md into Xcode 2013-09-25 13:03:23 -07:00
Ricardo Quesada 17ef2e3147 Adds CODING_STYLE.md and RELEASE_NOTES files 
The files are also added in the Xcode project
 2013-09-25 13:02:51 -07:00
Michael Contento 5ca052446c various small fixes 2013-09-25 17:57:12 +02:00
minggo ddc9da3b3a Merge pull request #3812 from nutty898/develop_nutty_modify_wrong_codes 
[ci skip]Modify wrong codes.
 2013-09-25 04:16:20 -07:00
CaiWenzhi 8a2cdf5a48 Modify wrong codes. 2013-09-25 19:04:37 +08:00