Commit Graph

18919 Commits

Author SHA1 Message Date
Huabing.Xu 4ea56522e3 call director matrix stack will also call kmGLXXX functions 2014-04-02 22:46:37 +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
Huabing.Xu 78eea4a735 add loadIdentityMatrix in Director 2014-04-02 16:47:23 +08:00
Huabing.Xu 106a0da87b add matrix stack in director(will replace kmGLfunctions) 2014-04-02 16:36:11 +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
Huabing.Xu 45b0ba3871 migrate Vertex2f to Vector2(tests) 2014-04-02 15:25:50 +08:00
Huabing.Xu 2e315fb215 migrate Vertex2f to Vector2 2014-04-02 15:25:37 +08:00
Huabing.Xu 56aa50617c migrate Vertex3f to Vector3(Tests) 2014-04-02 15:25:19 +08:00
lm 8bf0ff7897 [Jenkins][ci skip]: add jenkins job configs 2014-04-02 15:21:44 +08:00
Huabing.Xu 1a454590e7 changed project file 2014-04-02 15:06:42 +08:00
Huabing.Xu 49de7511f5 migrate Vertex3f to Vector3 2014-04-02 15:06:16 +08:00
Dhilan007 5aafec462f Label:Fine tune the declaration order of API. 2014-04-02 14:57:00 +08:00
Huabing.Xu 4e93943347 minor change 2014-04-02 14:41:05 +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
Huabing.Xu 4a78008d77 namespace rename 2014-04-02 12:09:51 +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