James Gregory
|
87daf9d3eb
|
Add missing Makefile reference to file utils for Emscripten.
|
2013-05-06 20:59:47 -07:00 |
James Gregory
|
764dffc822
|
Increase heap size for Emscripten binaries, add in missing linkages.
|
2013-05-06 20:59:47 -07:00 |
James Gregory
|
297f0fb0ac
|
Add resources to TestCpp makefile
|
2013-05-06 20:59:47 -07:00 |
James Gregory
|
130ab4b584
|
Disable libcurl tests for Emscripten.
|
2013-05-06 20:59:47 -07:00 |
James Gregory
|
5138fb66fd
|
Add pre-build dependencies for Emscripten libpng, libz.
|
2013-05-06 20:59:47 -07:00 |
James Gregory
|
51d42d7392
|
Add index.html for SimpleGame and TestCpp. Set resolution on all canvases to 800x500 to match code.
|
2013-05-06 20:59:47 -07:00 |
James Gregory
|
7d563a818a
|
Hack: use 800x500 resolution for window for emscripten so that mouse roughly lines up.
|
2013-05-06 20:59:47 -07:00 |
James Gregory
|
19c6a50d50
|
Enable texture caching with emscripten.
|
2013-05-06 20:59:46 -07:00 |
James Gregory
|
a1c628f80a
|
Fix Motion streak client side buffers
|
2013-05-06 20:58:46 -07:00 |
James Gregory
|
edcd0f12e4
|
Add platform files for Emscripten.
|
2013-05-06 20:58:46 -07:00 |
James Gregory
|
9500448f87
|
Get CCGrid to work.
|
2013-05-06 20:58:46 -07:00 |
James Gregory
|
089a47d937
|
Add method to CCNode class to allow uploading data to GPU. Call it from CCSprite.
|
2013-05-06 20:58:45 -07:00 |
James Gregory
|
aa2739a109
|
Update build process for HelloCpp to build .js and .data files separately, pulling both in from index.html
|
2013-05-06 20:58:45 -07:00 |
James Gregory
|
77e9f4902e
|
Build fixes for emscripten, add linkage to libfreetype.a
|
2013-05-06 20:58:45 -07:00 |
James Gregory
|
9d6db6953e
|
Instruct Emscripten to emit .html file for HelloCpp sample.
|
2013-05-06 20:58:45 -07:00 |
James Gregory
|
1d307d676d
|
Remove freetype source and add libfreetype.a as built by the Emscripten test-suite.
Revert "Add freetype 2.4.11 to repo"
This reverts commit 418906d2612b59ead6826d8395b69168bdff0ca4.
|
2013-05-06 20:58:45 -07:00 |
James Gregory
|
ea6a5fde17
|
Revert "Add freetype 2.4.11 to repo"
This reverts commit 418906d2612b59ead6826d8395b69168bdff0ca4.
|
2013-05-06 20:58:45 -07:00 |
James Gregory
|
d5ec8f240e
|
Add freetype 2.4.11 to repo
|
2013-05-06 20:58:44 -07:00 |
James Gregory
|
955ba1bfd3
|
ifdef tango around some symbols that aren't defined in Emscripten (nor a bunch of other platforms, it seems).
|
2013-05-06 20:58:43 -07:00 |
James Gregory
|
0bef8d4325
|
bool x = NULL => bool x = false, to silence Clang.
|
2013-05-06 20:58:43 -07:00 |
James Gregory
|
5a23190672
|
Add main.cpp files for app samples
|
2013-05-06 20:58:43 -07:00 |
James Gregory
|
4f56f93269
|
Add #defines for Emscripten platform
|
2013-05-06 20:58:43 -07:00 |
James Gregory
|
c45e5797cf
|
Add Makefiles for Emscripten + Emscripten external
|
2013-05-06 20:58:02 -07:00 |
minggo
|
923234a095
|
Merge pull request #2399 from gelldur/linking_errors_linux_lub_curl
Fixing linking errors for TestCPP with libcurl
|
2013-05-06 20:52:58 -07:00 |
minggo
|
877e6032dc
|
Update AUTHORS
|
2013-05-07 11:08:53 +08:00 |
minggo
|
80dfd4d493
|
Merge pull request #2407 from sergey-shambir/attribute_format
Added __attribute__(__format__()) for CCLog and CCString
|
2013-05-06 20:06:52 -07:00 |
James Chen
|
dc4673a8b3
|
Update AUTHORS
|
2013-05-07 11:04:08 +08:00 |
James Chen
|
b902fa1428
|
Merge pull request #2518 from dumganhar/iss2106-js-bytecode
fixed #2106: Addig support for javascript bytecode.
|
2013-05-06 20:02:15 -07:00 |
James Chen
|
9a7c849ce4
|
fixed #2106: Fixing a bug on android when only jsc files exist.
|
2013-05-07 10:50:09 +08:00 |
James Chen
|
bf6bbba6ee
|
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode
|
2013-05-07 09:43:24 +08:00 |
sunzhuoshi
|
fa39c41136
|
Fixed bad commit
|
2013-05-06 19:06:16 +08:00 |
James Chen
|
9a63b39974
|
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode
|
2013-05-06 18:13:26 +08:00 |
sunzhuoshi
|
3da5a7d5cd
|
Removed redundant code
|
2013-05-06 18:06:18 +08:00 |
minggo
|
e6afc9a180
|
Update AUTHORS
|
2013-05-06 18:03:35 +08:00 |
minggo
|
d395d26e1d
|
Merge pull request #2417 from sergey-shambir/disable_copy
Added CC_DISABLE_COPY macro
|
2013-05-06 03:02:48 -07:00 |
sunzhuoshi
|
cbb7824941
|
Modified jsbcc to use "-p" option to turn on pipe mode
|
2013-05-06 16:20:13 +08:00 |
sunzhuoshi
|
6e70884853
|
Removed redundant code
|
2013-05-06 15:43:33 +08:00 |
minggo
|
265168dac2
|
Update AUTHORS
|
2013-05-06 14:57:51 +08:00 |
minggo
|
bbf0f9d1bd
|
Merge pull request #2513 from savdalion/const-methods
Added const methods for classes - purer code!
|
2013-05-05 23:55:37 -07:00 |
minggo
|
2c9c5a02e5
|
Update AUTHORS
|
2013-05-06 14:54:12 +08:00 |
minggo
|
73dba9ef2c
|
Merge pull request #2514 from savdalion/extend-tests
Added example for russian language in TestCpp / LabelTest / BMFontUnicode
|
2013-05-05 23:52:30 -07:00 |
minggo
|
9c1dfa12c8
|
Update AUTHORS
|
2013-05-06 14:46:22 +08:00 |
minggo
|
6f1eefea31
|
Merge pull request #2483 from Weeds/fix-HttpClient
Fixed crash in HttpClient request on 64Bit
|
2013-05-05 23:44:34 -07:00 |
James Chen
|
f86a843c8b
|
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode
|
2013-05-06 12:55:44 +08:00 |
sunzhuoshi
|
d4c4170368
|
Removed bad comment
|
2013-05-06 12:02:17 +08:00 |
James Chen
|
4657ef716c
|
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode
|
2013-05-06 11:43:40 +08:00 |
sunzhuoshi
|
de27f1137a
|
Changed byte code file ext to ".jsc"
Modified loading logic to load js file first
|
2013-05-06 11:32:23 +08:00 |
James Chen
|
0718e6cf70
|
Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x into iss2106-js-bytecode
|
2013-05-06 11:15:19 +08:00 |
James Chen
|
0868a18751
|
Update AUTHORS
|
2013-05-06 11:04:42 +08:00 |
James Chen
|
407998619a
|
Merge pull request #2517 from dumganhar/iss2105-travis
fixed #2105: Adding Travis build support for linux and NaCl.
|
2013-05-05 19:58:47 -07:00 |