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

18670 Commits

Author SHA1 Message Date
minggo f998ea058a [ci skip] 2014-04-03 10:26:34 +08:00
minggo b4225e4626 Merge pull request #6124 from koowolf/mid_resume 
fix resume not support in midi file in win32
 2014-04-03 10:22:44 +08:00
andyque 0a6b0a4389 issue #4636. refactor Scale9Sprite 2014-04-03 10:07:47 +08:00
andyque b27fe6ecc2 issue #4636. add parameter create method to UITextBMFont 2014-04-03 10:07:46 +08:00
andyque 0b5c10a0fb issue #4636. add parameter create method to UITextAtlas 2014-04-03 10:07:46 +08:00
andyque a03dc76f7d issue #4636, add parameter create method for UILoadingBar 2014-04-03 10:07:46 +08:00
andyque 92945715eb issue #4636. add parameter create function for UIText 2014-04-03 10:07:46 +08:00
andyque 558abf1a6b issue #4636, add parameter create method to UIImageView 2014-04-03 10:07:46 +08:00
andyque 18c072beff issue #4636, replace const char* to const std::string& in UIButton 2014-04-03 10:07:46 +08:00
andyque ba9a605568 issue #4636, add parameter create method to UICheckBox 2014-04-03 10:07:46 +08:00
andyque 1b0583214b issue #4636, add parameter create method to UIButton 2014-04-03 10:07:46 +08:00
koowolf 293bd5dc02 fix resume not support in midi file in win32 2014-04-03 09:55:31 +08:00
ololomax e03ef10809 set _node to null in createNodeWithSceneFile 
_node was being set to null only in constructor, so when we call method createNodeWithSceneFile with path to existing file and then call it again with path to missing file (not calling destroyInstance method), it returns a pointer to previously created node, what may lead to a crash.
 2014-04-03 03:06:08 +03:00
mgcL 4f7cb75d2b fix PhysicsShapeEdgeChain::init() always return false 2014-04-02 23:52:21 +08:00
James Chen 5a1bfaddae Merge pull request #6120 from CocosRobot/update_lua_bindings_1396435283 
[AUTO]: updating luabinding automatically
 2014-04-02 22:10:56 +08:00
CocosRobot 9799fbdf27 [AUTO]: updating luabinding automatically 2014-04-02 10:42:38 +00:00
James Chen 6223b011e8 Update CHANGELOG [ci skip] 2014-04-02 18:13:41 +08:00
James Chen 16e51a8489 Merge pull request #6110 from dumganhar/iss4639-isfileexist 
closed #4639: FileUtils::isFileExist doesn't consider SearchPaths and ResolutionOrders
 2014-04-02 18:12:29 +08:00
James Chen ae0131f917 Update CHANGELOG [ci skip] 2014-04-02 18:09:13 +08:00
James Chen c8e6f8d3ff Merge pull request #6106 from pandamicro/AnimLoopFix 
Fixed #4637: Add loop parameter to Animation::initWithSpriteFrames
 2014-04-02 18:08:03 +08:00
James Chen 6b7960f408 Merge pull request #6118 from CocosRobot/update_lua_bindings_1396432591 
[AUTO]: updating luabinding automatically
 2014-04-02 18:06:27 +08:00
pandamicro e5bf6c438f Fixed #4638: Add loop parameter to Animation::createWithSpriteFrames 2014-04-02 18:06:17 +08:00
James Chen 99d029e359 Merge pull request #6116 from natural-law/develop 
Reset projection to DEFAULT when a test case onExit() invoked.
 2014-04-02 18:05:52 +08:00
CocosRobot 59db1f300d [AUTO]: updating luabinding automatically 2014-04-02 09:58:03 +00:00
James Chen 4edf923cf8 Merge pull request #6108 from Dhilan007/develop_label 
Label: Better API order for Label class
 2014-04-02 17:47:44 +08:00
zhangbin f744ddc860 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-02 17:15:39 +08:00
James Chen 18648434ac Merge pull request #6109 from lmskater/add-jenkins-job-configs 
[Jenkins][ci skip]: add jenkins job configs
 2014-04-02 17:14:26 +08:00
James Chen 3fed509ba5 Update CHANGELOG [ci skip] 2014-04-02 17:13:17 +08:00
zhangbin 0e0000e6d5 The projection reset to DEFAULT when a test case onExit(). 2014-04-02 17:12:09 +08:00
James Chen 98f4184fb6 Merge pull request #6115 from Ryeeeeee/develop_control_swallow_touches 
fix the issue that ControlButton can't swallow touch event.
 2014-04-02 17:10:49 +08:00
James Chen 4dd41d06b9 Merge pull request #6113 from boyu0/tilemap_hd_resource_test_object_layer_tmx_fix 
fix hd resource test-object-layer.tmx settings.
 2014-04-02 17:03:42 +08:00
Ryeeeeee 432ec49c88 fix issue that ControlButton can't swallow touch event. 2014-04-02 17:01:11 +08:00
James Chen d9f16ee173 Merge pull request #6111 from samuele3hu/develop_socket 
fix error that “lua-test/opengltest/shader retro effect” test case have no effect
 2014-04-02 16:56:03 +08:00
James Chen 468d55e52d Merge pull request #6114 from linchaogithub/develop 
[Jenkins-watchdog]remove extra build_time()
 2014-04-02 16:55:34 +08:00
James Chen 12fd82aea0 Update CHANGELOG [ci skip] 2014-04-02 16:54:44 +08:00
James Chen 7f702b3fe4 Merge pull request #6107 from boyu0/iss3509_physicsbody_moves_randomly_when_switch_foreground_background 
closed #3509: Skip one frame when _deltaTime equal to zero.
 2014-04-02 16:52:43 +08:00
James Chen 1178d67dd6 issue #4639: Reverts the definition of FileUtils::isFileExist, remove 
the second parameter(outFullPath).
 2014-04-02 16:33:05 +08:00
linchaogithub 5da5f5566a [jenkins-watchdog.py]remove extra build_time() 2014-04-02 16:26:20 +08:00
linchaogithub 35b07145dd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-04-02 16:22:45 +08:00
boyu0 621b9c55d9 fix hd resource test-object-layer.tmx settings. 2014-04-02 16:18:36 +08:00
James Chen b095d5ec5b Merge pull request #6112 from CocosRobot/update_cocosfiles_1396424454 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-04-02 15:42:41 +08:00
CocosRobot 9b9c3f9b07 [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-02 07:40:55 +00:00
James Chen 236695fd08 Merge pull request #6104 from dumganhar/iss4635-constrolswitch 
closed #4635: ControlSwitch's marksprite is shown at a wrong place
 2014-04-02 15:39:33 +08:00
samuele3hu 66664e1843 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-04-02 15:36:04 +08:00
James Chen 5fa839b16b closed #4639: FileUtils::isFileExist doesn't consider SearchPaths and ResolutionOrders 2014-04-02 15:35:09 +08:00
samuele3hu 0c93c6ae60 fix error that “lua-test/opengltest/shader retro effect” test case have no effect 2014-04-02 15:34:26 +08:00
lm 8bf0ff7897 [Jenkins][ci skip]: add jenkins job configs 2014-04-02 15:21:44 +08:00
Dhilan007 5aafec462f Label:Fine tune the declaration order of API. 2014-04-02 14:57:00 +08:00
boyu0 31be60fea7 closed #3509: Skip one frame when _deltaTime equal to zero. 2014-04-02 14:05:07 +08:00
chuanweizhang2013 a6cd18d05d cmd to request 2014-04-02 13:47:09 +08:00