Ricardo Quesada
|
62d9c24518
|
moves shaders files from 2d/ to renderer/
|
2014-05-08 18:01:48 -07:00 |
Ricardo Quesada
|
51f498fc94
|
fixed deprecation warnings
|
2014-05-08 16:42:36 -07:00 |
Ricardo Quesada
|
2e669c1d28
|
GLProgram::create() returns a linked GLProgram
|
2014-05-08 16:04:59 -07:00 |
Ricardo Quesada
|
580ebf939f
|
working Ok with new API
|
2014-05-08 15:43:12 -07:00 |
Ricardo Quesada
|
8f2ba467ff
|
Yeahhhhhh
it is working
|
2014-05-08 12:34:26 -07:00 |
Ricardo Quesada
|
b401f6adc1
|
Lots of new code
Adds GLProgramState
|
2014-05-07 20:20:19 -07:00 |
Ricardo Quesada
|
98454eeb69
|
Adds GLProgram::createXXX()
|
2014-05-07 14:38:41 -07:00 |
Ricardo Quesada
|
02405a8efe
|
Improved samples
|
2014-05-07 12:41:04 -07:00 |
Ricardo Quesada
|
b1ed7178fe
|
Improved API for Uniforms
|
2014-05-07 10:44:45 -07:00 |
yangxiao
|
5190fb27c8
|
use proposed vertex attribute api
|
2014-05-07 09:27:44 -07:00 |
Ricardo Quesada
|
db759005e0
|
Improvements for Attributes and Uniform API
|
2014-05-06 17:58:14 -07:00 |
Ricardo Quesada
|
21dd6fef69
|
Improves code a little bit
|
2014-05-06 12:46:35 -07:00 |
Trace
|
cf9e8ff0bd
|
Merge branch 'newV3' into improved_glprogram
Conflicts:
cocos/2d/CCGLProgram.cpp
cocos/2d/CCGLProgram.h
|
2014-05-06 12:07:42 -07:00 |
Trace
|
69fd841b30
|
fix the include error
|
2014-05-06 11:19:51 -07:00 |
Ricardo Quesada
|
8bb8416c26
|
Improved directory structure
|
2014-04-29 17:37:36 -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
|
feec24e3ef
|
Merge branch 'v3' into develop_migrate_math_lib_merge
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/CCNode.cpp
cocos/2d/CCRenderTexture.cpp
cocos/2d/platform/wp8/CCGLView.h
cocos/physics/CCPhysicsBody.cpp
extensions/physics-nodes/CCPhysicsSprite.cpp
extensions/physics-nodes/CCPhysicsSprite.h
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
|
2014-04-25 16:20:24 +08:00 |
Huabing.Xu
|
7f61639541
|
replace Point with Vector2 in tests, extension folder
|
2014-04-15 18:23:40 +08:00 |
Huabing.Xu
|
071cbc7565
|
migrate setPosition to Vector2
|
2014-04-15 16:16:14 +08:00 |
andyque
|
87b437dd3a
|
closed #4783. replace deprecated function call
|
2014-04-14 13:48:17 +08:00 |
andyque
|
00d2bd833f
|
closed #4783. finish the shading effects
|
2014-04-14 12:03:37 +08:00 |
andyque
|
2c1f5da69c
|
issue #4783, add outline shader files
|
2014-04-14 11:52:17 +08:00 |
Huabing.Xu
|
1aa909371d
|
remove kmMat4 in Cpp-tests
|
2014-04-11 18:03:07 +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
|
d865341694
|
remove kmMat4 interface in cpp-tests
|
2014-04-10 10:16:16 +08:00 |
James Chen
|
5615717617
|
issue #4729: NULL -> nullptr in constructor or setXXX(NULL)
|
2014-04-10 00:36:43 +08:00 |
Huabing.Xu
|
3837c23ebe
|
draw() using Matrix instead of kmMat4
|
2014-04-08 22:07:35 +08:00 |
Huabing.Xu
|
e8596094a4
|
Merge branch 'develop' into develop_migrate_math_lib_merge
|
2014-04-08 16:58:51 +08:00 |
shujunqiao
|
fb777b1a1d
|
[ci skip], delete ShaderFail sample in ShaderTest.cpp.
|
2014-04-08 14:52:17 +08:00 |
shujunqiao
|
fae742c0b8
|
modify ShaderTest.cpp not crah to autotest.
|
2014-04-08 14:32:25 +08:00 |
Huabing.Xu
|
45b0ba3871
|
migrate Vertex2f to Vector2(tests)
|
2014-04-02 15:25:50 +08:00 |
zhangbin
|
95ab15195c
|
Optimize the performance of BlurSpriteTest in Shader Sprite.
|
2014-03-31 10:44:48 +08:00 |
zhangbin
|
6a1974a78a
|
Solve the error effect of BlurSpriteTest in Shader Sprite.
|
2014-03-28 20:53:14 +08:00 |
James Chen
|
b88de91a15
|
Renames 'samples' folder to 'tests', ouch....
|
2014-03-11 19:10:34 +08:00 |