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

9481 Commits

Author SHA1 Message Date
James Gregory 19f6c7978b More client side buffer fixes. 2013-05-06 20:59:48 -07:00
James Gregory 8a9586fd9d More client side buffer fixes. 2013-05-06 20:59:48 -07:00
James Gregory 91ea64db09 More client side buffer fixes. 2013-05-06 20:59:48 -07:00
James Gregory 9352b8b359 More client side buffer fixes. 2013-05-06 20:59:48 -07:00
James Gregory f35e32d158 Add warning messages if any of the raw primitive drawing methods are used (they seem not to be, in pratice). 2013-05-06 20:59:48 -07:00
James Gregory 5295202081 Add freetype2 headers that match the .a we're using. 2013-05-06 20:59:47 -07:00
James Gregory ac2986139a Copy resources in HelloCpp makefile 2013-05-06 20:59:47 -07:00
James Gregory d52aa420e8 Switch to slot-based GL buffer loading code for CCSprite. 2013-05-06 20:59:47 -07:00
James Gregory 749c92a572 Basis of Makefile for SimpleGame sample. 2013-05-06 20:59:47 -07:00
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
James Gregory c58ef91413 Simplify Emscripten makefile a little. 2013-05-06 20:34:15 -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
James Gregory e322538e7c Merge branch 'emscriptenate' of github.com:j4m3z0r/cocos2d-x into emscriptenate 
Conflicts:
	cocos2dx/draw_nodes/CCDrawingPrimitives.cpp
	cocos2dx/platform/CCPlatformMacros.h
	cocos2dx/proj.emscripten/cocos2dx.mk
	external/emscripten
	samples/Cpp/TestCpp/proj.emscripten/Makefile
 2013-05-06 14:52:03 -07:00
James Gregory 70f4a30d1e Merge fix 2013-05-06 14:46:34 -07:00
James Gregory 319a63ddc3 Bump Emscripten Version 2013-05-06 14:46:10 -07:00
James Gregory 7884b7d5af Disable unsafe GL opts, enable -O2 2013-05-06 14:33:20 -07:00
James Gregory f366f25d79 Add missing files to testcpp makefile 2013-05-06 14:33:20 -07:00
James Gregory b4dc48cf63 Point Emscripten root to be the external referenced by the tree. 2013-05-06 14:33:20 -07:00
James Gregory c75e44b97c Use floats instead of doubles for Chipmunk. 2013-05-06 14:33:20 -07:00
James Gregory ec69c1a533 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-06 14:33:20 -07:00
James Gregory 0aa7178324 Compile Chipmunk as C++ rather than C so that calling from C++ code works under Emscripten. 2013-05-06 14:33:20 -07:00
James Gregory 8ba936996f Add myself to authors so folks know who to blame :) 2013-05-06 14:33:19 -07:00