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 |
andyque
|
e1fe26543d
|
issue #5057, refactor & remove deprecated warnings
|
2014-05-09 18:37:22 +08:00 |
andyque
|
264769f814
|
issue #5057, refactor LinearGravity
|
2014-05-09 17:54:25 +08: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 |
andyque
|
0c0f18e7f3
|
issue #5047, refactor LayoutParameterType
|
2014-05-09 17:38:05 +08:00 |
andyque
|
d12a71f738
|
issue #5057, refactor UILayoutDefine
|
2014-05-09 17:16:11 +08:00 |
andyque
|
09a53e7b03
|
issue #5057, refactor BackGroundColorType
|
2014-05-09 17:05:36 +08:00 |
andyque
|
e8e0d007bd
|
issue #5057, refactor LayoutType
|
2014-05-09 16:49:00 +08:00 |
andyque
|
305f052344
|
issue #5057, refactor LayoutClippingType
|
2014-05-09 16:31:22 +08:00 |
Mircea Rila
|
ebfbf0eba3
|
fix box2d win32 project
|
2014-05-09 11:10:08 +03:00 |
andyque
|
451b7a1b6b
|
issue #5057, refactor UICheckBox event callback
|
2014-05-09 16:04:55 +08:00 |
Mircea Rila
|
70d7d5b493
|
add VS2013 support for box2d, chipmunk
|
2014-05-09 10:53:44 +03:00 |
andyque
|
c5a505ec4c
|
issue #5057, Merge branch 'v3' into refactor5057
Conflicts:
cocos/ui/CocosGUI.h
|
2014-05-09 15:39:02 +08:00 |
andyque
|
d799ffce40
|
issue #5057, remove include dependency
|
2014-05-09 15:32:51 +08:00 |
andyque
|
f070fc335f
|
issue #5057, refactor BrightStyle to strong typed enum
|
2014-05-09 15:23:34 +08:00 |
andyque
|
762e8d9249
|
issue #5057, refactor WidgetType to strong typed enum
|
2014-05-09 15:16:33 +08:00 |
andyque
|
6a7277c38f
|
issue #5057, refactor TextureResType to strong typed enum
|
2014-05-09 14:56:05 +08:00 |
andyque
|
57ce0ee2cf
|
issue #5057, refactor addTouchEventListener to std::function<>
|
2014-05-09 14:30:39 +08: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 |
andyque
|
7d1cb7af47
|
issue #5057, refactor UILoadingBarTest
|
2014-05-09 11:52:51 +08: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 |
andyque
|
21e4d05e6e
|
issue #5057, refactor SEL_TouchEvent to std::function
|
2014-05-09 11:28:36 +08:00 |
andyque
|
a699230e75
|
issue #5057, replace license
|
2014-05-09 09:39:18 +08:00 |
andyque
|
1d7726133c
|
issue #5057, refactor enum SizeType to strong typed enum
|
2014-05-09 09:37:51 +08:00 |
andyque
|
3ef1facfb0
|
issue #5057, replace deprecated enum with strong typed enum
|
2014-05-09 09:29: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 |