Huabing.Xu
|
866c4ad735
|
remove kmMat4 in Armature
|
2014-04-11 17:25:28 +08:00 |
Huabing.Xu
|
7af4d558c6
|
remove kmMat4 in AffineTransform.cpp
|
2014-04-11 17:19:32 +08:00 |
Huabing.Xu
|
554ede75f0
|
remove kmMat4 in ActionCamera.cpp
|
2014-04-11 14:00:55 +08:00 |
Huabing.Xu
|
e5802a56da
|
remove kmMat4 in RenderTexture.cpp
|
2014-04-11 13:58:42 +08:00 |
Huabing.Xu
|
685b9ea297
|
android can work now
|
2014-04-11 12:02:56 +08:00 |
Huabing.Xu
|
1670e07300
|
Merge branch 'develop' into develop_migrate_math_lib_merge
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
|
2014-04-11 11:18:13 +08:00 |
Huabing.Xu
|
ad18add1af
|
remove kmMat4 in Sprite.cpp
|
2014-04-11 11:00:08 +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 |
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 |
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 |
Huabing.Xu
|
591b1e9231
|
remove kmMat4 in Node.cpp
|
2014-04-10 23:12:29 +08:00 |
minggo
|
951bf1cbfa
|
remove unneeded codes
|
2014-04-10 22:56:40 +08:00 |
Huabing.Xu
|
d70305cf3b
|
remove kmMat4 in Render.cpp GLProgram, Grid, Layer
|
2014-04-10 22:38:57 +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 |
Huabing.Xu
|
84cf5ca895
|
remove kmMat4 in Director.cpp
|
2014-04-10 17:36: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 |
Huabing.Xu
|
4e0be639a2
|
remove typo
|
2014-04-10 17:09:48 +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 |
Huabing.Xu
|
7441c06680
|
change matrix projection compatible with kazmath logic
|
2014-04-10 17:02:36 +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 |
koowolf
|
b5433f05c1
|
replace LabelTTF with Label
|
2014-04-10 16:51:25 +08:00 |
Dhilan007
|
d583dcc0f0
|
Fixed logical error in TestChangeAnimationInternal::onExit.
|
2014-04-10 16:48:51 +08:00 |
James Chen
|
cbd1af109f
|
Merge pull request #6219 from CocosRobot/update_cocosfiles_1397119257
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-04-10 16:44:28 +08:00 |
CocosRobot
|
d27a3c9642
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-04-10 08:40:58 +00:00 |
James Chen
|
f3160a8357
|
Merge pull request #6218 from CocosRobot/update_lua_bindings_1397118502
[AUTO]: updating luabinding automatically
|
2014-04-10 16:36:34 +08:00 |
CocosRobot
|
530cfae129
|
[AUTO]: updating luabinding automatically
|
2014-04-10 08:30:19 +00:00 |
James Chen
|
24ec86129a
|
Merge pull request #6217 from CocosRobot/update_lua_bindings_1397117948
[AUTO]: updating luabinding automatically
|
2014-04-10 16:21:14 +08:00 |
CocosRobot
|
431f843773
|
[AUTO]: updating luabinding automatically
|
2014-04-10 08:20:27 +00:00 |