James Gregory
77dda8c828
More client side buffer fixes.
2013-04-08 21:07:49 -07:00
James Gregory
eac9fba261
Add warning messages if any of the raw primitive drawing methods are used (they seem not to be, in pratice).
2013-04-08 21:06:36 -07:00
James Gregory
1f457d4ac9
Add freetype2 headers that match the .a we're using.
2013-04-08 21:06:07 -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
James Gregory
8da87fe009
Copy resources in HelloCpp makefile
2013-04-08 19:17:10 -07:00
James Gregory
47ed9c663a
Switch to slot-based GL buffer loading code for CCSprite.
2013-04-08 19:16:22 -07:00
James Gregory
b0b629d32b
Basis of Makefile for SimpleGame sample.
2013-04-08 19:15:27 -07:00
James Gregory
b5a458fa3a
Add missing Makefile reference to file utils for Emscripten.
2013-04-08 19:14:58 -07:00
James Gregory
fbe36bb3c8
Increase heap size for Emscripten binaries, add in missing linkages.
2013-04-08 19:14:25 -07:00
James Gregory
2e0ff662c3
Add resources to TestCpp makefile
2013-04-08 19:13:56 -07:00
James Gregory
831c25ec80
Disable libcurl tests for Emscripten.
2013-04-08 19:13:22 -07:00
James Gregory
61bc858360
Add pre-build dependencies for Emscripten libpng, libz.
2013-04-08 19:12:04 -07:00
James Gregory
df2dd57b5d
Add index.html for SimpleGame and TestCpp. Set resolution on all canvases to 800x500 to match code.
2013-04-08 19:11:31 -07:00
James Gregory
c50861aa1a
Hack: use 800x500 resolution for window for emscripten so that mouse roughly lines up.
2013-04-08 19:10:29 -07:00
James Gregory
bc3f5c9854
Enable texture caching with emscripten.
2013-04-08 19:10:12 -07:00
James Gregory
3e5acf992b
Fix Motion streak client side buffers
2013-04-08 19:09:38 -07: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
James Gregory
09b7f165d2
Add platform files for Emscripten.
2013-04-08 18:21:53 -07:00
James Gregory
f42254125f
Get CCGrid to work.
2013-04-08 17:51:30 -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