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

18868 Commits

Author SHA1 Message Date
James Chen cd6fe294b8 Merge pull request #6288 from boyu0/bug4771_move_physicsworld_2_layer 
closed #4771: Move PhysicsWorld to Layer
 2014-04-25 11:52:32 +08:00
James Chen efd16bc37e Merge pull request #6264 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 #6366 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 #6263 from Mazyod/develop-cpp11-http-client 
closed #4702: 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 #6365 from dumganhar/pull/6012 
Merge PR #6012: Add cocos2d::RefPtr<T>
 2014-04-25 11:01:43 +08:00
James Chen 8d706060a7 Merge pull request #6358 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 #6364 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 #6325 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 #6360 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 #6359 from pandamicro/NewPhysicsSpriteFix 
Fixed #4755: Fix PhysicsSprite transform not updated issue
 2014-04-25 10:36:46 +08:00
minggo 5b0b0f0e07 [ci skip] 2014-04-24 18:21:55 +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 #4755: 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 #6356 from Dhilan007/develop_v3 
fixed drawDebugData of LabelBMFont/LabelAtlas.
 2014-04-23 15:24:30 +08:00
minggo 1c15d7fd08 Merge pull request #6355 from nutty898/develop_nutty_fixedbugofguireader 
Fixed bug of gui reader
 2014-04-23 15:16:31 +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
minggo 18f12eb5dd Merge pull request #6347 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 #6353 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 #6352 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 #6343 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 #6351 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 #6349 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 #6350 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 #6341 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 #6348 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
samuele3hu 771ce05d95 fix the bugs of SpriteTest that the Sprite created by passing rect display error 2014-04-22 13:41:10 +08:00
James Chen b8e77d8968 Fixed compilation errors when disabling CC_ENABLE_STACKABLE_ACTION 2014-04-21 22:38:15 -07:00
袁全伟 56f9def298 Update AppDelegate.cpp 
use getInstance replace :)
 2014-04-22 13:20:07 +08:00
lm 7005d6664d [Jenkins][ci skip] Clean workspace before debug build or release build 2014-04-22 12:36:40 +08:00
lm 9f7021fd6c [Jenkins][ci skip] Add [ci release xxx] command 2014-04-22 11:41:14 +08:00
minggo 4bf84f58df Merge pull request #6345 from dabingnn/develop_fix_clippingNodeTestRawStencilBug 
3.0hotfix: Node: Clipping->RawStencilTest4-6
 2014-04-22 11:36:52 +08:00
minggo 90fb49c1ad Merge pull request #6346 from natural-law/develop 
Update the reference of submodule cocos2d-console.
 2014-04-22 11:22:56 +08:00
zhangbin b7ff312c7c Update the reference of submodule cocos2d-console. 2014-04-22 11:21:13 +08:00