James Chen
|
cbcf2e2bc8
|
Merge pull request #6384 from dabingnn/v3_optimize
change tab to space for CCDirector.cpp
|
2014-04-28 09:54:43 +08:00 |
Huabing.Xu
|
64d7a6bd37
|
change tab to space
|
2014-04-28 09:51:10 +08:00 |
Ricardo Quesada
|
81c2d92355
|
yeah... love in includes
<3
|
2014-04-26 10:35:57 -07:00 |
Ricardo Quesada
|
9b118e5e96
|
Squashed commit of the following:
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
|
2014-04-26 10:11:22 -07:00 |
Huabing.Xu
|
30dec564e6
|
remove kazmath/kazmath.h include
|
2014-04-15 23:50:28 +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
|
d70305cf3b
|
remove kmMat4 in Render.cpp GLProgram, Grid, Layer
|
2014-04-10 22:38:57 +08:00 |
James Chen
|
9d8d256bee
|
issue #4729: Android build works ok.
|
2014-04-10 00:36:42 +08:00 |
Huabing.Xu
|
8d01d4e07d
|
remove kmMat4 interface in cocos/2d folder
|
2014-04-09 11:53:01 +08:00 |
Huabing.Xu
|
6b4451482f
|
remove matrixToKmMat4 function
|
2014-04-04 18:13:10 +08:00 |
Huabing.Xu
|
f1b1678900
|
Director::getMatrix returns Matrix instead of kmMat4
|
2014-04-04 17:31:21 +08:00 |
Huabing.Xu
|
67e62ce73d
|
readied director::getMatrix again. remove kmGLgetMatrix
|
2014-04-03 17:26:06 +08:00 |
Huabing.Xu
|
79f62f4351
|
comment out director::getMatrix temporarily
|
2014-04-03 10:33:59 +08:00 |
minggo
|
504eea0269
|
use xxhash to generate material id
|
2014-03-31 13:47:07 +08:00 |
minggo
|
e52fc981cc
|
Merge pull request #5977 from dabingnn/develop_fixID_Android_bug
Develop fix id android bug
|
2014-03-27 13:49:53 +08:00 |
Huabing.Xu
|
9aa8327d9c
|
closed #4552: separate material ID and openGL ProgramID
|
2014-03-25 16:54:29 +08:00 |
Dale Stammen
|
fb574697aa
|
added support for precompiled shaders in wp8
|
2014-03-22 05:58:07 -07:00 |
Dhilan007
|
6b74794c74
|
fix typo and mistake in Label::setTextColor.
|
2014-03-21 09:47:29 +08:00 |
Dhilan007
|
9dfa099bef
|
Label:Refactoring related functions of color.
|
2014-03-20 20:56:10 +08:00 |
Huabing.Xu
|
f8f2373c2a
|
closed #4315: fixed clippingNode alphaTest Bug
|
2014-03-10 15:12:44 +08:00 |
Ricardo Quesada
|
273d0d22f1
|
little performance improvement in quad command
|
2014-03-05 18:50:09 -08:00 |
Dhilan007
|
dfdf19daff
|
remove unused shader and also did adjust FontAtlas::getTexture
|
2014-03-05 16:51:16 +08:00 |
Ricardo Quesada
|
7ac663e02c
|
GL Program API fixes
|
2014-03-04 13:51:43 -08:00 |
minggo
|
ac8a7b4ce1
|
Merge pull request #4983 from dabingnn/develop_layerColorBug
fix layerColor occlude sprite bug on android
|
2014-01-07 06:25:59 -08:00 |
Huabing.Xu
|
b1d9d5e55e
|
fix layerColor occlude sprite bug on android
|
2014-01-07 22:08:00 +08:00 |
walzer
|
64af0de648
|
update copyrights for 2014, in cocos/2d/ folder
|
2014-01-07 11:25:07 +08:00 |
James Chen
|
6fce4f9061
|
Don’t use ‘String::createWithFormat’ in our codes, use StringUtils::format() instead.
|
2013-12-25 11:00:51 +08:00 |
boyu0
|
e07c4ffec1
|
Change NULL to nullptr, edit hungarian notation.
|
2013-12-18 17:47:20 +08:00 |
James Chen
|
12cc6c6153
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer
Conflicts:
cocos/2d/CMakeLists.txt
|
2013-12-17 15:50:24 +08:00 |
Dhilan007
|
39280d55f3
|
new label:add support for distanceField
PerformanceTest:add performance test for label.
|
2013-12-13 12:42:15 +08:00 |
Ricardo Quesada
|
61cc365d9e
|
Merge branch 'develop' into newRenderer
Conflicts:
cocos/2d/CCGLProgram.h
cocos/2d/CCLabelTTF.h
|
2013-12-12 14:41:42 -08:00 |
Ricardo Quesada
|
f4c68e4eef
|
More renames of description() to getDescription()
|
2013-12-12 14:38:12 -08:00 |
Ricardo Quesada
|
29a15c885a
|
Merge branch 'develop' into newRenderer
|
2013-12-12 11:44:09 -08:00 |
James Chen
|
9e637a3a3b
|
issue #2790: GLProgram::getXXXLog return `std::string` to prevent using CCString which was deprecated.
|
2013-12-11 22:35:37 +08:00 |
Ricardo Quesada
|
ee0ef6bf46
|
ProgressTimer works OK
Adds _modelViewTransform as ivar of Node (temporary fix)
|
2013-12-06 17:42:16 -08:00 |
Ricardo Quesada
|
81b06f06a9
|
Merge branch 'develop' into newRenderer
Conflicts:
cocos/2d/CCAtlasNode.h
|
2013-12-05 22:24:41 -08:00 |
Ricardo Quesada
|
e699a3b765
|
Uses MV in Quad Command
|
2013-12-05 19:04:01 -08:00 |
bmanGH
|
f540131320
|
add setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv mothed in GLProgram class.
|
2013-11-12 18:59:37 +08:00 |
Ricardo Quesada
|
17af5b6850
|
Adds flags in GLProgram to prevent sending uneeded uniforms
|
2013-10-31 17:56:15 -07:00 |
minggo
|
95acb1b9e3
|
issue #2905: helloworld build ok on android
|
2013-10-14 14:01:00 +08:00 |
minggo
|
49d7bbd600
|
issue #2905: remove sub folders except platform
|
2013-10-12 15:41:45 +08:00 |