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 |
Trace
|
88f1d8ac4e
|
Add ShaderTest sample and shader code
|
2014-05-09 11:48:11 -07:00 |
Ricardo Quesada
|
6727c6d19c
|
Adds missing files to xcode
|
2014-05-09 11:45:12 -07:00 |
Ricardo Quesada
|
78dd92a7ef
|
Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-05-09 11:40:13 -07:00 |
Ricardo Quesada
|
8565e899f9
|
adds missing files to VisualStudio
|
2014-05-09 11:38:43 -07:00 |
Ricardo Quesada
|
dec753f0c4
|
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram
|
2014-05-09 11:36:02 -07:00 |
Ricardo Quesada
|
34a87f8332
|
Merge remote-tracking branch 'super626/improved_glprogram' into improved_glprogram
|
2014-05-09 11:28:16 -07:00 |
Ricardo Quesada
|
00834b1d6e
|
adds missing files for Windows
|
2014-05-09 11:28:06 -07:00 |
yangxiao
|
a986455e63
|
store useCache in GLProgramState
|
2014-05-09 10:23:24 -07:00 |
minggo
|
369719481f
|
Merge pull request #6652 from zawasp/external_vs2013
add VS2013 support for box2d, chipmunk
|
2014-05-09 17:42:23 +08:00 |
Mircea Rila
|
ebfbf0eba3
|
fix box2d win32 project
|
2014-05-09 11:10:08 +03:00 |
Mircea Rila
|
70d7d5b493
|
add VS2013 support for box2d, chipmunk
|
2014-05-09 10:53:44 +03:00 |
James Chen
|
a0fbe9e737
|
Merge pull request #6649 from CocosRobot/update_cocosfiles_1399614149
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-09 13:45:10 +08:00 |
CocosRobot
|
224b0910c9
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-09 05:42:30 +00:00 |
minggo
|
df894931b5
|
Merge pull request #6644 from Dhilan007/v3_video
rename VideoWidget to VideoPlayer.
|
2014-05-09 13:41:06 +08:00 |
yangxiao
|
95e036dd1b
|
GLProgramStateCache
|
2014-05-08 21:54:49 -07:00 |
James Chen
|
1a5a29b863
|
Merge pull request #6645 from natural-law/v3
Update the reference of submodule cocos2d-console.
|
2014-05-09 11:52:11 +08:00 |
zhangbin
|
7d270cd1a1
|
Update the reference of submodule cocos2d-console.
|
2014-05-09 11:48:43 +08:00 |
Dhilan007
|
c904fff9eb
|
update XCode project.pbxproj
|
2014-05-09 11:37:14 +08:00 |
Dhilan007
|
06f264e87d
|
rename VideoWidget to VideoPlayer.
|
2014-05-09 11:30:07 +08:00 |
Ricardo Quesada
|
7fee9cc266
|
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram
|
2014-05-08 18:02:27 -07:00 |
Ricardo Quesada
|
62d9c24518
|
moves shaders files from 2d/ to renderer/
|
2014-05-08 18:01:48 -07:00 |
James Chen
|
1308ad53df
|
Merge pull request #6639 from MSOpenTech/wp8-v3-fix
Added missing files to WP8 projects
|
2014-05-09 08:29:15 +08:00 |
Huabing.Xu
|
1d5bfb5a10
|
roll back _yCoordFlipped changes
|
2014-05-08 16:45:08 -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
|
453b670ad2
|
Removes CCVertexAttribBind
|
2014-05-08 14:01:26 -07:00 |
Ricardo Quesada
|
9ea4aa1e16
|
Simplified VertexAttrib
|
2014-05-08 14:01:03 -07:00 |
Ricardo Quesada
|
8f2ba467ff
|
Yeahhhhhh
it is working
|
2014-05-08 12:34:26 -07:00 |
Ricardo Quesada
|
a2361b30de
|
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram
|
2014-05-08 10:16:49 -07:00 |
Ricardo Quesada
|
087378926f
|
Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-05-08 10:16:09 -07:00 |
yangxiao
|
815f0b7bd9
|
useCallback to false
|
2014-05-08 10:12:12 -07:00 |
Dale Stammen
|
eea1ba6946
|
added missing files to projects
|
2014-05-08 10:11:42 -07:00 |
James Chen
|
59e1fc39b3
|
Merge pull request #6638 from Dhilan007/v3_video
fixed compilation fails on android.
|
2014-05-08 21:43:21 +08:00 |
Dhilan007
|
24452cada1
|
fixed compilation fails on android.
|
2014-05-08 21:39:53 +08:00 |
James Chen
|
dfd302a8ab
|
Merge pull request #6637 from dumganhar/vs-user-file
Adds vcxproj.user, win32 app run by VS2012 needs the 'Debug Path' which was set in '.user' file
|
2014-05-08 21:22:37 +08:00 |
James Chen
|
0ed33cacf4
|
Adds vcxproj.user, win32 app run by VS2012 needs the 'Debug Path' which
was set in '.user' file
|
2014-05-08 21:19:54 +08:00 |
James Chen
|
b550622d90
|
Merge pull request #6636 from CocosRobot/update_cocosfiles_1399545311
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-08 19:13:25 +08:00 |
minggo
|
8a74f83ad0
|
[ci skip]
|
2014-05-08 18:46:34 +08:00 |
CocosRobot
|
7ef529b1c4
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-05-08 10:35:12 +00:00 |
minggo
|
56622dc765
|
Merge pull request #6555 from Dhilan007/v3_video
issue #4859:Add a widget to play video
|
2014-05-08 18:33:51 +08:00 |
Dhilan007
|
52d7d804f7
|
Update XCode project.pbxproj for add files related to VideoWidget.
|
2014-05-08 18:28:28 +08:00 |
Dhilan007
|
972f9447dd
|
issue #4876:Add test case to play video
|
2014-05-08 18:14:32 +08:00 |
Dhilan007
|
af26fb9b07
|
issue #4870:Add a ui widget of playing video
|
2014-05-08 18:13:50 +08:00 |
Dhilan007
|
bda73bc7b3
|
issue #4868:Use system widget to play video on iOS
|
2014-05-08 18:12:53 +08:00 |