Ricardo Quesada
f3f3771dd9
removes unneeded comments from coding_style
2013-09-25 13:09:26 -07:00
Ricardo Quesada
662f56a2fe
Merge pull request #3827 from ricardoquesada/adds_missing_files
...
Adds missing files
2013-09-25 13:06:34 -07:00
Ricardo Quesada
06ff62662c
Updates CHANGELOG with the new misc changes
2013-09-25 13:05:17 -07:00
Ricardo Quesada
341178cb91
Removes unneeded log
...
This log is already part of `CCConfiguration`
2013-09-25 13:03:47 -07:00
Ricardo Quesada
a3c33e4728
Adds RELEASE_NOTES and CODING_SYTLE.md into Xcode
2013-09-25 13:03:23 -07:00
Ricardo Quesada
17ef2e3147
Adds CODING_STYLE.md and RELEASE_NOTES files
...
The files are also added in the Xcode project
2013-09-25 13:02:51 -07:00
Michael Contento
5ca052446c
various small fixes
2013-09-25 17:57:12 +02:00
minggo
ddc9da3b3a
Merge pull request #3812 from nutty898/develop_nutty_modify_wrong_codes
...
[ci skip]Modify wrong codes.
2013-09-25 04:16:20 -07:00
CaiWenzhi
8a2cdf5a48
Modify wrong codes.
2013-09-25 19:04:37 +08:00
Darragh Coy
8654df7b0e
Remove Hungarian notation.
...
Remove Hungarian notation in fix made for memory leak in Set::removeAllObjects().
2013-09-24 21:01:30 +01:00
2youyou2
6f5e7d540e
remove cc
2013-09-24 23:22:07 +08:00
James Chen
1a5b8a7673
Merge pull request #3785 from yuye-liu/particle_designer_2
...
Particle designer 2[ci skip]
2013-09-24 02:57:49 -07:00
James Chen
dc685c3775
Update AUTHORS [ci skip]
2013-09-24 17:28:33 +08:00
James Chen
3ffad35f0e
Merge pull request #3741 from signmotion/develop
...
Fixed some compiling-warnings (MSVC2012).[ci skip]
2013-09-24 02:27:14 -07:00
yuye.liu
52559bc099
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-09-24 16:19:44 +08:00
yuye.liu
29332d0209
revising erro indent
2013-09-24 16:18:51 +08:00
minggo
f91c29c45e
Merge pull request #3689 from yuye-liu/particle_designer_2
...
[ci skip]particle designer2.0 support
2013-09-24 00:40:47 -07:00
minggo
9211d8f503
Merge pull request #3742 from mlepage/develop
...
Clean up some API documentation
2013-09-23 19:15:37 -07:00
minggo
9a433be58d
[ci skip]
2013-09-24 10:11:08 +08:00
minggo
84a8160554
[ci skip]
2013-09-24 10:10:05 +08:00
minggo
2dd08a4945
Merge pull request #3769 from michaelcontento/android-fix-opengl-config
...
[ci skip]add EGL_RENDERABLE_TYPE to OpenGL attributes
2013-09-23 19:08:55 -07:00
minggo
5f2c94ee3c
Merge pull request #3768 from michaelcontento/android-fix-null-access
...
[ci skip]wrong variable used which could crash the whole app
2013-09-23 19:07:22 -07:00
minggo
f941cee694
[ci skip]
2013-09-24 10:03:39 +08:00
minggo
6c4a654340
[ci skip]
2013-09-24 10:02:27 +08:00
minggo
0c5e5cbf0c
Merge pull request #3767 from michaelcontento/android-add-runOnGLThread-back-again
...
[ci skip]re-introduce Cocos2dxHelper.runOnGLThread(Runnable)
2013-09-23 19:00:36 -07:00
minggo
1db4ab9b8b
Merge pull request #3782 from ricardoquesada/software_decoder
...
[ci skip]Software decoder
2013-09-23 18:37:15 -07:00
minggo
eed7ebc7cc
Merge pull request #3781 from ricardoquesada/xcode_changelog_authors
...
[ci skip]Adds CHANGELOG and AUTHORS to cocos2d_libs project.
2013-09-23 18:36:24 -07:00
Ricardo Quesada
769a7ea1ed
Logs when software decoder is being used
...
Logs when software decoder is being used in `Image`
2013-09-23 17:03:28 -07:00
Ricardo Quesada
bc3fa140c2
Adds CHANGELOG and AUTHORS to cocos2d_libs project.
...
Easier to update those files if they are part of the lib.
And useful for developers as well, specially the changelog
2013-09-23 16:31:35 -07:00
James Chen
6ded79111b
Merge pull request #3774 from nutty898/optimize_layout
...
[develop] [GUI] Optimize layout
2013-09-23 06:38:21 -07:00
CaiWenzhi
f4471ae93c
Modify layout enum
2013-09-23 21:26:44 +08:00
CaiWenzhi
be7c7a5f0b
Modify windows project.
2013-09-23 19:54:43 +08:00
CaiWenzhi
fa892c2158
Remove layoutexecutant class
2013-09-23 19:16:20 +08:00
James Chen
cfe43cbd1b
Update AUTHORS [ci skip]
2013-09-23 18:42:07 +08:00
James Chen
071a7b7a85
Merge pull request #3550 from michaelcontento/fix-assetmanager-delegate-nullptr-access
...
Prevent nullptr access in AssetsManager
2013-09-23 03:39:16 -07:00
Michael Contento
f6dcf88685
Prevent nullptr access in AssetsManager
2013-09-23 12:05:22 +02:00
Michael Contento
4211cc7fd1
re-introduce Cocos2dxHelper.runOnGLThread(Runnable)
...
It's crucial to execute various tasks synchonized with the rendering loop /
thread, but this ability (runOnGLThread) got removed with the NativeActivity
transitions a few days ago. This patch adds this method back again.
Why can't we just use runOnUiThread()? Because it seems not to be synchronized
properly and can cause broken OpenGL textures or even the whole app to crash.
Isn't there a better way to get into the mainloop? I hope so! But I'm not a
experienced Android developer and this solution is quite simple / the only one
that worked without any problems.
2013-09-23 11:53:12 +02:00
Michael Contento
09543a0aac
wrong variable used which could crash the whole app
2013-09-23 11:50:34 +02:00
Michael Contento
c9fe2c5107
add EGL_RENDERABLE_TYPE to OpenGL attributes
...
This patch adds EGL_RENDERABLE_TYPE=EGL_OPENGL_ES2_BIT to the OpenGL attributes.
The default value for this setting is EGL_OPENGL_ES_BIT and, as we require ES 2.0,
cause some problems on various Android devices (e.g. Amazon Kindle 2.Gen).
2013-09-23 11:44:14 +02:00
2youyou2
02cfd17c94
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-09-23 17:10:49 +08:00
2youyou2
90d7abb3ca
fix add display
2013-09-23 16:48:09 +08:00
yuye.liu
5845b353c5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-09-23 16:25:22 +08:00
yuye.liu
b7f1a980ab
revising indent Erro
2013-09-23 16:24:33 +08:00
minggo
635f394e93
Merge pull request #3755 from liamcindy/develop_action
...
[ci skip]change to use CC_SAFE_RELEASE_NULL and CC_SAFE_RETAIN
2013-09-23 00:14:43 -07:00
Liam
c4dfdbcb14
change to use CC_SAFE_RELEASE_NULL and CC_SAFE_RETAIN
2013-09-23 14:44:55 +08:00
Liam
082e28b631
fixed action node crash
2013-09-23 14:34:50 +08:00
yuye.liu
56a058c74d
modify particleSystem format erro
2013-09-23 10:12:54 +08:00
yuye.liu
276b770867
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-09-23 10:12:00 +08:00
Marc Lepage
e6144e2c80
Clean up some API documentation
2013-09-22 20:05:49 -04:00
signmotion
7d139a3bc3
Fixed compiling-warnings (MSVC2012): C4996(* was declared deprecated), C4305 (* truncation from 'double' to 'float'), C4018 (* signed/unsigned mismatch), C4800(* forcing value to bool 'true' or 'false').
2013-09-22 23:50:54 +03:00