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 fc52b246e1 Interval test working now also -- update TODO. 2013-04-24 12:12:38 -07:00
James Gregory 9ea2396884 Add missing fonts to TestCpp makefile, fixing layertest. 2013-04-24 12:11:10 -07:00
zhangbin f30aaed426 Modify the permission of plugin twitter. 2013-04-24 17:23:35 +08:00
minggo fb7851b429 define checkAnim() before using it 2013-04-24 17:06:59 +08:00
zhangbin f7e07188b2 Adjust the implementation of ProtocolSocial & plugin twitter. 2013-04-24 16:53:02 +08:00
zhangbin 98bd3f79ed Merge branch 'master' of https://github.com/natural-law/cocos2d-x 2013-04-24 16:46:35 +08:00
minggo 93ed85903f Merge pull request #2437 from dumganhar/iss2075-spine-support 
fixed #2075: Adding spine editor support.
 2013-04-24 01:12:23 -07:00
Bin Zhang d657524859 Merge pull request #1 from lihex/master 
Add twitter social share plugin
 2013-04-24 01:03:23 -07:00
lihex 661977645e Add HelloSocial sample 2013-04-24 16:00:36 +08:00
lihex ae7dab15b6 Submit twitter share plugin implement 2013-04-24 15:59:54 +08:00
lihex 4e24ce40ea Submit protocol of social share plugin 2013-04-24 15:58:57 +08:00
James Chen 2c69ce8d80 fixed #2075: Updating multi-platform template project settings. 2013-04-24 15:56:37 +08:00
zhangbin 1af72075bc Merge branch 'master' of https://github.com/natural-law/cocos2d-x 2013-04-24 15:43:53 +08:00
James Chen abacdc9921 tabify for makefile. 2013-04-24 15:15:25 +08:00
James Chen 8e5610fc58 issue #2075: Updating Makefile of TestCpp for native client port. 2013-04-24 15:00:53 +08:00
James Chen 6c1890f8ab issue #2075: Updating TestCpp project setting for marmalade and linux. 2013-04-24 14:58:11 +08:00
minggo c0582d9d40 Merge pull request #2435 from minggo/master 
fix memory leak in FontTest
 2013-04-23 23:53:13 -07:00
minggo c6dfee706c fix memory leak in FontTest 2013-04-24 14:49:52 +08:00
James Chen 7b138c6be9 issue #2075: Adding spinetest in TestCpp for win32. 2013-04-24 14:48:39 +08:00
James Chen 6b4420e7ec issue #2075: Updating extensions project for linux, native client and marmalade. 2013-04-24 14:37:22 +08:00
James Chen f7947d25bc fixed #2075: Updating iOS template. 2013-04-24 14:36:32 +08:00
James Chen 7755b025ee Adding spine/spine-cocos2dx.h to cocos-ext.h. 2013-04-24 14:36:11 +08:00
James Chen 0c3cb27113 issue #2075: Updating TestCpp for mac. 2013-04-24 14:34:41 +08:00
James Chen 2d1172814d issue #2075: Adding spine editor support. Adding a new test 'SpineTest' in TestCpp, adding the parse code in "extensions/spine". It works only on iOS now. 2013-04-24 13:57:34 +08:00
James Gregory 93a7b446b0 Updated TODO list 2013-04-23 22:45:53 -07:00
James Gregory c179939282 Add missing assets from TestCpp's Makefile 2013-04-23 22:45:27 -07:00
James Gregory 347eb1a603 Add libtiff to Emscripten builds, plus some build flags. 2013-04-23 22:45:05 -07:00
James Gregory f5b36f203e Add libtiff build -- build with straight emconfigure, emmake, with a troublesome assert removed (assert(sizeof(uint64) == 8)). 2013-04-23 22:43:40 -07:00
GGGGamer a858613de1 memory leak when preloadEffect 2013-04-24 12:10:18 +08:00
James Gregory b3aff98d69 Add missing assets from "Extentions" to TestCpp. 2013-04-23 19:03:57 -07:00
James Gregory 11cb6fbdd0 Set orientation to 0 for Emscripten, thus avoiding a segfault. 2013-04-23 19:01:35 -07:00
zhangbin 297e32c20d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-04-24 09:59:46 +08:00
zhangbin 8d60e11a9f Update the JS binding for plugin 2013-04-24 09:43:40 +08:00
James Gregory bedc6e9314 Switch to O1 for now. 2013-04-23 14:45:30 -07:00
James Gregory ae19158da8 Remove LOG prefixes from emscripten makefiles 2013-04-23 14:43:59 -07:00
James Gregory b22fd3ea7b Remove lua samples from emscripten makefile 2013-04-23 14:43:15 -07:00
James Gregory d1f98fc79c Updates to my TODO list. 2013-04-23 13:11:17 -07:00
James Gregory 2e22848de5 Move to a separate Makefile for Emscripten. 2013-04-23 13:10:49 -07:00
imbahom 72ad9fd701 Update CCNode.cpp 
注释错误
 2013-04-23 21:44:24 +08:00
James Chen 84ec031fcf Merge pull request #2427 from CocosRobot/updategeneratedsubmodule_1366690273 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-04-22 23:14:03 -07:00
James Gregory 8e9a8dce69 Fix the ordering of vertex attributes for CCProgressTimer. 2013-04-22 22:10:58 -07:00
CocosRobot ca30ce7462 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-23 12:11:31 +08:00
James Chen 69c1c2ff2f Merge pull request #2426 from dumganhar/master 
fix a typo in js_cocos2dx_CCTMXLayer_getTiles.
 2013-04-22 19:58:44 -07:00
James Chen e84cf9ef83 Correct log output in js_cocos2dx_CCTMXLayer_getTiles 2013-04-23 10:57:55 +08:00
James Chen 30c6915449 fix a typo. 2013-04-23 10:52:51 +08:00
James Chen c7c1415cd6 Merge pull request #2425 from dumganhar/iss2076-setResolutionScale 
fixed #2076: Adding a method CCBReader::setResolutionScale for setting resolution scale manually
 2013-04-22 19:50:20 -07:00
James Chen 685fe16e10 fixed #2076: Adding a method CCBReader::setResolutionScale for setting resolution scale manually 2013-04-23 10:39:59 +08:00
minggo f99ffcd6df Merge pull request #2424 from minggo/master 
don't include unneeded header file
 2013-04-22 19:23:01 -07:00
minggo d4efbcfcef don't include unneeded header file 2013-04-23 10:10:14 +08:00
James Gregory 3e85683ace Implement primitive drawing methods for Emscripten 2013-04-22 18:08:25 -07:00