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

18445 Commits

Author SHA1 Message Date
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
pandamicro 7019b6e1ab Fixed #4637: Add predefined value indication in cpp 2014-04-02 12:03:42 +08:00
pandamicro 9376c7817f Reverse CONSTRUCTOR_ACCESS to protected 2014-04-02 11:57:23 +08:00
pandamicro 05899d5f6a Fixed #4637: Add loop parameter to Animation::initWithSpriteFrames function 2014-04-02 11:48:49 +08:00
James Chen 48839b9d4d closed #4635: ControlSwitch's marksprite is shown at a wrong place 2014-04-02 11:26:39 +08:00
zhangbin dbba1c44b1 Merge branch 'develop' into issue4584 2014-04-02 11:24:17 +08:00
zhangbin 3f349dfe09 closed #4584, Add feature to force update the environment variables in setup.py. 2014-04-02 11:23:10 +08:00
James Chen d7b1fecb1c Merge pull request #6100 from heliclei/fix-autotest 
Auto detect android device ip via adb command
 2014-04-02 09:57:36 +08:00
Ricardo Quesada fc7b694626 Merge pull request #6102 from ricardoquesada/quadcommand_perf_fixes 
performance fixes in QuadCommand
 2014-04-01 16:14:10 -07:00
Ricardo Quesada b36ab33281 performance fixes in QuadCommand 2014-04-01 16:13:41 -07:00
heliclei a6dd44e38c [ci skip]fix typo 2014-04-01 22:08:32 +08:00
heliclei 5d37f8960d [ci skip]auto detect android device ip via adb command 2014-04-01 22:05:47 +08:00
samuele3hu 84dd2c2a13 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 
Conflicts:
	build/android-build.py
 2014-04-01 21:04:35 +08:00
James Chen 3f6205519c Merge pull request #6099 from dumganhar/develop 
Fixed copying resource fails in empty-lua-test.
 2014-04-01 20:09:11 +08:00
James Chen 8ae82e2eb5 Fixed copying resource fails in empty-lua-test. 2014-04-01 20:06:43 +08:00
samuele3hu fff768b84b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-04-01 19:58:06 +08:00
samuele3hu 7a308feb58 update android-build.py for copying files about lua 2014-04-01 19:56:37 +08:00
minggo 95ed30e0dd [ci skip] 2014-04-01 19:37:15 +08:00
Sergey b153131097 Android crash fix on new devices 2014-04-01 15:14:25 +04:00
James Chen 47620408ea Merge pull request #6095 from samuele3hu/develop_socket 
update android-build.py for copying files about lua
 2014-04-01 18:17:33 +08:00
samuele3hu d4d8960342 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-04-01 18:13:19 +08:00
samuele3hu 6c92c10a67 update android-build.py for copying files about lua 2014-04-01 18:09:49 +08:00
James Chen ed29ce8585 Merge pull request #6094 from dumganhar/develop 
Updates templates for linux platform
 2014-04-01 16:52:25 +08:00
James Chen 96e7bad7e3 Updates templates for linux platform 2014-04-01 01:49:24 -07:00
minggo 5325cdbb38 Merge pull request #6092 from heliclei/fix-autotest 
Fix autotest infinite loop
 2014-04-01 16:15:09 +08:00
heliclei f04ca0069c fix autotest infinite loop 2014-04-01 16:05:28 +08:00
James Chen 53984e1712 Update CHANGELOG [ci skip] 2014-04-01 15:40:15 +08:00