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

9266 Commits

Author SHA1 Message Date
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
James Gregory 2455cf943c Increase heap size for Emscripten binaries, add in missing linkages. 2013-05-01 13:33:51 -07:00
James Gregory 64222b20b8 Add resources to TestCpp makefile 2013-05-01 13:33:51 -07:00
James Gregory 905725184d Disable libcurl tests for Emscripten. 2013-05-01 13:33:51 -07:00
James Gregory dd9e82c068 Add pre-build dependencies for Emscripten libpng, libz. 2013-05-01 13:33:51 -07:00
James Gregory 17b3026724 Add index.html for SimpleGame and TestCpp. Set resolution on all canvases to 800x500 to match code. 2013-05-01 13:33:51 -07:00
James Gregory 934a21dcf1 Hack: use 800x500 resolution for window for emscripten so that mouse roughly lines up. 2013-05-01 13:33:50 -07:00
James Gregory 7fe614c1b4 Enable texture caching with emscripten. 2013-05-01 13:33:50 -07:00
James Gregory 20b7ea87ba Fix Motion streak client side buffers 2013-05-01 13:33:50 -07:00
James Gregory 85ac1bc42e Add platform files for Emscripten. 2013-05-01 13:33:50 -07:00
James Gregory a3f064983e Get CCGrid to work. 2013-05-01 13:33:50 -07:00
James Gregory 7a140c618e Add method to CCNode class to allow uploading data to GPU. Call it from CCSprite. 2013-05-01 13:33:50 -07:00
James Gregory c14773128e Update build process for HelloCpp to build .js and .data files separately, pulling both in from index.html 2013-05-01 13:33:50 -07:00
James Gregory 6417812802 Build fixes for emscripten, add linkage to libfreetype.a 2013-05-01 13:33:50 -07:00
James Gregory dc70cc0859 Instruct Emscripten to emit .html file for HelloCpp sample. 2013-05-01 13:33:50 -07:00
James Gregory e6c9fb79a0 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-01 13:33:50 -07:00
James Gregory e7df63c73d Revert "Add freetype 2.4.11 to repo" 
This reverts commit 418906d2612b59ead6826d8395b69168bdff0ca4.
 2013-05-01 13:33:49 -07:00
James Gregory 6ce6fa3917 Add freetype 2.4.11 to repo 2013-05-01 13:33:49 -07:00
James Gregory 0d9574066d ifdef tango around some symbols that aren't defined in Emscripten (nor a bunch of other platforms, it seems). 2013-05-01 13:33:48 -07:00
James Gregory 66174335fd bool x = NULL => bool x = false, to silence Clang. 2013-05-01 13:33:48 -07:00
James Gregory c798a34838 Add main.cpp files for app samples 2013-05-01 13:33:48 -07:00
James Gregory 5e85d27d96 Add #defines for Emscripten platform 2013-05-01 13:33:48 -07:00
James Gregory d062e88fe7 Set build config for Emscripten rather than Linux out of the box. 2013-05-01 13:33:48 -07:00
James Gregory 03836f3198 Add Makefiles for Emscripten + Emscripten external 2013-05-01 13:33:48 -07:00
Darragh Coy 212feb8d8c Add CCDirector::popToSceneStackLevel(int level) 
This replicates a change made to cocos2d-iphone in the following commit:
59c5272bff

The cocos2d-iphone change was originally discussed in the following pull request:
http://github.com/cocos2d/cocos2d-x/pull/2210
 2013-04-30 23:33:22 +01:00
Pranav Tekchand 0a996804fa Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-04-30 21:06:18 +05:30
Michael Chinen be2f20e213 Fix missing protocol method warning for iOS 6.0 addition 2013-05-01 00:35:17 +09:00
Pranav Tekchand 4360c3bff8 Support negative scaling of CCScrollView. 
Not checking for it in CCScrollView::getViewRect causes intersectsRect calls (eg: to check if the touch was within the bounds) to return false.
 2013-04-30 20:47:38 +05:30
sunzhuoshi 077214c419 Modified to ensure no popup notify when no byte code file 2013-04-30 20:39:06 +08:00
sunzhuoshi 29d37ad4ec Fixed issue when used via pipe 2013-04-30 17:18:23 +08:00
sunzhuoshi 17f16e16fc Added README 2013-04-30 14:03:54 +08:00
James Gregory 13947c4c23 Add missing file from CocosDenshion. 2013-04-29 17:13:24 -07:00
Sam Clegg 52791bd85d Add .travis.yml 
This builds all libraries and examples in both debug
and release for Linux and NaCl platforms.

Add travis build status image to README.mdown.

Also, split the linux dependency installation into
its own script: install-deps-linux.sh
 2013-04-29 16:46:51 -07:00
Sam Clegg 924d271410 Fix warnings. 2013-04-29 16:46:48 -07:00
sunzhuoshi d4832e3f46 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into cocos2d-master 
Conflicts:
	scripting/javascript/bindings/ScriptingCore.cpp
 2013-04-30 03:51:07 +08:00
sunzhuoshi 163c19fac2 Added support for javascript byte code 2013-04-30 03:29:56 +08:00
minggo 60e4730122 Update AUTHORS 2013-04-29 23:26:18 +08:00