James Chen
59d8356eae
Update AUTHORS
2013-04-09 12:57:07 +08:00
James Chen
55ec9de216
Merge pull request #2326 from harikrishnar/master
...
fixed #2037 : Major problem with initWithObjects method of CCArray.
2013-04-08 21:50:33 -07:00
James Chen
f50b26dff4
Update AUTHORS
2013-04-09 11:47:54 +08:00
James Chen
8e4848b243
Merge pull request #2328 from elmiro/readlink
...
fixed #2036 : Correction of passed buffer size to readlink ...
2013-04-08 20:46:08 -07:00
James Chen
7114aef751
Merge pull request #2331 from dumganhar/master
...
Updating genbindings.sh, cxx-generator ~> bindings-generator.
2013-04-08 20:06:04 -07:00
James Chen
d29ff33df1
Updating genbindings.sh, cxx-generator ~> bindings-generator.
2013-04-09 11:03:39 +08:00
James Chen
e1ba283264
Merge pull request #2330 from dumganhar/rename-cxx-generator
...
Renaming tools/cxx-generator to tools/bindings-generator.
2013-04-08 19:39:59 -07:00
James Chen
eef8e854c1
Updating .gitmodules.
2013-04-09 10:34:45 +08:00
James Chen
cb4eb733c6
Renaming tools/cxx-generator to tools/bindings-generator.
2013-04-09 10:32:18 +08:00
minggo
ac43ff7584
Merge pull request #2325 from minggo/userdefault-hotfix
...
fixed #2034:make CCUserDefault compatible with previous version on Android and iOS
2013-04-08 18:34:20 -07:00
elMiro
0f6e2daf31
Correction of passed buffer size to readlink and verification of result return by readlink.
2013-04-09 00:25:31 +02:00
harikrishnar
24c9668a1b
Added a getter to get the size of the data
...
Added a getter to get the size of the data
2013-04-09 00:28:50 +05:30
harikrishnar
cd37569729
CCControlButton responds even if its parent is invisible
...
The Buttons should not respond if its invisble or if its made invisible
by any of its parent in the hierarchi
2013-04-09 00:27:53 +05:30
hkrishna
38cb350d39
Problem with initWithObjects of CCArray
...
A new unused array was created instead of using the instance on which
the method was called
2013-04-09 00:08:41 +05:30
James Chen
f81c0d0483
Update AUTHORS
2013-04-08 22:50:48 +08:00
James Chen
5e2f1e0bd6
Merge pull request #2272 from Weeds/saxparser-fix
...
fixed #2035 : fixed potential crash in CCSaxParser
2013-04-08 07:49:36 -07:00
minggo
d3aa718b22
fixed #2034:make CCUserDefault compatible with previous version on Android and iOS
2013-04-08 21:35:43 +08:00
James Chen
7b03c17bd9
Merge pull request #2324 from dumganhar/iss2032-openal-linux
...
fixed #2032 : OpenAL support for linux
2013-04-08 03:15:35 -07:00
James Chen
33213e5177
Merge pull request #2323 from natural-law/master
...
fixed #1471 : Optimize the sample code.
2013-04-08 03:09:14 -07:00
James Chen
935b7af11c
Merge branch 'openal' of https://github.com/azmeuk/cocos2d-x into azmeuk-openal
...
Conflicts:
AUTHORS
2013-04-08 17:53:14 +08:00
zhangbin
df5ea4b7a2
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2013-04-08 17:41:52 +08:00
James Chen
54977fe444
Update AUTHORS
2013-04-08 17:34:56 +08:00
James Chen
401b3dca4d
Merge pull request #2282 from DarraghCoy/ccfileutils_create_with_contents_of_file_fix
...
fixed #2031 : Fix CCFileUtils 'createXXXXWithContentsOfFile' path lookup issue.
2013-04-08 02:33:23 -07:00
zhangbin
5201723b0f
Optimize the sample code of HelloIAP.
2013-04-08 17:32:58 +08:00
James Chen
52f5c7c07d
Update AUTHORS
2013-04-08 17:01:16 +08:00
James Chen
c3a177e5e6
Merge pull request #2268 from Weeds/ccscheduler-fix
...
fixed #2003 : Fixed potential crash in CCScheduler::removeHashElement.
2013-04-08 02:00:22 -07:00
James Chen
309be9b690
Update AUTHORS
2013-04-08 14:57:15 +08:00
James Chen
d3eed7fd1f
Merge pull request #2279 from sjchao/master
...
fixed #2030 : Fixing a display bug when a scrollView nested in another scrollView. The parent's scissor rect need to be considered, when setting the scissor rect in the subScrollView.
2013-04-07 23:55:55 -07:00
James Chen
7a45e1ddd1
Merge pull request #2322 from dumganhar/iss1592-update-uthash
...
fixed #1592 : Updating uthash to v1.9.8.
2013-04-07 23:31:31 -07:00
James Chen
0bab4609ab
fixed #1592 : Removing some marco definitions in CCTexture2D.pkg.
2013-04-08 14:14:35 +08:00
zhangbin
8e4567a784
Add custom ignore file for plugin directory
2013-04-08 14:10:46 +08:00
James Chen
4e2819e86d
Fixing a warning.
2013-04-08 13:51:24 +08:00
James Chen
1e0cdee9d4
Merge pull request #2321 from natural-law/master
...
fixed #1471 : Update JS binding for plugin.
2013-04-07 21:07:23 -07:00
zhangbin
6b69b57c72
Add sample code for using plugin by JS script.
2013-04-08 11:58:52 +08:00
James Chen
831dfb6ade
Merge remote-tracking branch 'origin/iss1592-update-uthash' into iss1592-update-uthash
2013-04-08 11:56:10 +08:00
James Chen
2c3427dcee
issue #1592 : Fixing complication errors for windows port.
2013-04-08 11:56:04 +08:00
James Chen
ea4603a057
issue #1592 : Removing uthash.h in scripting/javascript/bindings. Using the version in cocos2d-x/cocos2dx/support/data_support/uthash.h.
2013-04-08 11:55:35 +08:00
James Chen
7c6cb8c8cd
commit latest uthash.h utlist.h
2013-04-08 10:59:41 +08:00
zhangbin
5f986064fb
Update the JS Binding tools for new directory structure.
2013-04-08 10:54:51 +08:00
minggo
d126cd8e5f
Update AUTHORS
2013-04-08 10:09:23 +08:00
minggo
ad68b3d5ed
Merge pull request #2288 from mchinen/master
...
Android: fix emulator for OpenGL ES 2.0
2013-04-07 19:08:00 -07:00
minggo
26d69fa9b2
Update AUTHORS
2013-04-08 10:03:56 +08:00
minggo
b72bfdfcb3
Merge pull request #2318 from Yodesoft/master
...
Reduce function call in nativeInitBitmapDC to improve performance.
2013-04-07 19:01:09 -07:00
James Chen
9dfe6ba04f
Merge pull request #2319 from natural-law/master
...
fixed #1471 : Plugin system design.
2013-04-07 18:59:38 -07:00
yodesoft
8f4b04aef7
Merge remote-tracking branch 'upstream/master'
2013-04-07 21:12:07 +08:00
zhangbin
e0c60b87f7
Remove the environment config for plugin.
2013-04-07 18:42:38 +08:00
zhangbin
a0b9ae1e0a
Commit the tools for game developers.
2013-04-07 17:27:11 +08:00
yodesoft
4d5dff6172
Reduce function call in nativeInitBitmapDC to improve performance.
2013-04-07 17:17:19 +08:00
zhangbin
49096ce98e
Submit the sample code HelloIIAP.
2013-04-07 17:07:33 +08:00
zhangbin
d012d5513a
Add plugin code into cocos2d-x engine.
2013-04-07 16:58:26 +08:00