James Chen
86411837c6
PLEASE NEVER `using namespace cocos2d;` in header file
2014-05-13 16:15:21 +08:00
Nite Luo
7d8cfc4cca
set parent transform dirty when addChild
2014-05-12 23:28:20 -07:00
Ricardo Quesada
012f1020ca
GLProgramState fixes
...
It is possible to submit to the Renderer a Sprite with custom uniforms
(although it won't be batched).
It is possible to use a custom shader + uniforms on Sprite with
subclassing Sprite
2014-05-12 19:12:56 -07:00
Dale Stammen
78df412669
updated project files to latest version of cocos2d
2014-05-12 09:27:52 -07:00
Dale Stammen
34b0245cfe
updated WP8 precompiled shaders
2014-05-12 09:27:27 -07:00
Dale Stammen
50336dca40
updated to latest version of cocos2d
2014-05-12 09:25:37 -07:00
minggo
9ab2dae212
Merge pull request #6635 from dumganhar/iss4660-unicode
...
issue #4660 : ccUTF8 uses utf8-utf16 conversion in llvm3.4
2014-05-12 17:57:25 +08:00
Dhilan007
64b2562e1f
fixed compile fail on android.
2014-05-12 15:22:57 +08:00
Dhilan007
fc72dc040d
Label:fixed wrong logic of alignment.
2014-05-12 14:34:25 +08:00
minggo
b23056537b
Merge pull request #6602 from minggo/remove-unneeded-codes
...
remove unneeded codes
2014-05-12 13:41:12 +08:00
James Chen
3d22c30933
issue #4660 : Warning fix in CCLabel.cpp and ConvertUTF.c
2014-05-11 11:24:01 +08:00
James Chen
602fa28577
issue #4660 : Updates comments and doc for deprecated ccutf8 api
2014-05-10 21:51:42 +08:00
James Chen
448c1ad352
issue #4660 : Removes unused function in ccUTF8.cpp
2014-05-10 19:34:49 +08:00
Dhilan007
4692c67b78
issue #4660:remove unnecessary API.
2014-05-10 19:33:05 +08:00
James Chen
645a9761c8
issue #4660 : CCTweenFunction.h/.cpp must be in 'action' filter
2014-05-10 19:33:05 +08:00
James Chen
f0cf415228
issue #4660 : Fix windows include path doesn't contain `external/ConvertUTF`
2014-05-10 19:33:05 +08:00
James Chen
3a30adde0f
issue #4660 : A warning fix in CCFontAtlas.cpp
2014-05-10 19:33:05 +08:00
James Chen
07204a0602
issue #4660 : Updates win32 project
2014-05-10 19:33:05 +08:00
James Chen
e693a51c6e
issue #4660 : Linux build ok
2014-05-10 19:24:04 +08:00
James Chen
20adf418fd
Updates 2d/CMakeLists.txt
2014-05-10 19:24:04 +08:00
James Chen
e003a09a2c
Updates CMakeLists.txt
2014-05-10 19:24:04 +08:00
James Chen
b003ba5eb0
issue #4660 : Oops, utf16 is 2 bytes.
2014-05-10 19:24:03 +08:00
James Chen
a61b1097db
issue #4660 : Adds ConvertUTFWrapper.cpp, using llvm::ConvertUTF8toWide and llvm:: convertUTF16ToUTF8String
2014-05-10 19:24:03 +08:00
James Chen
5fda13639d
issue #4660 : Uses new utf api for Label.
2014-05-10 19:24:03 +08:00
James Chen
20a8808b78
issue #4660 : Refactors utf8 api, make it safer and easier to use.
2014-05-10 19:24:03 +08:00
Ricardo Quesada
4d579892b1
Merge pull request #6668 from dabingnn/v3_fix_accident_changes
...
V3 fix accident changes
2014-05-09 21:38:09 -07:00
Huabing.Xu
ba63befa5e
roll back target=android-10
2014-05-09 21:36:35 -07:00
Ricardo Quesada
a8c2fb5431
Fixes deprecated warnings
2014-05-09 21:29:24 -07:00
Ricardo Quesada
32d96ca9ad
Compiles on Windows Phone 8
...
... but does not run
2014-05-09 19:42:57 -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
77c03fcf11
ShaderCache -> GLProgramCache
2014-05-09 18:39:25 -07:00
Ricardo Quesada
faf617bc37
fixes for Linux
2014-05-09 16:57:11 -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
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
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
Huabing.Xu
a8b27de799
fix bug for y flipped coord (particle system)
2014-05-09 11:50:37 -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
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
95e036dd1b
GLProgramStateCache
2014-05-08 21:54:49 -07: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
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
Dhilan007
bda8a73ae5
issue #4867:Use system widget to play video on Android
2014-05-08 18:12:03 +08:00
minggo
c886bf21a8
Merge pull request #6631 from Dhilan007/v3_labelhotfixed
...
closed #5054:Label:Text have black border if it's created with system font on WP8/WINRT.
2014-05-08 17:24:08 +08:00
minggo
d84e26c7b4
Merge pull request #6626 from Ryeeeeee/v3_pause_sound_background
...
sounds pause automatically when switching background
2014-05-08 17:11:29 +08:00
Ryeeeeee
80103487fe
rename variable
2014-05-08 16:53:24 +08:00
Dhilan007
966e7e2b20
closed #5054:Label:Text have black border if it's created with system font on WP8/WINRT.
2014-05-08 15:47:37 +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
Ryeeeeee
eec96e9e96
sounds pause automatically when switching background
2014-05-08 14:44:47 +08:00
Ricardo Quesada
4b15b884e7
Uniform is a struct
2014-05-07 20:38:15 -07:00
andyque
f6d0135b9b
Merge branch 'v3' into focus3861
2014-05-08 11:27:57 +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
Dhilan007
7495f22708
closed #4906:Fixed the label continue to appear when its opacity is set to 0.
2014-05-08 10:12:29 +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
a2c4ddf028
beautify Uniform and VertexAttrib
2014-05-07 11:26:26 -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
minggo
1cbe29071b
remove unneeded codes
2014-05-07 16:49:32 +08:00
James Chen
9862fab58f
Comments fix in CCRenderTexture.h
2014-05-07 16:37:21 +08:00
andyque
657720e509
Merge remote-tracking branch 'upstream/v3' into focus3861
2014-05-07 11:42:09 +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
Ricardo Quesada
720852681e
Adds license to VertexAttribBind
2014-05-06 11:15:40 -07:00
yangxiao
bbd4533c5e
Improves GLProgram
...
Adds vetex attrib bind class
2014-05-06 11:03:24 -07:00
minggo
7830818fc0
Merge pull request #6553 from Dhilan007/v3_labelhotfixed
...
[hot fixed]closed issue#4999:fixed label is unsharp if it's created by smaller font.
2014-05-06 11:41:24 +08:00
Dhilan007
989b3830aa
fixed indent
2014-05-06 11:22:23 +08:00
Dhilan007
e412f91103
[hot fixed]closed issue#4999:fixed label is unsharp if it's created by smaller font.
2014-05-06 10:36:55 +08:00
minggo
302ec843e7
Merge pull request #6577 from MSOpenTech/v3-wp8-fix
...
V3 wp8 fix
2014-05-06 10:26:19 +08:00
andyque
e65b144ee6
issue #3861 , fixs windows compile error
2014-05-06 10:17:10 +08:00
Ricardo Quesada
e413b86295
Revert `new Sprite` change done a few days ago
...
Use `std::nothrow` for new in Sprite (should be done in all `new` code)
2014-05-05 16:53:37 -07:00
Ricardo Quesada
0e6dd9afe5
Particles can be created without texture
...
Needed for complex particles like in EarthWarrior3D
2014-05-05 15:50:08 -07:00
Dale Stammen
9a05e86ab6
updated missing files
2014-05-05 13:26:28 -07:00
Dale Stammen
78204c7c91
removed obsolete headers
2014-05-05 13:25:57 -07:00
andyque
0d9d2a57dc
issue #3861 . fix a indent problem
2014-05-05 17:54:21 +08:00
andyque
33f7a500f3
issue #4861 . add android keypad support
2014-05-05 11:37:38 +08:00
James Chen
8cbcf17163
issue #4674 : Re-added deleted source files.
2014-05-04 14:37:55 +08:00