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 |
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
|
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 |
Dhilan007
|
972f9447dd
|
issue #4876:Add test case to play video
|
2014-05-08 18:14:32 +08:00 |
minggo
|
9f0e25d808
|
Merge pull request #6628 from andyque/refactor5056
refactor 5056. pull gui tests from ExtensionTest to UITest
|
2014-05-08 17:00:38 +08:00 |
andyque
|
97ee5cb456
|
closed #5056. fix windows compile error
|
2014-05-08 16:18:46 +08:00 |
minggo
|
a8d728ffc9
|
Merge pull request #6610 from zawasp/vs2013project
upgrade win32 projects for Visual Studio 2013
|
2014-05-08 15:40:02 +08:00 |
andyque
|
e48e26cfdc
|
issue #5056. fix linux & android compile error
|
2014-05-08 15:20:24 +08:00 |
James Chen
|
88b0eb3baa
|
Adds missing 'fps_images.png', our test case needs them
|
2014-05-08 15:09:02 +08:00 |
andyque
|
898a66131a
|
issue #5056. move gui test from ExtensionsTest to the outside
|
2014-05-08 14:35:45 +08:00 |
andyque
|
f6d0135b9b
|
Merge branch 'v3' into focus3861
|
2014-05-08 11:27:57 +08:00 |
andyque
|
323987beb2
|
closed #4861, done
|
2014-05-08 11:26:29 +08:00 |
Ricardo Quesada
|
90ec7dd9ec
|
Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram
|
2014-05-07 20:21:03 -07:00 |
Ricardo Quesada
|
b401f6adc1
|
Lots of new code
Adds GLProgramState
|
2014-05-07 20:20:19 -07:00 |
andyque
|
b5f1f7455b
|
issue #4861, fix a problem when layout focus loops
|
2014-05-08 10:46:05 +08:00 |
Huabing.Xu
|
41f48e7fa9
|
Merge branch 'v3' into tony_improved_glprogram
|
2014-05-07 15:30:04 -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 |
Mircea Rila
|
b66b4c6f1d
|
upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found).
remove C4005 warnings after upgrading projects
|
2014-05-07 17:41:04 +03:00 |
andyque
|
05b7d274c8
|
issue #4861. fix distance calculation
|
2014-05-07 18:27:05 +08:00 |
samuele3hu
|
8615e13c91
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-05-07 17:16:40 +08:00 |
James Chen
|
9862fab58f
|
Comments fix in CCRenderTexture.h
|
2014-05-07 16:37:21 +08:00 |
andyque
|
1282252c25
|
closed #4861, refactor
|
2014-05-07 14:06:44 +08:00 |
andyque
|
657720e509
|
Merge remote-tracking branch 'upstream/v3' into focus3861
|
2014-05-07 11:42:09 +08:00 |
andyque
|
ef44b2687b
|
closed #4861, finished focus
|
2014-05-07 11:40:01 +08:00 |
andyque
|
ef70c684de
|
issue #4861, add requestFocus method and the layout current can get focus
|
2014-05-07 10:23:57 +08:00 |
andyque
|
62a66872aa
|
issue #4861, fixed some boundary conditions
|
2014-05-07 10:05:20 +08: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 |
andyque
|
9d71ae29b9
|
issue #4861. fixed all widget focus diabled bug
|
2014-05-06 17:28:12 +08:00 |
andyque
|
51a704dcc8
|
issue #4861, refactor improve nested focus test
|
2014-05-06 15:11:55 +08:00 |
andyque
|
29c57568bf
|
issue #4861, add nested focus test
|
2014-05-06 14:38:45 +08:00 |
andyque
|
e52370e1c2
|
issue #4861, refactor UIFocusTest, simplify code
|
2014-05-06 14:20:01 +08:00 |
andyque
|
ad4e1f1e2c
|
issue #4861, improve UIFocusTest, add click event to ImageView
|
2014-05-06 14:14:22 +08:00 |
samuele3hu
|
3017c776e1
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-05-06 13:59:44 +08:00 |
samuele3hu
|
0ce2a38f17
|
Update bindings-generator and `MAX_SUB_TEST_NUMS` for SpritePerformance Test
|
2014-05-06 13:59:16 +08:00 |
andyque
|
e65b144ee6
|
issue #3861, fixs windows compile error
|
2014-05-06 10:17:10 +08:00 |
andyque
|
16ebe8d41c
|
issue #3861, fix linux compile error
|
2014-05-06 09:40:50 +08:00 |
Dale Stammen
|
703c6c2b39
|
added missing Assets folder
|
2014-05-05 13:47:43 -07:00 |
andyque
|
cb5b2a4f85
|
issue #4861, Merge branch 'v3' into focus3861
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
|
2014-05-05 17:40:28 +08:00 |
James Chen
|
67b2fbf14b
|
Updates xcode project, add ccs-res folder to Resources folder
|
2014-05-05 15:24:33 +08:00 |
James Chen
|
399f5cf721
|
Adds submodule for CocoStudio resources (70MB)
|
2014-05-05 15:11:35 +08:00 |
James Chen
|
e16d6fa63f
|
Re-adds resources in cpp-tests and lua-tests, but removes some large
files. We need to reuse some resources when doing some tests.
|
2014-05-05 13:27:47 +08:00 |
andyque
|
2d0de93baf
|
issue #4861, fixed a widget bug and add VBox test
|
2014-05-05 11:37:40 +08:00 |
andyque
|
852191a928
|
issue #4861, improve the horizontal layout test
|
2014-05-05 11:37:39 +08:00 |