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 |
minggo
|
15096b0716
|
issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated
|
2013-07-12 14:30:26 +08:00 |
minggo
|
bb758df0d0
|
issue #2393:mark ccp as deprecated
|
2013-07-12 14:11:55 +08:00 |
carlo morgantini
|
ea72e046c6
|
Merge remote-tracking branch 'ricorigin/freetype' into developNewLabel
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
|
2013-07-11 17:38:07 -07:00 |
Ricardo Quesada
|
2d0aed4f0e
|
libfreetype for iOS and Mac
libfreetype for iOS and Mac
|
2013-07-11 17:20:10 -07:00 |
carlo morgantini
|
1caa6dfbd7
|
start integrating FreeType for font rendering
|
2013-07-11 15:43:45 -07:00 |
carlo morgantini
|
002ae77698
|
new dynamic TTF label stuff
|
2013-07-11 14:41:03 -07:00 |
carlo morgantini
|
9264b3de1d
|
more clean up
|
2013-07-10 11:59:05 -07:00 |
samuele3hu
|
31d0e492c2
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler
|
2013-07-10 15:05:02 +08:00 |
samuele3hu
|
cf1cbe1bd6
|
issue #2377:add scriptHandlerMgr and modify ActionManager.lua
|
2013-07-10 15:04:00 +08:00 |
James Chen
|
a517e68c59
|
closed #2379: Removing CCZone.h/.cpp.
|
2013-07-09 14:50:31 +08:00 |
minggo
|
dfde41b932
|
issue #2129:fix conflicts
|
2013-07-05 17:32:50 +08:00 |
minggo
|
04465622b7
|
issue #2129:remove prefix of types in ccTypes.h
|
2013-07-05 16:49:22 +08:00 |
James Chen
|
d2746bbe90
|
issue #2373: Removing inline for virtual function. Adding more const getter functions.
|
2013-07-05 15:08:52 +08:00 |
James Chen
|
8f5dba6c44
|
issue #2371: Using the same prefix header for iOS and Mac.
|
2013-07-05 10:53:16 +08:00 |
James Chen
|
808ce2e208
|
close #2371: Adding Lua projects for Mac.
|
2013-07-04 16:29:06 +08:00 |
James Chen
|
397b698f07
|
[iOS] Adding lua projects.
|
2013-07-04 13:50:09 +08:00 |
Ricardo Quesada
|
22b42bfe7d
|
SimpleGame and HelloCpp works as expected
their Info.plist was broken
|
2013-07-03 13:24:39 -07:00 |
Ricardo Quesada
|
2b73d0cb5f
|
ios and mac projects unified in one simple xcode project
Not finished yet:
- iOS only includes Test Cpp (Simple Game not working yet on iOS)
It is easier to maintain and add more targets, files, etc.
|
2013-07-02 18:20:38 -07:00 |