boyu0
|
481ad7ef12
|
issue #2771: update project setting
|
2013-09-17 10:41:08 +08:00 |
boyu0
|
a48fee881d
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
|
2013-09-16 22:16:50 +08:00 |
boyu0
|
2c66f1b95e
|
issue #2771: Implement the minimum set of physical API. Improve the PhysicsTest
|
2013-09-16 21:22:22 +08:00 |
James Chen
|
22fd21db13
|
Fixing iOS and Mac project config.
|
2013-09-16 18:20:52 +08:00 |
CaiWenzhi
|
4843046d17
|
Merge GUI to develop step 1;
|
2013-09-16 17:12:15 +08:00 |
James Chen
|
da1101beeb
|
[Dispatcher] New event dispatcher, first commit.
|
2013-09-11 22:09:34 +08:00 |
chengstory
|
669de88e73
|
1. remove any unused functions.
|
2013-09-10 11:02:50 +08:00 |
boyu0
|
1d47737f45
|
issue #2771: add physics files and entries.
|
2013-09-09 10:29:02 +08:00 |
Ricardo Quesada
|
b78382d5e5
|
Performance improvements in FileUtils / TextureCache
Added common "apple" platform to avoid duplicate files in FileUtils and other common files
Improves performance in fetching files.
|
2013-09-06 15:33:28 -07:00 |
minggo
|
249b4d79a3
|
Merge pull request #3503 from dabingnn/Iss2460-glfw-refractor
Iss2460 glfw refractor
|
2013-09-05 18:28:31 -07:00 |
samuele3hu
|
6eb5805e33
|
issue #2433:Remove some functions and files in cocos2dx_support
|
2013-09-02 10:54:39 +08:00 |
Huabing.Xu
|
4af0a418fe
|
issue #2460: glfw mac keyboard input
|
2013-08-28 16:25:03 +08:00 |
James Chen
|
eb2335952c
|
issue #2732: [iOS, Mac] Removing unused files (LuaCocos2d.cpp/.h).
|
2013-08-27 16:52:39 +08:00 |
James Chen
|
7552a72577
|
issue #2732: [iOS] Updating the reference of auto-generated binding glue codes.
|
2013-08-27 16:05:48 +08:00 |
samuele3hu
|
6ae80bcaf0
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
|
2013-08-23 16:14:19 +08:00 |
samuele3hu
|
e557b6b7c2
|
issue #2433:Add lua deprecated fiel and modify some test samples
|
2013-08-23 16:12:59 +08:00 |
James Chen
|
ca78d2d129
|
closed #2650: Remove ccTypeInfo since we could get the hash value from *typeid(T).hash_code()* if using c++11.
|
2013-08-22 18:16:50 +08:00 |
samuele3hu
|
bea62800b4
|
issue #2433:Modify TestLua samples and add some manual binding code
|
2013-08-22 10:16:57 +08:00 |
samuele3hu
|
39686ea503
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
|
2013-08-20 13:46:26 +08:00 |
godyZ
|
424b4140a2
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Atitc_decode
|
2013-08-16 11:14:47 +08:00 |
godyZ
|
e8809b2b15
|
issue #2533:add ATITC compressed texture support
soft decode test in Win32, ios, Mac. device decode test in HTC G14
Adreno 220 GPU.
|
2013-08-16 11:02:44 +08:00 |
samuele3hu
|
c8b75a1080
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator
|
2013-08-16 10:13:38 +08:00 |
samuele3hu
|
871ed24620
|
issue #2433:Update submodule and project
|
2013-08-15 16:51:09 +08:00 |
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
|
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 |