carlo morgantini
5668607e0e
merging with Ricardo stuff and fixin the new Label
2013-07-22 11:40:39 -07:00
carlo morgantini
005c492f37
Merge remote-tracking branch 'ricorigin/merge_new_label' into developNewLabelForRiq
...
Conflicts:
cocos2d_libs.xcodeproj/project.pbxproj
2013-07-22 11:38:37 -07:00
bmanGH
b983830bec
修复CCTexturePVR创建GLTexture时没有使用GLStateCache导致下一个Sprite::draw的时候可能会使用不正确的纹理
2013-07-23 02:23:40 +08:00
carlo morgantini
f8fb2a068c
new label
2013-07-22 11:17:51 -07:00
carlo morgantini
15076ad249
more cleanup
2013-07-22 11:08:24 -07:00
Éloi Rivard
58e2ebe18a
updated emscripten script so there is no need to edit it to make emscripten work
2013-07-22 17:52:46 +02:00
James Chen
4d3cb57718
Merge pull request #3211 from azmeuk/emscripten-makefile
...
fixed a bug in emscripten makefile
2013-07-22 08:14:37 -07:00
Éloi Rivard
cca57e39de
fixed a bug in emscripten makefile
2013-07-22 16:56:02 +02:00
James Chen
e03ddfcc06
Update AUTHORS [ci skip]
2013-07-22 18:18:32 +08:00
James Chen
a513d8c9ea
Merge pull request #3209 from dumganhar/iss2418-purge-cache
...
closed 2418: Unused spriteframes also need to be removed when purgeCachedData.
2013-07-22 03:17:03 -07:00
James Chen
2aa1fae266
closed #2418 : Unused spriteframes also need to be removed when purgeCachedData.
2013-07-22 18:13:13 +08:00
James Chen
c85e8412e5
Merge pull request #3208 from dumganhar/iss2344-js-scriptprotocol
...
issue 2344: JSB also uses 'ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(XXX);' now
2013-07-22 02:50:43 -07:00
James Chen
9b0f2a6e33
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2344-js-scriptprotocol
2013-07-22 17:25:29 +08:00
James Chen
1db847ad7c
issue #2344 : ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance
2013-07-22 17:24:54 +08:00
James Chen
0164946779
issue #2344 : ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance.
2013-07-22 17:19:31 +08:00
James Chen
2228614748
issue #2344 : JSB also uses 'ScriptEngineManager::sharedManager()->getScriptEngine()->sendEvent(XXX);' now.
2013-07-22 17:12:53 +08:00
minggo
8660543d77
Merge pull request #3198 from samuele3hu/deprecatedfunc
...
issue #2404:Move deprecated functions in Lua
2013-07-22 00:27:06 -07:00
James Chen
2c17762669
Merge pull request #3206 from CocosRobot/updategeneratedsubmodule_1374476049
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-21 23:56:18 -07:00
CocosRobot
2030d9f94b
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-22 06:54:13 +00:00
James Chen
0d449cf828
Merge pull request #3205 from dumganhar/ricardoquesada-property_synthesize_fixes
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3202
2013-07-21 23:47:57 -07:00
James Chen
a188fd4261
Merge branch 'ricardoquesada-property_synthesize_fixes' of https://github.com/dumganhar/cocos2d-x into ricardoquesada-property_synthesize_fixes
2013-07-22 14:45:38 +08:00
James Chen
f32f1dff33
Cast fix: GLbyte --> GLubyte.
2013-07-22 14:45:01 +08:00
James Chen
b58d18e20a
More unsinged int -> int in some places where it could be difficult to find underflow bugs. And some warnings fix.
2013-07-22 14:28:19 +08:00
James Chen
c154d66bf0
Updating Bindings-generator.
2013-07-22 13:44:30 +08:00
samuele3hu
510a5912fd
issue #2404:Add many functions to Deprecated.lua
2013-07-22 13:42:58 +08:00
James Chen
4e2aaa3012
Using git protocol instead of https.
2013-07-22 13:05:24 +08:00
James Chen
e81c0f944d
Merge branch 'ricardoquesada-property_synthesize_fixes' of https://github.com/dumganhar/cocos2d-x into ricardoquesada-property_synthesize_fixes
2013-07-22 11:47:08 +08:00
James Chen
384d3be378
Update AUTHORS
2013-07-22 11:44:39 +08:00
James Chen
13cec2d859
Merge pull request #3204 from dumganhar/develop
...
Formatting codes with cocos2d-x code style in SimpleAudioEngineOpenAL.cpp.
2013-07-21 20:39:51 -07:00
James Chen
382fe1a54d
Formatting codes with cocos2d-x code style in SimpleAudioEngineOpenAL.cpp.
2013-07-22 11:36:20 +08:00
James Chen
ae015a71e1
Merge pull request #3203 from dumganhar/rafaelx-openal-deletebuffers
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3147
2013-07-21 19:56:55 -07:00
James Chen
8c182d257d
issue #2415 : Formating codes in SimpleAudioEngineOpenAL.cpp.
2013-07-22 10:43:23 +08:00
James Chen
a60c3eaa20
closed #2415 : [OpenAL] Adding one line to delete SimpleAudioEngine singleton in SimpleAudioEngine::end().
2013-07-22 10:32:48 +08:00
James Chen
604c30f102
Merge branch 'openal-deletebuffers' of https://github.com/rafaelx/cocos2d-x into rafaelx-openal-deletebuffers
...
Conflicts:
CocosDenshion/include/SimpleAudioEngine.h
samples/Cpp/TestCpp/Classes/CocosDenshionTest/CocosDenshionTest.cpp
2013-07-22 10:06:14 +08:00
samuele3hu
eed0297c59
Merge branch 'deprecatedfunc' of https://github.com/samuele3hu/cocos2d-x ; branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc
2013-07-22 09:39:57 +08:00
samuele3hu
1f5f6e8fa2
issue #2404:Modify configs
2013-07-22 09:36:00 +08:00
James Chen
50c280fb9d
Fixing complication errors in CCTextureAtlas.cpp and jsb_cocos2dx_auto.cpp.
2013-07-21 19:10:22 +08:00
Ricardo Quesada
89d210bdb3
CCAssert -> CCASSERT
...
and other best pracitces like:
capacity and "index" are ints and not unsigned int (google's recomendation).
It is easier to detect underflow bugs like this
plus other minor improvements
2013-07-19 22:01:27 -07:00
Ricardo Quesada
2219bde542
bmfont sample working
...
...still TTF working OK
2013-07-19 16:49:51 -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
Ricardo Quesada
1f0dac4ed0
Removes CC_PROPERTY / CC_SYNTHESIZE from some parts of the code
...
As agreed previously, CC_PROPERTY_XXX and CC_SYNTHESIZE_XXX should
not be used in the code.
This patch removes some of them. There are still many more to remove
2013-07-19 13:16:38 -07:00
carlo morgantini
c977e6c3fa
Merge remote-tracking branch 'ricorigin/developNewLabel_create' into developNewLabelMerge
...
Conflicts:
cocos2dx/label_nodes/CCFontDefinition.cpp
cocos2dx/label_nodes/CCFontDefinition.h
cocos2dx/label_nodes/CCStringTTF.cpp
cocos2dx/label_nodes/CCStringTTF.h
samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
2013-07-19 12:24:25 -07:00
carlo morgantini
9f629835de
some more cleanup
2013-07-19 11:19:35 -07:00
carlo morgantini
5068622c04
working on the new atlas stuff
2013-07-19 10:33:26 -07:00
James Chen
645487d23e
Merge pull request #3200 from CocosRobot/updategeneratedsubmodule_1374247442
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-19 08:32:52 -07:00
CocosRobot
476e53b490
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-07-19 15:24:06 +00:00
James Chen
4043ca7e23
Merge pull request #3197 from dumganhar/ricardoquesada-more_more_best_practices_fixes
...
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3192
2013-07-19 08:15:39 -07:00
boyu0
ebafab4583
delete the file added by misstake.
2013-07-19 16:19:19 +08:00
boyu0
ad3ceda3c2
roll back the android project setting
2013-07-19 15:58:33 +08:00
samuele3hu
4eb6d7aea4
issue #2404:Modify a comment
2013-07-19 15:38:17 +08:00