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

8119 Commits

Author SHA1 Message Date
minggo a6fa140a42 Merge https://github.com/cocos2d/cocos2d-x into test-before-release 2013-03-20 15:35:15 +08:00
James Chen 4377d5f863 Merge pull request #2221 from dumganhar/master 
Updating JSTest, adding new resources.
 2013-03-20 00:27:43 -07:00
James Chen d68db7e873 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-03-20 15:19:30 +08:00
minggo 406ea3f69d Merge https://github.com/cocos2d/cocos2d-x into test-before-release 2013-03-20 15:19:19 +08:00
James Chen cf9c01cecf Updating JSTest, adding new resources. 2013-03-20 15:19:16 +08:00
James Chen 6bcc4696e9 Merge pull request #2214 from rohankuruvilla/ccbreader 
RotationX,Y for CCBuilderReader and a few bug fixes
 2013-03-20 00:04:51 -07:00
James Chen 89c4f3a5ba Updating JSTest. 2013-03-20 14:58:36 +08:00
James Chen 46335a06b8 Updating JSTest 2013-03-20 14:50:20 +08:00
James Chen 49083415d9 Merge branch 'master' of https://github.com/dumganhar/cocos2d-x 2013-03-20 14:46:13 +08:00
James Chen e728d5d6d0 Updating JS Test. 2013-03-20 14:45:39 +08:00
Rohan Kuruvilla 19b66049b3 Fixing issues with rotationX, rotationY in CCBuilderReader 2013-03-19 23:43:00 -07:00
Rohan Kuruvilla 54bb643ad3 Adding support for RotationX and RotationY to CCBReader 2013-03-19 23:42:59 -07:00
Rohan Kuruvilla 38f86acd23 Updating CocosPlayer AppDelegate files 2013-03-19 23:42:59 -07:00
James Chen d0b6b2cbc0 Merge pull request #2220 from CocosRobot/updategeneratedsubmodule_1363760413 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-03-19 23:29:14 -07:00
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
Roger Zanoni fdb1d69efe Fix linux build 
The cocos library uses libpthread and libGL on linux, so we need to link
with them.
 2013-03-19 18:44:11 -04: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
walzer 582e35014f issue #1841, improve tools/closure-compiler/obfuscate.py to general usage, with input params 2013-03-19 23:53:01 +08: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
walzer 0d73934f5c issue #1841, TestJavascript-ios is obfuscated successfully 2013-03-19 17:21:01 +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