Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,288 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

9288 Commits

Author SHA1 Message Date
James Gregory db19fce3a3 Remove debug print statement 2013-05-06 13:26:32 -07:00
James Gregory 13ade854bc Switch makefile over to using Emscripten headers for freetype. 2013-05-06 13:26:32 -07:00
James Gregory b3acdd6647 List of things left to do to get Emscripten working 100%. Living document. 2013-05-06 13:26:32 -07:00
James Gregory c9b86b8277 More client side buffer fixes. 2013-05-06 13:26:32 -07:00
James Gregory e488c2e35c More client side buffer fixes. 2013-05-06 13:26:32 -07:00
James Gregory 21a53cdcfc More client side buffer fixes. 2013-05-06 13:26:32 -07:00
James Gregory 30a2a1cdf1 More client side buffer fixes. 2013-05-06 13:26:32 -07:00
James Gregory 0fd908bd13 Add warning messages if any of the raw primitive drawing methods are used (they seem not to be, in pratice). 2013-05-06 13:26:32 -07:00
James Gregory 120198d486 Add freetype2 headers that match the .a we're using. 2013-05-06 13:26:32 -07:00
James Gregory 58d9478b98 Copy resources in HelloCpp makefile 2013-05-06 13:26:31 -07:00
James Gregory 5e2f52b6d6 Switch to slot-based GL buffer loading code for CCSprite. 2013-05-06 13:26:31 -07:00
James Gregory 8af0e8a72a Basis of Makefile for SimpleGame sample. 2013-05-06 13:26:31 -07:00
James Gregory ea071d9897 Add missing Makefile reference to file utils for Emscripten. 2013-05-06 13:26:31 -07:00
James Gregory 46faeace36 Increase heap size for Emscripten binaries, add in missing linkages. 2013-05-06 13:26:31 -07:00
James Gregory b40b12d345 Add resources to TestCpp makefile 2013-05-06 13:26:31 -07:00
James Gregory 1d43e88123 Disable libcurl tests for Emscripten. 2013-05-06 13:26:31 -07:00
James Gregory f0f642d2fc Add pre-build dependencies for Emscripten libpng, libz. 2013-05-06 13:26:31 -07:00
James Gregory 10ebd44628 Add index.html for SimpleGame and TestCpp. Set resolution on all canvases to 800x500 to match code. 2013-05-06 13:26:31 -07:00
James Gregory 576ff593c7 Hack: use 800x500 resolution for window for emscripten so that mouse roughly lines up. 2013-05-06 13:26:31 -07:00
James Gregory d44b552df1 Enable texture caching with emscripten. 2013-05-06 13:26:30 -07:00
James Gregory 2c89f69ee0 Fix Motion streak client side buffers 2013-05-06 13:23:44 -07:00
James Gregory 047c53790d Add platform files for Emscripten. 2013-05-06 13:23:44 -07:00
James Gregory e7077af4f9 Get CCGrid to work. 2013-05-06 13:23:44 -07:00
James Gregory 6ae68248c1 Add method to CCNode class to allow uploading data to GPU. Call it from CCSprite. 2013-05-06 13:23:44 -07:00
James Gregory d26492af71 Update build process for HelloCpp to build .js and .data files separately, pulling both in from index.html 2013-05-06 13:23:43 -07:00
James Gregory c71dff8c41 Build fixes for emscripten, add linkage to libfreetype.a 2013-05-06 13:23:43 -07:00
James Gregory d7dd9a24b7 Instruct Emscripten to emit .html file for HelloCpp sample. 2013-05-06 13:23:43 -07:00
James Gregory eb2f918418 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 13:23:43 -07:00
James Gregory 5d34490126 Revert "Add freetype 2.4.11 to repo" 
This reverts commit 418906d2612b59ead6826d8395b69168bdff0ca4.
 2013-05-06 13:23:43 -07:00
James Gregory 7d9d9bbaaa Add freetype 2.4.11 to repo 2013-05-06 13:23:42 -07:00
James Gregory 61c171c321 ifdef tango around some symbols that aren't defined in Emscripten (nor a bunch of other platforms, it seems). 2013-05-06 13:23:42 -07:00
James Gregory a6e42f20df bool x = NULL => bool x = false, to silence Clang. 2013-05-06 13:23:41 -07:00
James Gregory 719203f6d5 Add main.cpp files for app samples 2013-05-06 13:23:41 -07:00
James Gregory d89c050003 Add #defines for Emscripten platform 2013-05-06 13:23:41 -07:00
James Gregory 53340557f2 Add Makefiles for Emscripten + Emscripten external 2013-05-06 13:18:37 -07:00
James Chen c8a8a7b6c9 Update AUTHORS 2013-05-06 13:18:37 -07:00
Sam Clegg 4f6de1bcad Rename CCScriptSupport::executeAssert -> CCScriptSupport::handleAssert 
Also remove the first "cond" argument, since it is always false.
 2013-05-06 12:25:13 -07:00
Sam Clegg e699919bc6 Log assert messages 
Now, assert messages as visible in the trace output
as well as the line number of condition that failed.
 2013-05-06 12:25:13 -07:00
Adrien Béraud 6a5559da7f Check for 0 length in CCPoint::normalize() 2013-05-07 03:15:28 +10:00
Adrien Béraud f71798a35b Check for 0 length in CCPoint::normalize() 2013-05-07 02:59:38 +10:00
Adrien Béraud 49474f5194 documentation 2013-05-07 02:53:13 +10:00
Ed Bartley 040e6fc5b9 Promote global functions and variables for PVR decryption to ZipUtils class. 
Rename PVR decryption functions and variables to better fit in the Cocos2DX framework.
Improve log error notes.
Update TextureAtlasEncryptionTest to match revised function call in ZipUtils.
Update ccSetPvrEncryptionKeyPart documentation to clarify that encryption is never 100% secure.
 2013-05-06 10:04:45 -04: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
samuele3 20e802f1bc issue #2103: Add more lua test case 2013-05-06 16:05:20 +08:00
sunzhuoshi 6e70884853 Removed redundant code 2013-05-06 15:43:33 +08:00