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

6697 Commits

Author SHA1 Message Date
Lu Guanqun 64772d09b0 fix the doxygen output of CCAtlasNode 2012-12-10 15:31:26 +08:00
minggo 0c00f7cb70 Merge pull request #1746 from dumganhar/gles20 
fixed #1606: Return CCSequence pointer for CCSequence::create.
 2012-12-09 22:30:27 -08:00
dualface 77d4da6e22 [lua] remove va_list 2012-12-10 14:28:26 +08:00
James Chen fc16cd8d01 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-12-10 14:21:18 +08:00
dualface b6e605b9ae [lua] fix CCSequence export 2012-12-10 14:19:18 +08:00
James Chen 21f88534cf fixed #1606: Updated some invocations of CCSequence for TestCpp project. 2012-12-10 14:12:56 +08:00
James Chen 839288671e fixed #1606: Override update function for ExtraAction. 2012-12-10 14:11:42 +08:00
minggo 62e49387e5 Merge pull request #1745 from minggo/iss1580_lost_focus 
fixed #1580:request focus after keyboard closed
 2012-12-09 22:11:05 -08:00
dualface 4ca6cf8c7a [lua] update LuaCocos2d.cpp 2012-12-10 14:09:00 +08:00
minggo 71f61596e9 fixed #1580:request focus after keyboard closed 2012-12-10 14:08:01 +08:00
dualface 0662ceac9d [lua] update export 2012-12-10 14:07:24 +08:00
dualface 86f6473270 [lua] fix invalid export 2012-12-10 14:04:56 +08:00
dualface 121706172f Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-12-10 14:02:15 +08:00
dualface d854f68c63 [scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority() 2012-12-10 13:51:37 +08:00
dualface c8753f72ef [scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority() 2012-12-10 13:48:27 +08:00
James Chen f8c96483a0 fixed #1606: Return CCSequence pointer for CCSequence::create. 2012-12-10 12:02:24 +08:00
minggo e1f4957fc0 Merge pull request #1743 from minggo/gles20 
fix a type information in CCBAnimationManager
 2012-12-09 19:31:03 -08:00
minggo d5533fcf15 fix a type information in CCBAnimationManager 2012-12-10 11:30:07 +08:00
James Chen 6c16142ca9 Merge pull request #1742 from dumganhar/gles20 
fixed #1605: Crash occurs when adding just one action to CCSequence.
 2012-12-09 19:11:28 -08:00
James Chen 73dd652604 fixed #1605: Crash occurs when adding just one action to CCSequence. 2012-12-10 11:10:11 +08:00
James Chen af27401d9b Merge pull request #1741 from dumganhar/iss1604-v3format-define 
fixed #1604: The enum values in ccPVR3TexturePixelFormat are truncated to 32bit.
 2012-12-09 18:26:57 -08:00
James Chen 062179c497 fixed #1604: The enum values in ccPVR3TexturePixelFormat are truncated to 32bit 2012-12-10 10:22:06 +08:00
Mat Hopwood f75f6c2b64 Mac OS Marmalade fixes 
Fixed compile issues on Mac OS
 2012-12-10 09:54:34 +08:00
Romain TISSERAND bc0309f1a3 [android] Removed hardcoded /data/data path in CCFileUtils, make use of Context.getCacheDir() through JNI callback instead. Needed in order to get CCUserDefault working fine on Nexus 10 (Androi 4.2 multi-user environment) 2012-12-09 19:40:41 +01:00
Romain TISSERAND 4cb7506932 Added proper JNIEXPORT / JNICALL modifiers to Cocos2dxHelper JNI functions called from Java side 2012-12-09 13:44:41 +01:00
dualface 18f4eb65a5 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-12-09 01:53:59 +08:00
James Chen d99a278c23 Update AUTHORS 2012-12-07 10:45:06 +08:00
James Chen d8c29b4f46 Merge pull request #1735 from dumganhar/iss1602-rand-ccdictionary 
fixed #1602: Adding randomObject to CCDictionary
 2012-12-06 18:42:35 -08:00
James Chen 0d90fea7b3 Merge branch 'myFeature' of https://github.com/tks2shimizu/cocos2d-x into iss1602-rand-ccdictionary 
Conflicts:
	cocos2dx/cocoa/CCDictionary.cpp
	cocos2dx/cocoa/CCDictionary.h
 2012-12-07 10:40:32 +08:00
minggo 48783d2224 Merge pull request #1662 from guanqun/fix-group-type 
when user specified 'group' parameter, it should be parsed as an 'int'
 2012-12-06 18:02:09 -08:00
James Chen d32b5eb65d Merge pull request #1734 from CocosRobot/updategeneratedsubmodule_1354845070 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2012-12-06 17:53:51 -08:00
CocosRobot f7e87f2269 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-12-07 09:51:17 +08:00
minggo bea14697be Merge pull request #1733 from minggo/iss1593_remove_deprecated_methods 
remove all deprecated methods expect CCBAnimationManager
 2012-12-06 17:37:39 -08:00
Tomoaki Shimizu e680e5f0f2 Add randomObject to CCDictionary 
Although CCArray has randomObject(), CCDictionary does not have it.
So CCDictionary should have randomObject().
 2012-12-06 23:56:49 +09:00
minggo a75f8b7e7a fixed #1593:remove all deprecated methods expect CCBAnimationManager 2012-12-06 18:51:33 +08:00
James Chen c4f90a3a96 Merge pull request #1730 from fape/cosmetics 
Some cosmetics
 2012-12-06 02:24:40 -08:00
fape 12c9ebb221 include all resources from Resource dir to SampleGame marmalade project file 2012-12-06 10:41:02 +01:00
fape ce87451fbc cosmetic AUTHORS 2012-12-06 10:39:42 +01:00
James Chen ce7738b58f Merge pull request #1729 from CocosRobot/updategeneratedsubmodule_1354785766 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2012-12-06 01:26:01 -08:00
CocosRobot fe9e6ba688 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-12-06 17:22:53 +08:00
James Chen 277506321a Merge pull request #1728 from dumganhar/gles20 
Updated the submodule reference of cxx-generator.
 2012-12-06 01:21:31 -08:00
James Chen cf25a8033a Updated the submodule reference of cxx-generator. 2012-12-06 17:20:08 +08:00
James Chen 6a7a365365 Updated eclipse project configurations for linux 2012-12-06 14:57:03 +08:00
James Chen b044a89d6f Merge branch 'gles20' of https://github.com/ivzave/cocos2d-x into linux-lua 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2012-12-06 14:55:18 +08:00
minggo 2eef20c2c5 Merge pull request #1727 from minggo/iss1600_xcode_template 
fixed #1600:update AppDelegate.cpp in xcode template
 2012-12-05 19:54:17 -08:00
minggo 2fb90d76ce fixed #1600:update AppDelegate.cpp in xcode template 2012-12-06 11:53:10 +08:00
James Chen 2ec34d6011 Update AUTHORS 2012-12-06 10:30:46 +08:00
James Chen c1eded787a Merge pull request #1724 from FlowerpotGames/gles20 
fixed #1599: CCScrollView and CCTableView updates.
 2012-12-05 18:28:30 -08:00
walzer 088c0b2762 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-12-06 09:42:42 +08:00
minggo 6bf52b22b8 Update AUTHORS 2012-12-06 09:41:23 +08:00