carlo morgantini
|
47be4ff58a
|
Merge remote-tracking branch 'originGithub/develop' into new_develop_merge_clean
Conflicts:
cocos2dx/label_nodes/CCFontAtlas.cpp
cocos2dx/label_nodes/CCFontAtlas.h
cocos2dx/label_nodes/CCFontAtlasCache.cpp
cocos2dx/label_nodes/CCFontAtlasFactory.cpp
cocos2dx/label_nodes/CCFontAtlasFactory.h
cocos2dx/label_nodes/CCFontDefinition.cpp
cocos2dx/label_nodes/CCFontFreeType.cpp
cocos2dx/label_nodes/CCLabel.cpp
cocos2dx/label_nodes/CCLabel.h
cocos2dx/label_nodes/CCStringBMFont.h
cocos2dx/label_nodes/CCStringTTF.cpp
samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
|
2013-08-13 11:28:54 -07:00 |
godyZ
|
1048d30863
|
Removing the conflict generated files.
|
2013-08-08 16:22:44 +08:00 |
godyZ
|
46e9eed028
|
nothing with s3tc
|
2013-08-08 14:11:22 +08:00 |
godyZ
|
cd8430f81a
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
Conflicts:
cocos2dx/Android.mk
cocos2dx/platform/CCImage.h
cocos2dx/platform/CCImageCommon_cpp.h
cocos2dx/textures/CCTexture2D.h
scripting/javascript/bindings/generated
|
2013-08-08 10:19:09 +08:00 |
carlo morgantini
|
83b2377a76
|
some more clean up and removed CCStringTTF
|
2013-08-07 16:36:04 -07:00 |
carlo morgantini
|
16412fc885
|
more cleanup
|
2013-08-06 13:43:29 -07:00 |
boyu0
|
dc6503f7d4
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage
|
2013-08-06 13:37:38 +08:00 |
godyZ
|
195536097f
|
update s3tc #2
|
2013-08-06 11:52:48 +08:00 |
godyZ
|
fd7b00681f
|
update s3tc#1
|
2013-08-06 11:19:45 +08:00 |
boyu0
|
6afa77ddc3
|
issue #2345: update the png, jpeg and tiff libraries. Fix the testFormatForPvrTCSupport return incorrect answer when GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG undefined.
|
2013-08-02 16:02:40 +08:00 |
carlo morgantini
|
2fb2916bae
|
some more cleanup
|
2013-08-01 14:36:34 -07:00 |
carlo morgantini
|
b2579987e5
|
Merge remote-tracking branch 'cocos2d/develop' into new_develop_merge
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
cocos2dx/include/ccTypes.h
samples/samples.xcodeproj/project.pbxproj
|
2013-07-31 13:58:25 -07:00 |
minggo
|
0530109a9f
|
Merge pull request #3178 from boyu0/2345
Refactor CCImage and CCTexture2D
|
2013-07-31 01:21:18 -07:00 |
minggo
|
9abd73590c
|
Don't trigger warning for box2d
|
2013-07-31 13:50:43 +08:00 |
minggo
|
1d2b1c79c2
|
closed #2438:remove mac 32-bit support
|
2013-07-30 18:02:35 +08:00 |
boyu0
|
4348e87e31
|
Merge CCImageCommonWebp.cpp into CCImageCommon_cpp.h
|
2013-07-29 17:56:36 +08:00 |
boyu0
|
304d636deb
|
Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
|
2013-07-29 11:40:18 +08:00 |
boyu0
|
cecfc13bc4
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345
|
2013-07-27 22:06:30 +08:00 |
carlo morgantini
|
8416e7cf6d
|
Merge remote-tracking branch 'cocos2d/develop' into developNewLabelMergeDevelop
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
scripting/javascript/bindings/generated
tools/bindings-generator
|
2013-07-26 15:54:50 -07:00 |
carlo morgantini
|
be47a6da52
|
Merge remote-tracking branch 'ricorigin/label_merge' into developNewLabelForRiq
Conflicts:
cocos2dx/label_nodes/CCFontAtlasFactory.cpp
samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
|
2013-07-26 11:58:18 -07:00 |
boyu0
|
02bdfbf169
|
Combine CCTextureETC to CCImage and CCTexture2D.
|
2013-07-26 17:34:44 +08:00 |
minggo
|
f55d73194e
|
issue 2430:use enum class for Control enum values
|
2013-07-26 14:37:26 +08:00 |
carlo morgantini
|
7d141a3f57
|
the new label system now uses only CCStringTTF (CCStringBMFont is still here, but not used anymore)
|
2013-07-25 17:58:13 -07:00 |
boyu0
|
a2b611d8c3
|
Refactor Image and Texture2D, combine TexturePVR to Image and Texture2D, and delete TexturePVR
|
2013-07-25 21:35:00 +08:00 |
minggo
|
acdd1cfe9d
|
issue #2430:move GLProgram enum into class
|
2013-07-25 17:48:22 +08:00 |
minggo
|
4519a09ce4
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum
|
2013-07-25 13:54:55 +08:00 |
James Chen
|
fa3d125c4b
|
issue #2404: Adding CCDeprecated-ext.h to iOS/Mac projects.
|
2013-07-25 10:45:54 +08:00 |
Ricardo Quesada
|
e0523b3438
|
Merge branch 'developNewLabelForRiq' into label_merge
Conflicts:
cocos2dx/textures/CCTexture2D.h
samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
scripting/javascript/bindings/generated
tools/bindings-generator
|
2013-07-24 15:15:08 -07:00 |
carlo morgantini
|
97363c9382
|
some more cleanup and refactory for the new Label stuff
|
2013-07-24 10:22:46 -07:00 |
minggo
|
99949331b1
|
fix error and compilings error in templates
|
2013-07-24 17:27:29 +08:00 |
minggo
|
f6cfe3007f
|
issue #2412:fix merging conflict
|
2013-07-23 10:41:11 +08:00 |
carlo morgantini
|
98c52cd98d
|
new FontCache
|
2013-07-22 13:08:37 -07:00 |
Ricardo Quesada
|
88928fff99
|
Merge branch 'developNewLabelMerge' into merge_new_label
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
cocos2dx/textures/CCTexture2D.h
samples/Javascript/Shared
|
2013-07-19 16:04:23 -07:00 |
carlo morgantini
|
5068622c04
|
working on the new atlas stuff
|
2013-07-19 10:33:26 -07:00 |
boyu0
|
948acd6e29
|
Refactor CCTexture2D and CCImage
|
2013-07-19 15:37:54 +08:00 |
minggo
|
7704ab9161
|
issue #2412:remove platform.cpp/.h
|
2013-07-19 13:42:45 +08:00 |
carlo morgantini
|
5480810a9c
|
clean up and now using FreeType for rendering fonts
|
2013-07-18 13:13:41 -07:00 |
samuele3hu
|
236b675e21
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc
|
2013-07-18 23:29:41 +08:00 |
samuele3hu
|
78cd3e561e
|
issue #2404:Move deprecated functions to Deprecated.lua
|
2013-07-18 23:27:07 +08:00 |
boyu0
|
76e05ee802
|
Merge https://github.com/cocos2d/cocos2d-x into 2345
|
2013-07-18 17:47:43 +08:00 |
boyu0
|
70140bb4cb
|
refactor CCImage and CCTexture2D
|
2013-07-17 17:12:04 +08:00 |
James Chen
|
f4edc7a922
|
closed #2413: Warning fixes for overload virtual functions.
|
2013-07-17 16:25:13 +08:00 |
carlo morgantini
|
9cfe1b7823
|
new stuff for FreeType
|
2013-07-16 15:18:39 -07:00 |
samuele3hu
|
1761669832
|
issue #2377:Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandlerMgr
|
2013-07-16 12:47:40 +08:00 |
James Chen
|
a36a4bf19b
|
issue2405: Adding jsb_deprecated.js for the compatibility of deprecated variables and methods.
|
2013-07-16 10:02:02 +08:00 |
minggo
|
eada29ee40
|
issue #2404:created CCDprecated.h and move all global functions and variables into it
|
2013-07-15 16:14:26 +08:00 |
samuele3hu
|
80a6811f9f
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
|
2013-07-15 10:39:08 +08:00 |
James Chen
|
4b2165e648
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into socketio
|
2013-07-13 19:24:41 +08:00 |
James Chen
|
e88ec5ba06
|
Adding SocketIO source files to iOS and Mac project.
|
2013-07-13 19:22:18 +08:00 |
carlo morgantini
|
e4af13f1f6
|
use freetype
|
2013-07-12 12:39:47 -07:00 |