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

7842 Commits

Author SHA1 Message Date
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
James Chen ff1568d813 Update AUTHORS 2013-04-03 22:38:51 +08:00
James Chen 425b95152c Merge pull request #2295 from SevInf/master 
fixed #1999: CCEditBox iOS enchantments/bugfixes
 2013-04-03 07:37:29 -07:00
Sergej Tatarincev 202edc1597 CCEditBox test for separate font name/size setters 2013-04-03 17:20:01 +03:00
James Chen a470a76d0b Merge pull request #2303 from dumganhar/master 
Updating SceneTest.lua.
 2013-04-03 03:32:04 -07:00
James Chen 031e77ccbe Updating SceneTest.lua. 2013-04-03 18:31:00 +08:00
James Chen 984f0b59eb Merge pull request #2301 from dumganhar/iss1998-lua-SceneTest 
fixed #1998: Adding SceneTest and IntervalTest for TestLua.
 2013-04-03 03:15:35 -07:00
James Chen 818a570b7f fixed #1998: Adding SceneTest.lua for TestLua. 2013-04-03 18:14:03 +08:00
James Chen 229d4329a5 fixed #1997: Adding IntervalTest for TestLua. 2013-04-03 17:00:05 +08:00
James Chen de863965cc Merge pull request #2300 from dumganhar/iss1814-lua-menu-test 
fixed #1814: [LUA] Adding MenuTest for Testlua.
 2013-04-03 01:32:36 -07:00
James Chen 2d9f8ca8de fixed #1814: MenuTest for Testlua is ok. 2013-04-03 16:29:16 +08:00
James Chen 5fec94e563 Merge pull request #2297 from dumganhar/iss1994-actionmanager-test 
fixed #1994: Adding actionManagerTest.lua.
 2013-04-02 21:00:10 -07:00
James Chen 686775300d fixed #1994: ActionManagerTest.lua is ok. 2013-04-03 11:59:17 +08:00
James Chen 8d5ec65cc8 Update AUTHORS 2013-04-03 11:18:15 +08:00
James Chen c173208b10 Merge pull request #2296 from rtissera/jni_fixes 
fixed #1996: JNI fixes, added missing JNIEXPORT / JNICALL declarations
 2013-04-02 20:15:52 -07:00
James Chen c54ee96705 issue #1994: Adding actionManagerTest.lua. 2013-04-03 10:20:12 +08:00
Romain Tisserand 15d4e75cdb JNI fixes, added missing JNIEXPORT / JNICALL declarations 
This is needed if compiling with custom visibility settings (example :
-fvisibility=hidden)
 2013-04-02 22:15:12 +02:00
Sergej Tatarincev 17caacbeb5 Resize CCEditBox subviews when contentSize changes 
1. Place placeholder and text labels correctly;
2. Resize native view when parent content size changes.
 2013-04-02 16:34:33 +03:00
Sergej Tatarincev 380ec78fcd Allow to set EditBox font name and size separately 2013-04-02 16:31:30 +03:00
James Chen 654931d838 Merge pull request #2294 from dumganhar/iss1993-parallax-test 
fixed #1993: Adding ParallaxTest for TestLua.
 2013-04-02 03:21:08 -07:00
James Chen 46b26cffd3 fixed #1993: Adding ParallaxTest for TestLua. 2013-04-02 18:20:14 +08:00
James Chen 2de4dde0bd Merge pull request #2293 from dumganhar/iss1942-layertest 
fixed #1942: LayerTest for TestLua is ok.
 2013-04-02 02:54:21 -07:00