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

12400 Commits

Author SHA1 Message Date
LinWenhai f861d6d2fc fix incomplete copy 2013-10-10 18:03:15 +08:00
LinWenhai 312d761390 Update build_native.cmd 2013-10-10 18:01:45 +08:00
Dhilan007 e181f7a4d2 fix copy resource error. 2013-10-10 17:10:37 +08:00
James Chen 0b1079cb8b Merge pull request #3909 from CocosRobot/updategeneratedsubmodule_1381387378 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-10-09 23:48:35 -07:00
CocosRobot 56c945efe6 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-10-10 06:43:01 +00:00
James Chen fa51236dee Update CHANGELOG[ci skip] 2013-10-10 14:40:30 +08:00
James Chen d1cd3ca5d1 Merge pull request #3903 from Dhilan007/di2899 
issues #2899:Fix application will crash when back to background on Andro...
 2013-10-09 23:38:39 -07:00
James Chen a02b2b6834 Update CHANGELOG [ci skip] 2013-10-10 13:55:22 +08:00
James Chen 8a69b194a7 Merge pull request #3599 from samuele3hu/Armature 
issue #2768:Add Armature lua binding and releated test samples
 2013-10-09 22:53:45 -07:00
samuele3hu 3104bfbe50 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature 2013-10-10 11:48:20 +08:00
samuele3hu 531e454eae Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature 
Conflicts:
	samples/samples.xcodeproj/project.pbxproj
 2013-10-10 11:47:36 +08:00
Dhilan007 6b400dd4ec rename some variable 2013-10-10 11:30:42 +08:00
Dhilan007 d3a58fa5ad Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2899 2013-10-10 11:24:35 +08:00
James Chen 4bcfd681b5 Merge pull request #3906 from Dhilan007/di2677 
Fix miss project configuration for CoreMotion.
 2013-10-09 20:15:44 -07:00
James Chen 78e3624b0b Update CHANGELOG[ci skip] 2013-10-10 11:15:22 +08:00
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 a8f0c99abf Fix miss project configuration for CoreMotion. 2013-10-10 11:12:33 +08:00
samuele3hu b5ee16399c issue #2768:Modify the linux make files of the liblua 、the testlua and hellolua projects 2013-10-10 11:09:09 +08:00
Dhilan007 a17f141e7d issues #2914:removeSpriteFramesFromFile() crashes if file doesn't exist 2013-10-10 10:28:49 +08:00
Dhilan007 7756c77651 issues #2899:Fix application will crash when back to background on Android. 2013-10-09 18:09:24 +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
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