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

20761 Commits

Author SHA1 Message Date
Jason Xu 42c374157d CC_CALLBACK_2 not std::bind directly 2014-04-25 17:32:21 +08:00
James Chen d868196aae Merge pull request #6372 from twhittock/mac-application-retcodes 
Returns correct value for Application::run on Mac platform
 2014-04-25 17:19:51 +08:00
Jason Xu 5cc483276b use new ccHttpRequestCallback. 2014-04-25 17:15:57 +08:00
Tom Whittock ec42b7c76a Use correct return codes from mac CCApplication 2014-04-25 10:01:10 +01:00
Huabing.Xu 85e97f246d Merge branch 'develop_migrate_math_lib_merge' into develop_migrate_math_lib 2014-04-25 16:37:31 +08:00
Huabing.Xu dbf241c38d fix compile error after merge 2014-04-25 16:30:51 +08:00
Huabing.Xu feec24e3ef Merge branch 'v3' into develop_migrate_math_lib_merge 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/CCNode.cpp
	cocos/2d/CCRenderTexture.cpp
	cocos/2d/platform/wp8/CCGLView.h
	cocos/physics/CCPhysicsBody.cpp
	extensions/physics-nodes/CCPhysicsSprite.cpp
	extensions/physics-nodes/CCPhysicsSprite.h
	tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
 2014-04-25 16:20:24 +08:00
zhangbin 560c24a09a Update the reference of submodule plugin-x. 2014-04-25 15:26:04 +08:00
Huabing.Xu 613ba6e5b6 work on linux now 2014-04-25 15:10:37 +08:00
James Chen 828401a23d Merge pull request #6302 from zifter/FixParticle 
closed #4880: Particle systems loading incorrectly in CocosBuilder
 2014-04-25 14:15:44 +08:00
James Chen 376f8d27d9 Merge pull request #6260 from iSevenDays/patch-8 
Fix possible memory leak in Image::saveImageToPNG
 2014-04-25 13:53:55 +08:00
James Chen 8ffd663eb6 Merge pull request #6154 from newnon/develop_jni_improvements 
[android] Adds onActivityResult listeners
 2014-04-25 13:51:36 +08:00
James Chen 06d9187783 Merge pull request #6270 from andyque/feature4783 
closed #4783, add outline shader files
 2014-04-25 13:50:44 +08:00
James Chen 1b82cd7f08 Merge pull request #6093 from dplusic/develop 
fixed cc.pGetAngle not using absolute value
 2014-04-25 13:41:41 +08:00
Zhe Wang 94cae4a4e5 Update LICENSE_cocos2d-x.txt 2014-04-25 13:06:24 +08:00
James Chen 69303cbac0 Merge pull request #6367 from CocosRobot/update_lua_bindings_1398398362 
[AUTO]: updating luabinding automatically
 2014-04-25 12:42:46 +08:00
James Chen d885882ef5 Merge pull request #6291 from dumganhar/perf-callback 
Adds performance test for callbacks: 1) std::function,2) (target->*selector)(), 3) simulate new api of Scheduler
 2014-04-25 12:42:16 +08:00
James Chen 037c57ef96 Merge branch 'develop' into perf-callback 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-04-25 12:07:48 +08:00
CocosRobot e9b51a2a42 [AUTO]: updating luabinding automatically 2014-04-25 04:00:21 +00:00
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
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 #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
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