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 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
James Gregory 172a96746d Move emscripten build to a separate Make target, remove Lua targets which I haven't tried to build. 2013-04-22 13:47:09 -07:00
James Gregory bb8dc433fc Enable -O2 optimization now that Emscripten seems to succeed. 2013-04-22 13:46:23 -07:00
James Gregory e92e70a450 Delete tmp directory after generating data file. 2013-04-22 13:46:03 -07:00
Andrew Goulding 3c6bb725e7 Added additional CCLOG to CCFileUtils::fullPathForFilename 
There's currently no way to be sure, from a calling function, that
fullPathForFilename has returned an invalid file path, which makes it
difficult to quickly track down missing, or incorrect file paths. Added
a CCLOG before the original string is returned to make debugging
missing or incorrect file paths easier.
 2013-04-23 06:24:12 +10:00
James Gregory 796152ad52 Bump Emscripten version 2013-04-22 13:01:45 -07:00
James Gregory 239f857b19 Rebuild libfreetype without references to my home dir in it. 2013-04-22 13:01:10 -07:00
minggo 15f55ef5cd Merge pull request #2421 from natural-law/master 
issue #1723 : Update the iOS projects in plugin, and remove the win32 projects.
 2013-04-22 02:27:40 -07:00
zhangbin 42ca70937f Update the iOS projects in plugin, and remove the win32 projects. 2013-04-22 17:11:45 +08:00
minggo 25a0927bf7 Merge pull request #2419 from natural-law/master 
Add protocol Ads & plugin Admob
 2013-04-22 01:51:35 -07:00
minggo ec43617469 Merge pull request #2420 from minggo/2073-userdefault_memory_leak_ 
fixed #2073: fix memory leak in CCUserDefault
 2013-04-22 01:46:00 -07:00
minggo d89792fdc6 fixed #2073: fix memory leak in CCUserDefault 2013-04-22 16:43:05 +08:00
zhangbin 155064edfa Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-04-22 11:19:22 +08:00
zhangbin abd6f3c906 Add sample code HelloAds for android platform 2013-04-22 11:17:31 +08:00
zhangbin 6a48e8145d Add plugin admob for android platform. 2013-04-22 10:40:29 +08:00
zhangbin 79870ded6a Add ads protocol. 2013-04-22 10:38:14 +08:00