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

12376 Commits

Author SHA1 Message Date
James Chen 96ec8d34a9 Merge pull request #3905 from Dhilan007/di2914 
issues #2914:removeSpriteFramesFromFile() crashes if file doesn't exist
 2013-10-09 20:14:20 -07:00
Dhilan007 a17f141e7d issues #2914:removeSpriteFramesFromFile() crashes if file doesn't exist 2013-10-10 10:28:49 +08:00
James Chen e3b30b221b Update CHNAGELOG [ci skip] 2013-10-09 17:06:55 +08:00
James Chen 16fec3386b Merge pull request #3902 from rablwupei/xmlhttprequest_leak 
fix XMLHTTPRequest.cpp memory leak
 2013-10-09 02:05:10 -07:00
James Chen 6551ef2c16 Update AUTHORS [ci skip] 2013-10-09 17:04:43 +08:00
James Chen 23d1b4c3c2 Update AUTHORS [ci skip] 2013-10-09 17:00:46 +08:00
James Chen e03dd0714e Update CHANGELOG [ci skip] 2013-10-09 16:59:36 +08:00
James Chen 24fd2f2f4e Merge pull request #3901 from rablwupei/getitem_utf8 
closed #2912: fix bug: sys.localStorage.getItem() do not support utf8 in jsb.
 2013-10-09 01:57:52 -07:00
rablwupei a4053c805f fix XMLHTTPRequest.cpp memory leak 2013-10-09 16:51:37 +08:00
James Chen 46b94a2fab Merge pull request #3900 from natural-law/develop 
Solve the Chinese string from C++ to JS is messy code in plugin.
 2013-10-09 01:48:23 -07:00
rablwupei d51a04585c fix bug: sys.localStorage.getItem() do not support utf8 in jsb. 2013-10-09 16:48:05 +08:00
zhangbin 476c5647be closed #2909, Solve the Chinese string from C++ to JS is messy code in plugin. 2013-10-09 15:55:04 +08:00
James Chen a85c2a547f Merge pull request #3899 from CocosRobot/updategeneratedsubmodule_1381300081 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-10-08 23:29:31 -07:00
CocosRobot ac16283d8a [AUTO] : updating submodule reference to latest autogenerated bindings 2013-10-09 06:28:04 +00:00
James Chen 5b05731daf Update AUTHORS. 2013-10-09 14:23:36 +08:00
James Chen b54a75d47e Merge pull request #3891 from rablwupei/ccaction_array 
fixed #2733: add feature: cc.Sequence.create() and cc.Spawn.create() can pass Array actions
 2013-10-08 23:20:40 -07:00
minggo cd9689da1a [ci skip] 2013-10-09 11:27:12 +08:00
minggo 179eef9d8c [ci skip] 2013-10-09 11:25:45 +08:00
minggo 289dc7d897 Merge pull request #3894 from rablwupei/spine_leak 
[ci skip]fix memory leak in spine
 2013-10-08 20:25:02 -07:00
minggo 901c427b8d Merge pull request #3897 from CocosRobot/updategeneratedsubmodule_1381284839 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-10-08 19:17:38 -07:00
minggo 3548d46b38 [ci skip] 2013-10-09 10:17:17 +08:00
CocosRobot 938db14bc3 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-10-09 02:14:04 +00:00
minggo ce27a4eb14 [ci skip] 2013-10-09 10:13:59 +08:00
minggo 55bbbf7ed4 Merge pull request #3892 from rablwupei/script_leak 
[ci skip]fix memory leak
 2013-10-08 19:13:44 -07:00
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
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
Dhilan007 5acac436f9 issues #2677:Use CoreMotion's API to replace UIAccelerometer. 2013-10-08 10:11:52 +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
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
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
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
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