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
yinkaile
0470ce936b
1.Fix release CCTexture2DMutable.cpp crash
...
2.Change frame tween method
2013-07-19 19:02:26 +08: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
boyu0
948acd6e29
Refactor CCTexture2D and CCImage
2013-07-19 15:37:54 +08:00
samuele3hu
18fa6f2fbd
issue #2404:Modify a comment
2013-07-19 15:29:36 +08:00
James Chen
b915ecd0fc
Merge pull request #3196 from pyrasis/tizen_2.2
...
[Tizen] Fix compile error
2013-07-19 00:12:59 -07:00
James Chen
7356e7c4c0
issue #2407 : Minor fix in CCTMXLayer.h
2013-07-19 15:03:28 +08:00
James Chen
7c7d21dd03
issue #2407 : more best practices fixes, more getter and const..
2013-07-19 14:57:54 +08:00
samuele3hu
90af254fac
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc
2013-07-19 14:57:38 +08:00
samuele3hu
3b97353e14
issue #2404:Modify Deprecated.lua and set platform config
2013-07-19 14:57:02 +08:00
Lee, Jae-Hong
980a053e50
[Tizen] Fix compile error.
...
- Tizen SDK doesn't support override keyword yet.
- add class keyword before friend keyword.
2013-07-19 15:16:05 +09:00
minggo
687c088b51
issue #2412:remove blackberry and marmalade port because they don't support c++11
2013-07-19 13:55:03 +08:00
minggo
7704ab9161
issue #2412:remove platform.cpp/.h
2013-07-19 13:42:45 +08:00
James Chen
8078e8eff7
issue #2407 : SimpleAudioEngine::sharedEngine --> SimpleAudioEngine::getInstance().
2013-07-19 13:40:45 +08:00
James Chen
2dc6a58d2c
Merge branch 'more_more_best_practices_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-more_more_best_practices_fixes
2013-07-19 11:59:24 +08:00
James Chen
5af281c5ea
Merge pull request #3195 from dumganhar/iss2404-deprecated
...
issue 2404: return nullptr in Clonable::copy().
2013-07-18 20:57:29 -07:00
James Chen
9270a28275
issue #2404 : return nullptr in Clonable::copy().
2013-07-19 11:56:01 +08:00