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

9897 Commits

Author SHA1 Message Date
minggo 21908b7a53 Merge pull request #2916 from minggo/load-image-async 
fixed #2124: make CCImage::initWithIamgeFileThreadSafe() thread safe
 2013-06-18 03:18:28 -07:00
Lee, Jae-Hong 4b828cfff2 Enable Hardware Acceleration. 2013-06-18 19:17:49 +09:00
minggo e9d8595617 fixed #2124: make CCImage::initWithIamgeFileThreadSafe() thread safe 2013-06-18 17:10:54 +08:00
zhangbin 7939c3d73f Add advertisement type for more Ads plugins. 2013-06-18 15:53:56 +08:00
James Gregory ad90fe88a8 Merge remote-tracking branch 'origin/master' into emscriptenate 2013-06-17 20:30:36 -07:00
James Gregory 84cf597738 Simple logging controls in testcpp index.html 2013-06-17 20:29:57 -07:00
James Chen 25806536a2 Merge pull request #2908 from natural-law/develop 
[PluginX] Add admob for iOS
 2013-06-17 20:14:29 -07:00
James Chen 1fbfba2ae4 Merge pull request #2909 from dumganhar/develop 
Sync with master branch
 2013-06-17 20:13:09 -07:00
James Chen 2c0cc603d1 Merge branch 'master' into develop 
Conflicts:
	extensions/cocos-ext.h
 2013-06-18 10:46:25 +08:00
zhangbin 16cab98aa8 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-06-18 10:37:25 +08:00
zhangbin b0b24e09c5 Add sample code for plugin admob on iOS. 2013-06-18 10:36:23 +08:00
zhangbin 6da209331f Add plugin Admob for iOS. 2013-06-18 10:35:19 +08:00
waiter ecebf31287 solve android crash with CCLabelTTF setString function 
solve android crash with CCLabelTTF setString function
 2013-06-18 10:08:34 +08:00
waiter 867c8a1ce9 Merge pull request #9 from cocos2d/develop 
Develop
 2013-06-17 19:05:27 -07:00
James Gregory 5095b03f9c Get async image loading building with -O2 and asm.js 2013-06-17 17:10:41 -07:00
minggo b06d34e090 Merge pull request #2903 from dumganhar/master 
Template fixes for iOS and Windows
 2013-06-17 03:30:14 -07:00
Edward Zhou 53be008dcf fix url parse error for 'ws://domain.com/websocket' pattern 2013-06-17 18:28:12 +08:00
minggo e89652e280 Merge pull request #2902 from waiter/master 
update "fix a bug that SimpleAudioEngine may cause crash on i9100"
 2013-06-17 03:27:20 -07:00
minggo b9c85d87ae Merge pull request #2896 from dumganhar/iss2129-format-codes 
issue #2129: New naming of member varibles, renaming m_iVar to _var.
 2013-06-17 03:27:01 -07:00
James Chen a828d5f1a6 [Windows] multi-platform-lua fix. 2013-06-17 15:55:37 +08:00
James Chen 8fb40eaee2 android target 17 --> 8. 2013-06-17 15:55:09 +08:00
James Chen 4432caca1a Fix a bug (https://github.com/cocos2d/cocos2d-x/pull/2902) 2013-06-17 15:54:50 +08:00
James Chen ccb67cbcb4 Template fix for iOS Template. 2013-06-17 15:54:12 +08:00
samuele3hu 778708426c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into opengl_develop 2013-06-17 14:38:08 +08:00
samuele3hu 26f1bd5171 issue #2277: Add OpenGL lua binding 2013-06-17 14:19:00 +08:00
waiter 3921512739 update "fix a bug that SimpleAudioEngine may cause crash on i9100" 2013-06-17 09:50:39 +08:00
waiter 0d5b48eb9e Merge pull request #8 from cocos2d/develop 
update cocos2d/cocos2d-x
 2013-06-16 18:36:47 -07:00
James Chen 12d83f543b Merge pull request #2900 from dumganhar/flaming0-develop 
merge PR https://github.com/cocos2d/cocos2d-x/pull/2897
 2013-06-15 20:22:28 -07:00
James Chen 8b298fab0e issue #2284: fixing windows build. 2013-06-16 11:19:47 +08:00
James Chen b6f0c7e85b Merge pull request #2899 from CocosRobot/updategeneratedsubmodule_1371352083 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-06-15 20:15:13 -07:00
CocosRobot a9559c0db6 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-16 03:08:06 +00:00
James Chen 4c6043c9d2 Merge pull request #2898 from pyrasis/tizen_2.1 
[Tizen] Add armv7l webp library.
 2013-06-15 20:03:37 -07:00
Ricardo Quesada a0cbef1005 Adds missing methods: clone() and reverse() 2013-06-15 19:44:39 -07:00
Lee, Jae-Hong 8c1953eed9 Add armv7l webp library. 2013-06-16 11:07:55 +09:00
Ricardo Quesada 71ea3c7a3c Fixed headers. Compiles but it doesn't link yet. 
Many methods not implemented yet.
 2013-06-15 18:54:34 -07:00
flaming0 bd0c40026f Fixed windows build (added CCComponent, CCArmature files to win32 project) 2013-06-16 00:34:23 +04:00
Ricardo Quesada e40adb7ae7 EaseActions and more 
Added more reverse() const
 2013-06-15 12:38:32 -07:00
James Chen c0d44cb2e4 fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
James Chen 1cfca9bc60 Updating property in CCDictionary. 2013-06-15 13:42:05 +08:00
James Chen 490b605aec Merge pull request #2895 from dumganhar/minggo-iss2284-merge-master 
fixed #2284: Merge PR https://github.com/cocos2d/cocos2d-x/pull/2889
 2013-06-14 21:33:19 -07:00
James Chen c7c7189d90 Fix emscripten bugs. 2013-06-15 12:07:19 +08:00
James Chen 8c671bd0e9 Adding EMCC_DEBUG=1 to debug 2013-06-15 11:52:46 +08:00
James Chen 08b3107467 Updating emscripten submodule to lastest version. 2013-06-15 11:44:11 +08:00
James Chen cec360df38 Reverting run-script.sh 2013-06-15 11:43:43 +08:00
James Chen aeb331d3c4 issue #2284: Don't use multiple process to build emscripten since it'll generate errors. 2013-06-15 11:28:31 +08:00
James Chen 7295551f0f Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master 2013-06-15 11:15:28 +08:00
minggo 5e83f36433 issue #2284: not treat using deprecated functions as error 2013-06-14 17:32:07 +08:00
minggo 47f4aee3cc issue #2284: use GLuint to fix compiling error 2013-06-14 16:48:18 +08:00
James Chen 82cd7bb01f Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master 2013-06-14 15:41:01 +08:00
minggo ab8448e96b issue #2284: enable c++11 for emscripten port 2013-06-14 15:27:11 +08:00