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

7695 Commits

Author SHA1 Message Date
CocosRobot e34d9b18e5 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-20 14:20:23 +08:00
James Chen f292186524 Merge pull request #2219 from dumganhar/master 
fix of wrong group of TimelineCallbackTest in TestCpp.vcxproj.filters.
 2013-03-19 23:15:46 -07:00
James Chen 489b37b4e7 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-03-20 14:14:39 +08:00
James Chen 7e1efa7c89 fix of wrong group of TimelineCallbackTest in TestCpp.vcxproj.filters. 2013-03-20 14:14:01 +08:00
minggo aa5adc185a Merge pull request #2218 from dumganhar/bmfont-logic-error 
fix a logic error and a memory leak in CCLabelBMFont. This PR could fix wrong display of Score in WatermelonWithMe.
 2013-03-19 23:06:48 -07:00
James Chen 9336ab710f fix a logic error and a memory leak in CCLabelBMFont. 2013-03-20 13:55:43 +08:00
minggo 9afc6729dc fix build error caused by libcurl on android x86 2013-03-20 11:53:19 +08:00
James Chen b711f758dd Merge pull request #2216 from dumganhar/master 
Fixing compilation errors for linux.
 2013-03-19 19:45:03 -07:00
James Chen 37acbbe4fb Adding a space for target variable. 2013-03-20 10:44:21 +08:00
James Chen e5ef579cb3 Fixing compilation errors for linux. 2013-03-20 10:41:20 +08:00
James Chen 80e863097c Update AUTHORS 2013-03-20 09:56:13 +08:00
James Chen bf976bcc93 Merge pull request #2211 from whitegfx/master 
fixed #1842: Implementation of kEditBoxInputFlagSensitive setting for CCEditBoxImplIOS.
 2013-03-19 18:54:47 -07:00
minggo a60dd3671a Merge pull request #2213 from folecr/android_emulator_documentation 
Readme with instructions on running the emulator correctly
 2013-03-19 18:45:01 -07:00
folecr e3adab15dd Clearer description of command line options 2013-03-19 16:08:38 -07:00
folecr 3c317dce53 update doc 2013-03-19 16:04:47 -07:00
folecr d0f6a618a4 Readme with instructions on running the emulator correctly for developing cocos2d-x 2013-03-19 16:00:07 -07:00
whitegfx 6cb3f6bcc0 IOS, Added CCEditBoxImplIOS kEditBoxInputFlagSensitive settings. 
Added case to hide IOS autocorrection in kEditBoxInputFlagSensitive
mode.
 2013-03-19 20:00:35 +01:00
James Chen 6c1867f363 Merge pull request #2206 from dumganhar/master 
Fixing compilation errors for win32.
 2013-03-19 04:52:13 -07:00
James Chen a38fc50593 Fixing compilation errors for win32. 2013-03-19 19:51:07 +08:00
James Chen 5ac87ce9d4 Merge pull request #2205 from CocosRobot/updategeneratedsubmodule_1363687504 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-03-19 03:39:37 -07:00
CocosRobot a115096bec cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-19 18:05:15 +08:00
minggo cdd49ddba6 Merge pull request #2204 from minggo/test-before-release 
add customer fonts information in Info.plist
 2013-03-19 02:49:51 -07:00
James Chen 18f98a88e6 Merge pull request #2203 from dumganhar/master 
Updating project configuration of TestCpp for all platform since CocosBuilderTest/TimelineCallback&Sound has been added.
 2013-03-19 02:49:10 -07:00
James Chen a09d94fb6b Merge branch 'master' of https://github.com/dumganhar/cocos2d-x 2013-03-19 17:47:09 +08:00
James Chen aa5f7ffb6a Updating project setting of testcpp for Marmalade. 2013-03-19 17:46:49 +08:00
minggo 103de28a86 add customer fonts information in Info.plist 2013-03-19 17:46:28 +08:00
James Chen 4a9b07e0c4 Updating libExtensions.vcxproj. 2013-03-19 17:27:39 +08:00
James Chen 3ed479d7f4 Updating project configuration of TestCpp for win32. 2013-03-19 17:06:12 +08:00
James Chen ef98d95e75 Updating project configuration of TestCpp for Android, Linux, Mac and nacl. 2013-03-19 16:59:39 +08:00
minggo 8f90a1cf5d Merge pull request #2202 from minggo/test-before-release 
add c project setting for lua samples on android
 2013-03-19 01:51:35 -07:00
minggo aa845b10c7 Merge https://github.com/cocos2d/cocos2d-x into test-before-release 2013-03-19 16:49:45 +08:00
minggo 07eaf286fb add c project setting for lua samples 2013-03-19 16:49:16 +08:00
James Chen 6110d5df74 Merge pull request #2201 from dumganhar/rohankuruvilla-ccbreader 
fixed #1838: Fix bugs of CCBReader and adding test for the new feature(Timeline callback & playing effect) of CocosBuilder.
 2013-03-19 01:35:26 -07:00
James Chen 8b466f12a2 fixed #1838: Adding test for the new feature(Timeline callback & playing effect) of CocosBuilder. 2013-03-19 16:33:23 +08:00
minggo 42b74758f5 change Android.Manifest.xml to unix style 2013-03-19 16:30:11 +08:00
minggo 6577279ff7 Merge pull request #2200 from minggo/test-before-release 
delete parameter(-o igncr) when running build_native.sh in eclipse project
 2013-03-18 23:26:45 -07:00
Rohan Kuruvilla 80a268baf6 Fixing couple of bugs in reader that was checked into different branch 2013-03-18 23:20:14 -07:00
minggo 0a8b4f923f delete parameter(-o igncr) when running build_native.sh in eclipse project 2013-03-19 13:48:32 +08:00
James Chen aa022b532d Merge pull request #2198 from CocosRobot/updategeneratedsubmodule_1363671942 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-03-18 22:47:18 -07:00
CocosRobot afccad27e1 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-03-19 13:45:54 +08:00
James Chen b6df232039 Merge pull request #2196 from dumganhar/fake-master 
fixed #1838: Updating iOS project setting for CocosDragonJS. Regenerating all resources with the latest CocosBuilder.
 2013-03-18 22:09:30 -07:00
James Chen 7b5e2351c3 Updating jsb_cocosbuilder.js. 2013-03-19 13:08:34 +08:00
James Chen b4c52f9c5a Regenerating all resources with the latest CocosBuilder. 2013-03-19 13:05:17 +08:00
James Chen 3380c7cdca fixed #1838: Updating iOS project setting for CocosDragonJS. 2013-03-19 13:05:06 +08:00
James Chen 97a91c5294 Update AUTHORS 2013-03-19 13:00:10 +08:00
James Chen deb739f13b Merge pull request #2194 from rohankuruvilla/ccbreader 
fixed #1838: Latest CCBReader changes.
 2013-03-18 21:56:13 -07:00
Rohan Kuruvilla e4efa88d00 Adding empty virtual definition to CCBScriptCallbackProxy to support CallFunc 2013-03-18 20:54:48 -07:00
minggo a3ea9b782a Update AUTHORS 2013-03-19 10:00:39 +08:00
minggo d9f47d2066 Merge pull request #2128 from biteforest/Branch_fix_CCScale9Sprite_bug 
fix cc scale9 sprite bug
 2013-03-18 18:37:17 -07:00
Rohan Kuruvilla 5ca6648e47 Updating CCBReader JS bootstrap file 2013-03-18 16:06:48 -07:00