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

9964 Commits

Author SHA1 Message Date
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
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
loong0 c1137c991d debug script modified 2013-06-16 19:25:20 +08: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