Commit Graph

19392 Commits

Author SHA1 Message Date
James Chen cd6fe294b8 Merge pull request from boyu0/bug4771_move_physicsworld_2_layer
closed : Move PhysicsWorld to Layer
2014-04-25 11:52:32 +08:00
James Chen efd16bc37e Merge pull request from iSevenDays/patch-10
Fix loosing precision: int -> size_t for the return value of `recv`
2014-04-25 11:11:52 +08:00
James Chen 58386c7a22 Merge pull request from CocosRobot/update_cocosfiles_1398395125
[AUTO][ci skip]: updating cocos2dx_files.json
2014-04-25 11:06:26 +08:00
James Chen 328408d792 Merge pull request from Mazyod/develop-cpp11-http-client
closed : Update HTTPClient to use C++11 callbacks
2014-04-25 11:06:06 +08:00
CocosRobot 679f8c7750 [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-25 03:05:26 +00:00
James Chen cc7ded036f Merge pull request from dumganhar/pull/6012
Merge PR : Add cocos2d::RefPtr<T>
2014-04-25 11:01:43 +08:00
James Chen 8d706060a7 Merge pull request from shujunqiao/emptytest-upload
[ci skip], add ssh upload file  in emptytest.py.
2014-04-25 10:59:58 +08:00
James Chen 477fc9f0e0 Merge commit 'refs/pull/6012/head' of git://github.com/cocos2d/cocos2d-x into pull/6012
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
2014-04-25 10:59:11 +08:00
James Chen b9dc5ab4a7 Merge pull request from CocosRobot/update_cocosfiles_1398393835
[AUTO][ci skip]: updating cocos2dx_files.json
2014-04-25 10:44:36 +08:00
CocosRobot 617ccbb4fa [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-25 02:43:56 +00:00
James Chen 7beb8b78fe Merge pull request from MSOpenTech/wp8-3.0-update
Wp8 3.0 update:
Background texture is now correctly oriented in Transition Effects
Accelerometer now works for WP8. Refactor of InputEvents was required to support adding Accelerometer event to rendering queue.
Console support for WP8.
Fixed cpp template for WP8. Added missing projects. Fixed property sheets.
Updates precompiled shaders
2014-04-25 10:41:58 +08:00
James Chen 0db54caa0a Merge pull request from lmskater/add-ci-release-command
[Jenkins][ci skip] Change 'payload' to 'tag'
2014-04-25 10:37:13 +08:00
James Chen 45cc122074 Merge pull request from pandamicro/NewPhysicsSpriteFix
Fixed : Fix PhysicsSprite transform not updated issue
2014-04-25 10:36:46 +08:00
Huabing.Xu 589646343d Merge branch 'develop_migrate_math_lib_merge' into develop_migrate_math_lib 2014-04-25 10:00:03 +08:00
Huabing.Xu 7395dcbbe3 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-25 09:59:46 +08:00
minggo 5b0b0f0e07 [ci skip] 2014-04-24 18:21:55 +08:00
Huabing.Xu 1137df57e0 Merge branch 'develop_migrate_math_lib_merge' into develop_migrate_math_lib 2014-04-24 17:16:51 +08:00
Huabing.Xu c2da6727be fix compile warning after merge 2014-04-24 17:00:28 +08:00
Huabing.Xu adcacbf5eb Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
	cocos/2d/CCLabelAtlas.cpp
	cocos/2d/CCLabelAtlas.h
	cocos/2d/CCLabelBMFont.cpp
	cocos/2d/CCLabelBMFont.h
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
2014-04-24 16:58:46 +08:00
lm 41615fe56a [Jenkins][ci skip] Change 'payload' to 'tag' 2014-04-23 18:10:39 +08:00
shujunqiao c1d52f9af1 [ci skip], modify address_of_result_html display in emptytest.py. 2014-04-23 18:06:30 +08:00
shujunqiao 8b2d84a9e6 [ci skip],modify ssh directory in emptytest.py 2014-04-23 17:55:53 +08:00
pandamicro 1966d1f50e Fixed : Fix PhysicsSprite transform not updated issue 2014-04-23 17:11:55 +08:00
shujunqiao e749ab8ddb [ci skip], add ssh upload file in emptytest.py. 2014-04-23 16:32:37 +08:00
minggo 55911e1e78 Merge pull request from Dhilan007/develop_v3
fixed drawDebugData of LabelBMFont/LabelAtlas.
2014-04-23 15:24:30 +08:00
minggo 1c15d7fd08 Merge pull request from nutty898/develop_nutty_fixedbugofguireader
Fixed bug of gui reader
2014-04-23 15:16:31 +08:00
Huabing.Xu 2aa65ceee5 Fix compile warnings after merging 2014-04-23 15:13:50 +08:00
Dhilan007 a4ac5ab054 fixed drawDebugData of LabelBMFont/LabelAtlas. 2014-04-23 15:05:02 +08:00
CaiWenzhi 4750e8b417 Fixed bug of gui reader 2014-04-23 15:02:35 +08:00
Huabing.Xu 587f65098f Fix compile error after merging 2014-04-23 14:59:45 +08:00
Huabing.Xu f65973d9f0 Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
	cocos/2d/CCActionInterval.cpp
	cocos/2d/CCLabelAtlas.cpp
	cocos/2d/CCLabelBMFont.cpp
	tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
2014-04-23 14:46:14 +08:00
minggo 18f12eb5dd Merge pull request from lmskater/add-ci-release-command
[Jenkins][ci skip] Add [ci release xxx] command
2014-04-23 12:01:08 +08:00
minggo 26abba9da4 [ci skip] 2014-04-23 09:42:33 +08:00
minggo dc7955afa3 Merge pull request from Dhilan007/develop_v3
fixed compilation fails if CC_LABELBMFONT_DEBUG_DRAW or CC_LABELATLAS_DEBUG_DRAW is enabled.
2014-04-23 09:39:39 +08:00
Dhilan007 75772af82b fixed compilation fails if CC_LABELBMFONT_DEBUG_DRAW or CC_LABELATLAS_DEBUG_DRAW is enabled. 2014-04-22 23:18:23 +08:00
minggo 506d628619 Merge pull request from natural-law/develop
Solve compiling errors when some macros changed in ccConfig.h.
2014-04-22 17:00:28 +08:00
minggo ccc935137b Merge pull request from dumganhar/fixed-tilemaptest-crash
Fixed tilemaptest crashes when clicking 'next' button quickly, it could be reproduced on win32
2014-04-22 16:53:32 +08:00
zhangbin 2305ba59e6 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Conflicts:
	cocos/2d/CCActionInterval.cpp
2014-04-22 16:49:27 +08:00
zhangbin 093bd20a74 Solve compiling errors when some macros changed in ccConfig.h. 2014-04-22 16:42:13 +08:00
minggo b8be231ba5 Merge pull request from natural-law/develop
Add tip message in setup.py for prompt the usage of some environment var...
2014-04-22 15:58:23 +08:00
minggo 9abfcafd35 Merge pull request from dumganhar/config-fix
Fixed compilation errors when disabling CC_ENABLE_STACKABLE_ACTION
2014-04-22 15:56:18 +08:00
zhangbin e9fa70b101 Add tip message in setup.py for prompt the usage of some environment variable. 2014-04-22 15:55:27 +08:00
James Chen 9dec301ab3 Merge pull request from natural-law/develop
Update the reference of submodule plugin-x.
2014-04-22 15:52:52 +08:00
zhangbin b3bc69fccc Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-22 15:38:26 +08:00
James Chen 83c1c74475 Merge pull request from samuele3hu/develop_fix
fix two bugs found in the testing
2014-04-22 15:09:10 +08:00
lm 2c55c740ba [Jenkins][ci skip] Git fetch tag 2014-04-22 14:31:56 +08:00
zhangbin 7a147ce46c Update the reference of submodule plugin-x. 2014-04-22 13:55:59 +08:00
James Chen a267c8eb55 Merge pull request from qq573011406/patch-2
SimpleAudioEngine::sharedEngine() -> SimpleAudioEngine::getInstance() for cpp-template
2014-04-22 13:54:31 +08:00
samuele3hu cd2a8e90d2 Remove the comments for ClippingNodeTest 2014-04-22 13:52:52 +08:00
samuele3hu 6b34239d75 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix 2014-04-22 13:48:00 +08:00