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

15464 Commits

Author SHA1 Message Date
James Chen e509a52551 Small fix for `FREE` wrong variable. 2013-12-28 14:38:13 +08:00
James Chen b17117a1a1 More warning fixes. 2013-12-28 14:34:52 +08:00
Roman "SBKarr b0e6b5a43f AngelCode binary file format support for LabelBMFont 2013-12-27 22:32:07 +04:00
James Chen 96b50f6d9d Merge pull request #4713 from CocosRobot/updategeneratedsubmodule_1388149934 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-27 05:51:37 -08:00
CocosRobot 2051041df7 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-27 13:12:17 +00:00
James Chen 0d16f7bc3b Merge pull request #4712 from dumganhar/cocostudio-test 
Merge PR #4672: We need to replace trigger system by EventDispatcher in future.
 2013-12-27 05:05:41 -08:00
James Chen f4825ec94a Bug fixes for cocostudio. 2013-12-27 20:54:05 +08:00
minggo 3760cddf49 Merge pull request #4705 from Dhilan007/failed_dispatch_receive 
fix failed to receive dispatch signal on some android device
 2013-12-27 04:33:30 -08:00
James Chen b03c8259b1 Merge commit 'refs/pull/4672/head' of git://github.com/cocos2d/cocos2d-x into cocostudio-test 
Conflicts:
	cocos/scripting/auto-generated
 2013-12-27 20:18:58 +08:00
James Chen d3ecc83419 Merge pull request #4711 from samuele3hu/DispatcherBak1 
Improve the coding style
 2013-12-27 04:18:05 -08:00
James Chen 73486254d6 Update AUTHORS [ci skip] 2013-12-27 20:13:40 +08:00
James Chen 6562608855 Update CHANGELOG [ci skip] 2013-12-27 20:12:52 +08:00
James Chen 6fb3a8c081 Merge pull request #4513 from gamechefs/dcurlfix 
closed #3534: Fixes to asset manager to ensure there is no crash on DNS resolver as well as no hanging if connection breaks during download
 2013-12-27 04:11:08 -08:00
samuele3hu aa0eb36071 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1 2013-12-27 20:08:09 +08:00
samuele3hu 30439e4689 Improve the coding style 2013-12-27 20:07:00 +08:00
James Chen 9baa64f274 Merge pull request #4688 from walzer/develop 
make CC_USE_PHYSICS can ACTUALLY be switch off
 2013-12-27 04:04:48 -08:00
James Chen bf881f3ac0 Merge pull request #4691 from samuele3hu/DispatcherBak1 
Reconstruct the operation of handling lua script event
 2013-12-27 03:58:08 -08:00
James Chen 65cc2d38b2 Merge pull request #4709 from nutty898/develop_nutty_modify_framework_texturebugfixed 
Develop nutty modify framework texturebugfixed
 2013-12-27 02:33:31 -08:00
CaiWenzhi af563653e2 Merge branch 'develop' into develop_nutty_modify_framework_texturebugfixed 2013-12-27 18:26:30 +08:00
CaiWenzhi d8a5fd6af4 Modify wrong codes 2013-12-27 18:23:53 +08:00
James Chen f548142ec8 Merge pull request #4708 from CocosRobot/updategeneratedsubmodule_1388139381 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-27 02:16:42 -08:00
CocosRobot 0116866e58 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-27 10:16:22 +00:00
CaiWenzhi 6fe49bf6dd Merge branch 'develop' into develop_nutty_modify_framework_texturebugfixed 2013-12-27 18:12:09 +08:00
Dhilan007 b319cb58ac fix failed to receive dispatch signal on some android device,such as [HTC EVO 3D X515m]. 2013-12-27 18:05:48 +08:00
CaiWenzhi b2da9d2da5 Fixed bugs 2013-12-27 17:58:00 +08:00
minggo 5ce228e68c Merge pull request #4703 from CocosRobot/updategeneratedsubmodule_1388138100 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-27 01:57:03 -08:00
minggo ec3b3ea012 Merge pull request #4696 from dumganhar/warning-fix 
Some warning fixes on linux.
 2013-12-27 01:56:47 -08:00
CocosRobot 68cf83ee7d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-27 09:55:01 +00:00
chengstory 3f4e4c9684 Merge branch 'develop' into #3457 2013-12-27 17:51:27 +08:00
minggo 0690305398 Merge pull request #4666 from 2youyouo2/develop 
change play interface name
 2013-12-27 01:50:08 -08:00
minggo 71f7fecd5e Merge pull request #4701 from nutty898/develop_nutty_modify_framework_bugfixed 
Develop nutty modify framework bugfixed
 2013-12-27 01:48:21 -08:00
CaiWenzhi 495e574f44 Fixed bugs 2013-12-27 17:22:51 +08:00
chengstory faaf6d3f2b fixed #3457 fixes some bug. 2013-12-27 17:21:13 +08:00
CaiWenzhi 385894548d Merge branch 'develop' into develop_nutty_modify_framework_addnewreader 2013-12-27 17:19:29 +08:00
James Chen 2db35c5126 Update CHANGELOG [ci skip] 2013-12-27 16:32:24 +08:00
James Chen a47a7075e4 Merge pull request #4699 from boyu0/iss3509_physics_switch_foreground_bug 
closed #3509: Sprites with PhysicsBody moves to wrong position when swit...
 2013-12-27 00:28:43 -08:00
James Chen 012e7f6618 Merge pull request #4698 from dumganhar/map-fix 
Removes Map<K, V>::capacity(), adds Map<K, V>::bucketCount/bucketSize/bucket methods.
 2013-12-27 00:09:21 -08:00
CaiWenzhi 6123344d9b Modify location of members define 2013-12-27 16:07:02 +08:00
CaiWenzhi 26fd64c61a Merge branch 'develop' into develop_nutty_modify_framework_addnewreader 2013-12-27 16:02:38 +08:00
CaiWenzhi e45c2a8601 Modify manager of some widgets' children 2013-12-27 16:01:03 +08:00
James Chen f8020a9318 Update AUTHORS [ci skip] 2013-12-27 15:59:05 +08:00
James Chen ff3c7ca06d Merge pull request #4697 from seobyeongky/CCData_bugfix 
CCData bugfix
 2013-12-26 23:57:34 -08:00
boyu0 1e8e15506d closed #3509: Sprites with PhysicsBody moves to wrong position when switch foreground/background. 2013-12-27 15:53:55 +08:00
James Chen 3ee48fc1ca Map::bucketSize fix. 2013-12-27 15:50:48 +08:00
walzer ece68aafc2 add Scene::update & addChild into CC_USE_PHYSICS scope, TestCpp compiles and runs successfully when CC_USE_PHYSICS == 0 2013-12-27 15:49:08 +08:00
James Chen 0d4a816e3b Removes Map<K, V>::capacity(), adds Map<K, V>::bucketCount/bucketSize/bucket methods. 2013-12-27 15:44:23 +08:00
byeonggee.seo b9d56ae793 CCData bugfix 2013-12-27 16:34:00 +09:00
CaiWenzhi 1a486f22ec Add "override" 2013-12-27 15:15:11 +08:00
James Chen febc19ea8d Some warning fixes on linux. 2013-12-26 23:06:16 -08:00
minggo 533e520c35 Merge pull request #4695 from Dhilan007/update_vs_project 
fix compiling error in vs project on win7.
 2013-12-26 22:44:28 -08:00