James Chen
|
96ce8cb8cb
|
Merge pull request #6241 from andyque/fix_zfighting
closed #4761, fix zfighting between tests
|
2014-04-11 16:41:39 +08:00 |
andyque
|
83664e2322
|
closed #4761. fix a improve super class function call
|
2014-04-11 16:34:26 +08:00 |
andyque
|
4be149e492
|
closed #4761, fix zfighting between tests
|
2014-04-11 16:30:25 +08:00 |
Huabing.Xu
|
7c027b16b0
|
change assert message
|
2014-04-11 16:07:55 +08:00 |
Huabing.Xu
|
51289e8a4c
|
1. add assert condition of rendering when adding command
2. fix bug: renderTexture->SpriteRenderTextureBug
|
2014-04-11 16:05:22 +08:00 |
James Chen
|
cc0147adfe
|
Merge pull request #6239 from boyu0/label_create_refactor
Rename lua cc.Label:create to cc.Label:createWithTTF and cc.Label:create...
|
2014-04-11 15:30:04 +08:00 |
boyu0
|
b69b14382e
|
Rename lua cc.Label:create to cc.Label:createWithTTF and cc.Label.createWithSystemFont
|
2014-04-11 15:25:18 +08:00 |
James Chen
|
e24a975599
|
Merge pull request #6238 from lmskater/add-rebuild-git-fail
[Jenkins][ci skip] Add rebuild when git fail in pull request builder
|
2014-04-11 15:11:24 +08:00 |
James Chen
|
c44e2f9bc8
|
Merge pull request #6211 from chuanweizhang2013/luaruntime
update lua template runtime
|
2014-04-11 15:08:15 +08:00 |
lm
|
3088ac88f5
|
[Jenkins][ci skip] Add rebuild when git fail in pull request builder
|
2014-04-11 15:06:14 +08:00 |
James Chen
|
9bcc3facda
|
Merge pull request #6237 from samuele3hu/develop_fix
fix the crash invoked by calling the `glGetUniformfv` on the 64-bit ios
|
2014-04-11 14:54:50 +08:00 |
samuele3hu
|
2f1f09d5bf
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix
|
2014-04-11 14:35:07 +08:00 |
samuele3hu
|
5b2cf595a2
|
fix the crash invoked by calling the `glGetUniformfv`
|
2014-04-11 14:31:44 +08:00 |
James Chen
|
588d825691
|
Merge pull request #6236 from dumganhar/develop
Small fix in CCRenderer.cpp, 'auto i = 0' -> 'ssize_t i = 0' in for loop
|
2014-04-11 13:53:54 +08:00 |
James Chen
|
85cc100ac4
|
Small fix in CCRenderer.cpp, 'auto i = 0' -> 'ssize_t i = 0' in for loop
|
2014-04-11 13:51:40 +08:00 |
James Chen
|
9f1c529885
|
Update AUTHORS [ci skip]
|
2014-04-11 10:57:42 +08:00 |
James Chen
|
4c169f9867
|
Merge pull request #6232 from gaoxiaosong/develop
A warning fix in cpCollision.c
|
2014-04-11 10:56:36 +08:00 |
James Chen
|
4b2ded620c
|
Merge pull request #6234 from dumganhar/pull/6230
Merge PR #6230: Quadcommand remove unneeded codes
|
2014-04-11 10:53:45 +08:00 |
James Chen
|
48a5fd555b
|
Compilation error fix in CCQuadCommand.cpp
|
2014-04-11 10:50:38 +08:00 |
James Chen
|
dbeefcdff2
|
Merge commit 'refs/pull/6230/head' of git://github.com/cocos2d/cocos2d-x into pull/6230
|
2014-04-11 10:48:29 +08:00 |
chuanweizhang2013
|
1fadba7de1
|
add static to variable
|
2014-04-11 10:41:35 +08:00 |
chuanweizhang2013
|
41933a6fd0
|
Merge pull request #23 from cocos2d/develop
update cocos2d-x
|
2014-04-11 09:55:51 +08:00 |
James Chen
|
5bcee62708
|
Merge pull request #6231 from samuele3hu/develop_fix
fix the crash invoked by deprecated `create` function of `Label`
|
2014-04-11 09:54:29 +08:00 |
samuele3hu
|
f136108037
|
fix compile error
|
2014-04-11 09:52:09 +08:00 |
chuanweizhang2013
|
337bc2f2e8
|
Merge pull request #22 from cocos2d/develop
update cocos2d-x
|
2014-04-11 09:33:04 +08:00 |
Xiaosong Gao
|
d82c4bed75
|
In Mac OS X 10.9 and Xcode 5.1, it is a warning "Declaration shadows a local variable" in a new ios/mac project.
|
2014-04-11 08:07:18 +08:00 |
samuele3hu
|
70dec15e76
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix
|
2014-04-10 23:38:57 +08:00 |
samuele3hu
|
c687b97c6e
|
fix the crash invoked by deprecated `create` function of `Label`
|
2014-04-10 23:36:25 +08:00 |
minggo
|
951bf1cbfa
|
remove unneeded codes
|
2014-04-10 22:56:40 +08:00 |
James Chen
|
8e2bd0d2ee
|
Merge pull request #6229 from dumganhar/develop
[win32] Fix typo in cocos2d_(winrt_|wp8_)headers.props, gui -> ui
|
2014-04-10 21:16:19 +08:00 |
James Chen
|
6b21e598c5
|
[win32] Fix typo in cocos2d_(winrt_|wp8_)headers.props, gui -> ui
|
2014-04-10 21:14:24 +08:00 |
James Chen
|
cfc2a05194
|
Merge pull request #6228 from dumganhar/develop
Initializes member variables for QualCommand class.
|
2014-04-10 21:01:22 +08:00 |
James Chen
|
1fdcaaa2c6
|
Initialzies member variables for QualCommand class.
|
2014-04-10 20:31:44 +08:00 |
James Chen
|
f99b9bbabe
|
Merge pull request #6225 from heliclei/fix-console-linux-crash2
fix CCConsole linux crash
|
2014-04-10 19:57:50 +08:00 |
James Chen
|
7b4bec1395
|
Merge pull request #6226 from dumganhar/develop
Initializes member variables for TransitionScene class
|
2014-04-10 19:33:17 +08:00 |
James Chen
|
e7a4ac531a
|
Initializes member variables for TransitionScene class
|
2014-04-10 19:29:07 +08:00 |
heliclei
|
157fce785c
|
fix CCConsole linux crash
|
2014-04-10 18:31:28 +08:00 |
James Chen
|
bed5df98b7
|
Merge pull request #6224 from shujunqiao/cocos-console-test
[ci skip], fix android part in cocos-console-test.py.
|
2014-04-10 18:24:57 +08:00 |
shujunqiao
|
c937cad4c9
|
[ci skip], fix android part in cocos-console-test.py.
|
2014-04-10 18:20:53 +08:00 |
cw
|
06b727d184
|
remove comment code and rename function
|
2014-04-10 18:15:07 +08:00 |
cw
|
472e4020da
|
add new project socket lua
|
2014-04-10 18:02:47 +08:00 |
James Chen
|
167682fb46
|
Merge pull request #6222 from Dhilan007/develop
Add CCFontFNT.h to cocos2d.h
|
2014-04-10 17:33:36 +08:00 |
Dhilan007
|
8472e51b85
|
Add CCFontFNT.h to cocos2d.h
|
2014-04-10 17:31:42 +08:00 |
James Chen
|
2d131cf96a
|
Merge pull request #6221 from dumganhar/develop
Removed unused comments in GUIDefine.h
|
2014-04-10 17:19:56 +08:00 |
James Chen
|
39b25c9307
|
Removed unused comments in GUIDefine.h
|
2014-04-10 17:15:59 +08:00 |
James Chen
|
801fdde92b
|
Update CHANGELOG [ci skip]
|
2014-04-10 17:11:05 +08:00 |
James Chen
|
5d882cea23
|
Merge pull request #6213 from koowolf/wp8_fix
fix compiler error in wp8
|
2014-04-10 17:10:08 +08:00 |
James Chen
|
247f877cf4
|
Update AUTHORS [ci skip]
|
2014-04-10 17:08:02 +08:00 |
James Chen
|
443195df40
|
Merge pull request #6123 from ololomax/patch-1
set _node to null in createNodeWithSceneFile
|
2014-04-10 17:05:45 +08:00 |
James Chen
|
9c07ca5722
|
Merge pull request #6220 from Dhilan007/develop
Fixed logical error in TestChangeAnimationInternal::onExit.
|
2014-04-10 16:54:38 +08:00 |