James Chen
|
36e699faa2
|
Merge pull request #6662 from CocosRobot/update_cocosfiles_1399694120
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-10 11:57:54 +08:00 |
Ricardo Quesada
|
029c38a789
|
Merge pull request #6660 from CocosRobot/update_lua_bindings_1399693609
[AUTO]: updating luabinding automatically
|
2014-05-09 20:56:03 -07:00 |
CocosRobot
|
b1ff6bfd1f
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-10 03:55:21 +00:00 |
Ricardo Quesada
|
36074f7bbe
|
Merge pull request #6661 from ricardoquesada/fix_shader_test
10 tests
|
2014-05-09 20:52:52 -07:00 |
Ricardo Quesada
|
1a0ab4bf92
|
10 tests
|
2014-05-09 20:51:46 -07:00 |
CocosRobot
|
f0c240f885
|
[AUTO]: updating luabinding automatically
|
2014-05-10 03:47:56 +00:00 |
Ricardo Quesada
|
2664904b08
|
Merge pull request #6593 from super626/improved_glprogram
Improves GLProgram
|
2014-05-09 20:44:32 -07:00 |
Huabing.Xu
|
e84d96234b
|
add two shaderTest case for Trace
comment out one(it is not working on IOS device)
|
2014-05-09 20:35:15 -07:00 |
Ricardo Quesada
|
4a49668940
|
plist are not executable files
|
2014-05-09 20:11:36 -07:00 |
Huabing.Xu
|
c3a255e2d0
|
do not generate backupFile if it is not needed for convert particle file yCoordFlipped
|
2014-05-09 20:07:46 -07:00 |
Ricardo Quesada
|
32d96ca9ad
|
Compiles on Windows Phone 8
... but does not run
|
2014-05-09 19:42:57 -07:00 |
Ricardo Quesada
|
488a8deae9
|
Shader fixes for windows
|
2014-05-09 19:13:12 -07:00 |
Ricardo Quesada
|
e8d2cf7871
|
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram
|
2014-05-09 19:08:08 -07:00 |
Ricardo Quesada
|
8f71e65482
|
Compiles on windows, sort of
|
2014-05-09 19:07:22 -07:00 |
yangxiao
|
d46729862c
|
android rename ShaderCahe to GLProgramCache
|
2014-05-09 19:05:39 -07:00 |
Ricardo Quesada
|
63c7c6a05c
|
Updates template files
|
2014-05-09 18:41:12 -07:00 |
Ricardo Quesada
|
b62f4e51a4
|
Updates Linux project
|
2014-05-09 18:40:53 -07:00 |
Ricardo Quesada
|
764a7b5108
|
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram
|
2014-05-09 18:40:08 -07:00 |
Ricardo Quesada
|
77c03fcf11
|
ShaderCache -> GLProgramCache
|
2014-05-09 18:39:25 -07:00 |
AlexV
|
556eab4a61
|
fixed tabs space issues. fixed problem with ndk detection. simplified code for androidsdk detection.
|
2014-05-10 10:27:14 +09:00 |
AlexV
|
2e461182b0
|
removed duplicated check on deteted values from system
|
2014-05-10 10:27:13 +09:00 |
AlexV
|
9b84a21f52
|
fixing handling of error when trying to detect android tools
|
2014-05-10 10:27:13 +09:00 |
AlexV
|
06de5d7991
|
added detection of android tools path
|
2014-05-10 10:27:12 +09:00 |
AlexV
|
d7f1af876a
|
fixed network link library curl in win32 case : libcurl_imp
|
2014-05-10 10:07:57 +09:00 |
AlexV
|
722a4d264e
|
basic fixes for win32 builds
|
2014-05-10 10:07:29 +09:00 |
AlexV
|
83018eb69a
|
adding headers in src files so they appear in IDE
|
2014-05-10 10:03:46 +09:00 |
zifter
|
fa45f3f4e0
|
Fixed bug with cascade opacity for control button.
|
2014-05-10 04:02:24 +03:00 |
Huabing.Xu
|
c16d072491
|
added conversion script for convert yCoordFlipped
|
2014-05-09 17:28:12 -07:00 |
Ricardo Quesada
|
b5fdbf2d49
|
it is v3.1-alpha1
|
2014-05-09 17:03:34 -07:00 |
Ricardo Quesada
|
faf617bc37
|
fixes for Linux
|
2014-05-09 16:57:11 -07:00 |
Ricardo Quesada
|
f511b1f8a1
|
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram
|
2014-05-09 16:46:35 -07:00 |
Ricardo Quesada
|
fec1b82c0a
|
Shader files use STRINGIFY
|
2014-05-09 16:45:42 -07:00 |
yangxiao
|
1be6ba961c
|
Merge branch 'newcode' into improved_glprogram
|
2014-05-09 16:05:42 -07:00 |
yangxiao
|
877d8dd771
|
android works!!
|
2014-05-09 15:59:49 -07:00 |
Ricardo Quesada
|
808561705a
|
new files for template
|
2014-05-09 15:40:48 -07:00 |
Ricardo Quesada
|
9cad6cf027
|
removes some unused directories from the propery sheet
... for Visual Studio
|
2014-05-09 15:35:53 -07:00 |
Ricardo Quesada
|
4c623f1f5e
|
compiles and runs on Windows Phone 8
What's missing is to have the pre-compiled shaders from MS
to test the the ShaderTest
|
2014-05-09 15:14:50 -07:00 |
Ricardo Quesada
|
da0c581d44
|
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram
|
2014-05-09 14:43:36 -07:00 |
Ricardo Quesada
|
47f6f8871f
|
compiles on windows
|
2014-05-09 14:43:20 -07:00 |
yangxiao
|
879958855b
|
UniformValue use union array
|
2014-05-09 14:38:36 -07:00 |
Ricardo Quesada
|
9538c20a3e
|
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram
|
2014-05-09 13:25:27 -07:00 |
Ricardo Quesada
|
739af170ad
|
compiles and runs on Windows!!!
|
2014-05-09 13:24:56 -07:00 |
Trace
|
4c4a974287
|
use STRINGGIFY(A) instead R""
|
2014-05-09 12:03:09 -07:00 |
Trace
|
4bcdccd302
|
Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram
|
2014-05-09 12:01:18 -07:00 |
Ricardo Quesada
|
9ffaeec515
|
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram
|
2014-05-09 12:00:33 -07:00 |
Ricardo Quesada
|
16c6b2163d
|
More VisualStudio fixes
|
2014-05-09 11:59:52 -07:00 |
Huabing.Xu
|
e72633c066
|
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into tony_improved_glprogram
|
2014-05-09 11:53:22 -07:00 |
Trace
|
0b8aed3536
|
Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram
|
2014-05-09 11:51:00 -07:00 |
Huabing.Xu
|
a8b27de799
|
fix bug for y flipped coord (particle system)
|
2014-05-09 11:50:37 -07:00 |
Huabing.Xu
|
168ff78e18
|
add test case for y flipped coord
|
2014-05-09 11:49:51 -07:00 |