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

9202 Commits

Author SHA1 Message Date
minggo 0c721096ec fixed #2099:fixed a bug in ScriptingCore::evalString not setting the outval 2013-05-02 09:03:24 +08:00
James Gregory 737d51a05b Merge branch 'emscriptenate' of github.com:j4m3z0r/cocos2d-x into emscriptenate 
Conflicts:
	Emscripten.TODO
	cocos2dx/proj.emscripten/cocos2dx.mk
	external/chipmunk/proj.emscripten/Makefile
	samples/Cpp/TestCpp/proj.emscripten/Makefile
 2013-05-01 13:45:15 -07:00
James Gregory 675bf53a4e Add missing files to testcpp makefile 2013-05-01 13:33:56 -07:00
James Gregory ddbdae1988 Point Emscripten root to be the external referenced by the tree. 2013-05-01 13:33:56 -07:00
James Gregory c885822527 Use floats instead of doubles for Chipmunk. 2013-05-01 13:33:56 -07:00
James Gregory d1c76886ec Enable texture cache on Emscripten. Not sure yet if this is the best balance, since we're both short on memory *and* compute time. 2013-05-01 13:33:56 -07:00
James Gregory 227b357241 Compile Chipmunk as C++ rather than C so that calling from C++ code works under Emscripten. 2013-05-01 13:33:56 -07:00
James Gregory 19b67bc843 Add missing file from CocosDenshion. 2013-05-01 13:33:56 -07:00
James Gregory ff50c4e1fe Add myself to authors so folks know who to blame :) 2013-05-01 13:33:56 -07:00
James Gregory 7a4be17724 Interval test working now also -- update TODO. 2013-05-01 13:33:56 -07:00
James Gregory a7bcf33889 Add missing fonts to TestCpp makefile, fixing layertest. 2013-05-01 13:33:55 -07:00
James Gregory afa4283644 Updated TODO list 2013-05-01 13:33:55 -07:00
James Gregory c2711f32ee Add missing assets from TestCpp's Makefile 2013-05-01 13:33:55 -07:00
James Gregory 0eb12121c6 Add libtiff to Emscripten builds, plus some build flags. 2013-05-01 13:33:55 -07:00
James Gregory cb9c5688b2 Add libtiff build -- build with straight emconfigure, emmake, with a troublesome assert removed (assert(sizeof(uint64) == 8)). 2013-05-01 13:33:55 -07:00
James Gregory 4f9c14e06e Add missing assets from "Extentions" to TestCpp. 2013-05-01 13:33:55 -07:00
James Gregory be26883e2b Set orientation to 0 for Emscripten, thus avoiding a segfault. 2013-05-01 13:33:55 -07:00
James Gregory c92d4acbba Switch to O1 for now. 2013-05-01 13:33:55 -07:00
James Gregory 57a25c495a Remove LOG prefixes from emscripten makefiles 2013-05-01 13:33:55 -07:00
James Gregory da8cea4b0c Remove lua samples from emscripten makefile 2013-05-01 13:33:55 -07:00
James Gregory 11ad9db8e8 Updates to my TODO list. 2013-05-01 13:33:55 -07:00
James Gregory 03ed7ff772 Move to a separate Makefile for Emscripten. 2013-05-01 13:33:55 -07:00
James Gregory 93238572df Fix the ordering of vertex attributes for CCProgressTimer. 2013-05-01 13:33:55 -07:00
James Gregory 7a30b0e446 Implement primitive drawing methods for Emscripten 2013-05-01 13:33:54 -07:00
James Gregory 7bc1a200bf Move emscripten build to a separate Make target, remove Lua targets which I haven't tried to build. 2013-05-01 13:33:54 -07:00
James Gregory 3d6b073ea4 Enable -O2 optimization now that Emscripten seems to succeed. 2013-05-01 13:33:54 -07:00
James Gregory bd915513c2 Delete tmp directory after generating data file. 2013-05-01 13:33:54 -07:00
James Gregory f2d433b028 Bump Emscripten version 2013-05-01 13:33:54 -07:00
James Gregory 3c14d57a09 Rebuild libfreetype without references to my home dir in it. 2013-05-01 13:33:54 -07:00
James Gregory ae260785ae Correct the resolution in main.cpp for TestCpp for Emscripten 2013-05-01 13:33:53 -07:00
James Gregory b032fc2d61 Remove -DLINUX from Emscripten chipmunk makefile 2013-05-01 13:33:53 -07:00
James Gregory dafd1e6ceb Add note on origin of libxml binary. 2013-05-01 13:33:53 -07:00
James Gregory e58fff202e Don't set animation interval on emscripten builds since that is driven by the request frame API. 2013-05-01 13:33:53 -07:00
James Gregory 9033dd011e Add libxml2 build for Emscripten. 2013-05-01 13:33:53 -07:00
James Gregory 056ff5b5e6 Remove redundant -l flags from emscripten build -- it doesn't have fontconfig, and GL stuff is linked in automatically. 2013-05-01 13:33:52 -07:00
James Gregory a7a7b3c919 Move GL server-side buffer code into a separate class and use multiple inheritance to deploy only to classes that need it. 2013-05-01 13:33:52 -07:00
James Gregory abeeb4a105 Switch to using GL_DYNAMIC_DRAW. 2013-05-01 13:33:52 -07:00
James Gregory b60f740e90 Remove debug print statement 2013-05-01 13:33:52 -07:00
James Gregory e4a0f18696 Switch makefile over to using Emscripten headers for freetype. 2013-05-01 13:33:52 -07:00
James Gregory b826420097 List of things left to do to get Emscripten working 100%. Living document. 2013-05-01 13:33:52 -07:00
James Gregory f613dd713b More client side buffer fixes. 2013-05-01 13:33:52 -07:00
James Gregory 303c5a0ab0 More client side buffer fixes. 2013-05-01 13:33:52 -07:00
James Gregory 8861ee8b3f More client side buffer fixes. 2013-05-01 13:33:52 -07:00
James Gregory 61146d17e8 More client side buffer fixes. 2013-05-01 13:33:52 -07:00
James Gregory 1ca7cac40a Add warning messages if any of the raw primitive drawing methods are used (they seem not to be, in pratice). 2013-05-01 13:33:52 -07:00
James Gregory 54560fb966 Add freetype2 headers that match the .a we're using. 2013-05-01 13:33:51 -07:00
James Gregory 735f7b13f7 Copy resources in HelloCpp makefile 2013-05-01 13:33:51 -07:00
James Gregory aa8499e69f Switch to slot-based GL buffer loading code for CCSprite. 2013-05-01 13:33:51 -07:00
James Gregory a072cb590a Basis of Makefile for SimpleGame sample. 2013-05-01 13:33:51 -07:00
James Gregory 169d5b3102 Add missing Makefile reference to file utils for Emscripten. 2013-05-01 13:33:51 -07:00