Commit Graph

14812 Commits

Author SHA1 Message Date
James Chen d72a9d2c0d Merge pull request #4727 from dumganhar/develop
Fix of wrong include symbol of CCVector.h
2013-12-29 19:55:58 -08:00
James Chen c5c03a3b35 Fix of wrong include symbol of CCVector.h 2013-12-30 11:55:01 +08:00
boyu0 a76c59f644 closed #2050: add tile map xml format test and fix tile property bug. 2013-12-30 11:33:41 +08:00
James Chen a6e61f4ce0 Merge pull request #4725 from dumganhar/iss3290-onenter-order-develop
closed #3290: [JSB] The order of onEnter and onExit is wrong. For develop branch.
2013-12-29 19:24:17 -08:00
James Chen 200f07dc34 closed #3290: [JSB] The order of onEnter and onExit is wrong. For develop branch. 2013-12-30 11:10:02 +08:00
James Chen b534442cf1 Update CHANGELOG [ci skip] 2013-12-30 10:15:10 +08:00
James Chen 871662abe9 Update AUTHORS [ci skip] 2013-12-30 10:14:25 +08:00
James Chen 31e2b3d5c2 Merge pull request #4715 from SBKarr/develop
closed #3542: AngelCode binary file format support for LabelBMFont.
2013-12-29 18:11:19 -08:00
zarelaky 2822066a5f openal context not destroy correctly on mac and ios 2013-12-30 08:37:36 +08:00
Roman "SBKarr 93f6d9c4f5 Added test case for binary fnt file
Also, fixed nul-termination issue in file parsing
2013-12-28 23:00:07 +04:00
James Chen aa33519a94 Merge pull request #4717 from CocosRobot/updategeneratedsubmodule_1388213983
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-27 23:41:46 -08:00
CocosRobot 203b0f183e [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-28 06:59:45 +00:00
James Chen badcbeb828 Merge pull request #4716 from dumganhar/warning-fix
More warning fixes.
2013-12-27 22:54:47 -08:00
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