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

10532 Commits

Author SHA1 Message Date
James Chen e432496dc4 Merge pull request #2869 from xyhl515/develop 
issue #2307: JSB function getCPBody return type is not right.
 2013-06-18 23:56:21 -07:00
James Chen 86f7fd4988 Merge pull request #2925 from dumganhar/musikov-develop 
fixed #2303: Missing precision when getting strokeColor and fontFillColor
 2013-06-18 23:27:57 -07:00
James Chen 98c6594eb3 Update AUTHORS [ci skip] 2013-06-19 14:27:13 +08:00
James Chen e6c14edf18 Merge pull request #2907 from waiter/master 
fixed #2306: update “solve android crash with CCLabelTTF setString function”
 2013-06-18 23:22:54 -07:00
James Chen b7a33afc71 fixed #2303: float assignment fix. 2013-06-19 14:09:23 +08:00
James Chen f007819f74 Merge branch 'develop' of https://github.com/musikov/cocos2d-x into musikov-develop 
Conflicts:
	cocos2dx/textures/CCTexture2D.cpp
 2013-06-19 14:05:55 +08:00
James Chen b91e432258 Merge pull request #2924 from dumganhar/j4m3z0r-emscriptenate 
fixed #2301: Asynchronous Image loading for Emscripten.
[emscripten] Merge PR https://github.com/cocos2d/cocos2d-x/pull/2919
 2013-06-18 22:56:02 -07:00
minggo ef254fe6b0 Merge pull request #2918 from superrad/patch-1 
CCTexturePVR now sets its _format when unpacking from PVRv3 as well as P...
 2013-06-18 22:53:29 -07:00
James Chen 8f33bf7e05 issue #2301: _pTextures --> _textures. 2013-06-19 13:40:21 +08:00
James Chen fa21674f6c issue #2301: Updating travis-scripts for emscripten. 2013-06-19 13:15:29 +08:00
James Chen fa6a0d4051 issue #2301: m_pTextures --> _pTextures. 2013-06-19 13:15:03 +08:00
James Chen 8e85aff4b6 Merge pull request #2923 from CocosRobot/updategeneratedsubmodule_1371617499 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-06-18 22:11:53 -07:00
James Chen 1eadcd8b38 fixed #2301: Merge branch 'emscriptenate' of https://github.com/j4m3z0r/cocos2d-x into j4m3z0r-emscriptenate 
Conflicts:
	cocos2dx/proj.emscripten/cocos2dx.mk
 2013-06-19 13:03:51 +08:00
CocosRobot d418d16fa9 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-19 04:51:43 +00:00
James Chen b5cea971a5 Merge pull request #2922 from dumganhar/ricardoquesada-clone_reverse_fixes 
issue #2300: Using clone pattern instead of 'copyWithZone' pattern.
merge PR https://github.com/cocos2d/cocos2d-x/pull/2920
 2013-06-18 21:46:28 -07:00
James Chen 3cfb2b86c1 issue #2300: invoking clone(c++) method when cc.Action.copy() is called. 2013-06-19 12:09:18 +08:00
James Chen 504a9e714e issue #2300: copy --> clone for luabinding. 2013-06-19 12:08:26 +08:00
James Chen c4386b9b15 Merge branch 'clone_reverse_fixes' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-clone_reverse_fixes 2013-06-19 10:50:27 +08:00
James Chen b5d12b32aa Merge pull request #2921 from pyrasis/tizen_2.1 
[Tizen] Implement Accelerometer
 2013-06-18 19:23:01 -07:00
Lee, Jae-Hong b546fc3214 Implement Accelerometer. 2013-06-19 09:31:34 +09:00
Ricardo Quesada a90f6c9b41 config resources are part of TestCpp for iOS 2013-06-18 16:52:52 -07:00
Ricardo Quesada 3d2862f8f7 Converts copy->autorelease() to clone() 
... in the samples
 2013-06-18 16:12:28 -07:00
James Gregory 88648aafc4 Update to testcpp makefile to include all assets, rather than cherrypicking. 2013-06-18 16:12:05 -07:00
James Gregory 818f6c64ff Bump Emscripten version 2013-06-18 16:11:31 -07:00
Ricardo Quesada 159ef1ec68 clone() doesn't use copy constructor 
... and other bug fixes
 2013-06-18 15:06:53 -07:00
Ricardo Quesada d35cc3b0fa Merge branch 'develop' into clone_reverse_fixes 
Conflicts:
	cocos2dx/actions/CCAction.cpp
	cocos2dx/actions/CCActionEase.cpp
	cocos2dx/actions/CCActionGrid.cpp
	cocos2dx/actions/CCActionInstant.cpp
	cocos2dx/actions/CCActionInterval.cpp
	scripting/javascript/bindings/generated
 2013-06-18 09:59:34 -07:00
Andrew Glass 9df6d1271b CCTexturePVR now sets its _format when unpacking from PVRv3 as well as PVRv2 
When loading a PVRv3 the _format variable would not be set, always being the default value.
 2013-06-18 16:16:17 +02:00
James Chen 3cd82c8bf3 Merge pull request #2917 from pyrasis/tizen_2.1 
[Tizen] Enable Hardware Acceleration.
 2013-06-18 04:32:18 -07:00
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