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

8106 Commits

Author SHA1 Message Date
minggo d4efbcfcef don't include unneeded header file 2013-04-23 10:10:14 +08:00
James Chen dc0e89e839 Merge pull request #2411 from CocosRobot/updategeneratedsubmodule_1366363642 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-04-19 02:29:15 -07:00
CocosRobot 8d8a2293a1 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-19 17:27:38 +08:00
James Chen bbdb09dc68 Merge pull request #2410 from dumganhar/iss2071-jsb-getTiles 
fixed #2017: Binding cc.TMXLayer.getTiles() manually.
 2013-04-19 02:26:30 -07:00
James Chen 20b0e41b78 fixed #2017: Binding cc.TMXLayer.getTiles manually. 2013-04-19 17:25:24 +08:00
James Chen dee0f37983 issue #2071: Updating cocos2dx.ini, skipping auto-generating cc.TMXLayer.getTiles(), it needs be bound manually . 2013-04-19 17:23:39 +08:00
James Chen 985b3a100e Merge pull request #2408 from sergey-shambir/gcc_warning 
Fixed GCC warning on narrowing conversion
 2013-04-19 02:14:00 -07:00
Sergey Shambir 5541816ef6 Fixed GCC warning on narrowing conversion 2013-04-19 12:09:26 +04:00
James Chen fd0e4a80df Merge pull request #2405 from dumganhar/master 
Removing unused file(uthash.h) in JSB projects.
 2013-04-18 20:10:38 -07:00
James Chen f129b94e2d Removing unused file(uthash.h) in JSB projects. 2013-04-19 11:09:02 +08:00
James Chen 827f3d6482 Update AUTHORS 2013-04-19 10:46:56 +08:00
James Chen d37a43e100 Merge pull request #2398 from lgb/float_comparison_issue 
fixed #1935: Float comparison must not use "==" in the equal function of CCPoint and CCSize, we should compare float number by using epsilon and absolute difference.
 2013-04-18 19:44:17 -07:00
minggo 37dc03b7d6 Merge pull request #2404 from minggo/assetmanager 
fix a compiling error
 2013-04-18 19:36:03 -07:00
minggo f9aa710c36 fix a compiling error 2013-04-19 10:34:40 +08:00
James Chen 69d73d476e Update AUTHORS 2013-04-19 10:25:48 +08:00
James Chen 7bf9b3858e Merge pull request #2402 from brawsome/master 
fixed #2069: Adding new macro CCB_MEMBERVARIABLEASSIGNER_GLUE_WEAK to CCBMemberVariableAssigner.h
 2013-04-18 19:24:53 -07:00
James Chen e1e6f7acb9 Update AUTHORS 2013-04-19 10:03:45 +08:00
James Chen f100ad632e Merge pull request #2403 from dumganhar/iss2068-cctextfield-secure 
fixed #2068: Adding a secureTextEntry property. Enabling this property causes the TextField to display the entered text as bullets.
 2013-04-18 19:00:26 -07:00
James Chen ec50d34622 fixed #2068: Tab ~> 4 spaces. 2013-04-19 09:59:08 +08:00
James Chen 9ecaacf59b fixed #2068: Updating source format. 2013-04-19 09:55:29 +08:00
James Chen b91c5f099c fixed #2068: Fixing a compilation error on win32 since "•" couldn't be recognized by vs compiler. 2013-04-19 09:49:55 +08:00
Andrew Goulding 98a7b9636d Added CCB_MEMBERVARIABLEASSIGNER_GLUE_WEAK 
We've found it useful to use CCB_MEMBERVARIABLEASSIGNER_GLUE_WEAK in
situations where we don't want CCObject derived pointers retained. It's
also useful if you want to assign a pointer dynamically cast to an
abstract base class such as CCLabelProtocol.
 2013-04-19 08:06:25 +10:00
James Chen 861e8e42f7 Merge branch 'master' of https://github.com/MarcelBloemendaal/cocos2d-x into MarcelBloemendaal-master 2013-04-18 16:21:17 +08:00
James Chen 0ea0ad6382 Update AUTHORS 2013-04-18 15:32:18 +08:00
James Chen 612a8a309f Merge pull request #2193 from Weeds/feature-screen-dimensions 
fixed #2065: Adding kResolutionFixedHeight and kResolutionFixedWidth resolution policy.
 2013-04-18 00:31:13 -07:00
James Chen 69549de17b Merge pull request #2397 from dumganhar/master 
Removing an unused comment in ccaffinetransform_to_jsval.
 2013-04-17 23:14:28 -07:00
James Chen 556d95d922 Removing an unused comment in ccaffinetransform_to_jsval. 2013-04-18 14:13:26 +08:00
James Chen 5c67372615 Merge pull request #2396 from CocosRobot/updategeneratedsubmodule_1366264667 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-04-17 23:00:27 -07:00
CocosRobot 5ead6d7322 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-18 13:58:01 +08:00
James Chen 7e7de97706 Merge pull request #2395 from dumganhar/iss2064-js-node-tranf 
fixed #2064: Exposing cc.Node.nodeTo***Transform to JS since it's used in CocoFrameworkJS.
 2013-04-17 22:57:00 -07:00
James Chen 4d9d9a6cdd fixed #2064: Updating the submodule reference of bindings-generator. 2013-04-18 13:55:11 +08:00
James Chen 5f478e1e0a issue #2064: Updating tools/tojs/cocos2dx.ini. 2013-04-18 13:53:43 +08:00
James Chen 4db3c9c692 Refactoring js_cocos2dx_CCFileUtils_getByteArrayFromFile. 2013-04-18 13:53:16 +08:00
James Chen 41b0345e9c Removing unused file (uthash.h) in Project.pbxproj. 2013-04-18 13:52:25 +08:00
James Chen 642d1746f9 issue #2064: Adding conversation for "jsval ~> CCAffineTransform" and "CCAffineTransform ~> jsval". 2013-04-18 13:50:58 +08:00
minggo 9d939ee686 Update AUTHORS 2013-04-18 10:12:06 +08:00
minggo 724402750b Merge pull request #2390 from scoyo/master 
Fix for spaces at the beginning of wrapped lines
 2013-04-17 19:10:19 -07:00
James Chen ee8f8f0de4 Update AUTHORS 2013-04-18 09:45:19 +08:00
James Chen 1b3e1836d6 Merge pull request #2394 from jotel/master 
fixed #2061: Wrong type of argument signature is used in setAccelerometerIntervalJNI function.
 2013-04-17 18:43:49 -07:00
Jaroslaw Lewandowski 20e102bc46 Fixed setAccelerometerInterval signature in setAccelerometerIntervalJNI function. 2013-04-18 01:27:33 +01:00
Oleg Baluk 271f90e744 compare using epsilon and absolute difference 2013-04-18 02:16:49 +04:00
Kristiaan De Jongh 81e4178a42 fix for spaces when wrapping 2013-04-17 13:09:48 +02:00
James Chen 6a32986e2e Merge pull request #2388 from dumganhar/master 
fixed #2060: Implementing support for cc.FileUtils.getInstance().getByteArrayFromFile(filename)
 2013-04-17 03:44:54 -07:00
James Chen 4bd012dfbf fixed #2060: Implementing support for cc.FileUtils.getInstance().getByteArrayFromFile(filename) 2013-04-17 18:43:57 +08:00
James Chen 62f3528282 Merge pull request #2386 from dumganhar/master 
fixed #2059: Fix complication errors on Android.
 2013-04-17 02:09:11 -07:00
James Chen 63ce8adfad fixed #2059: Fix complication errors on Android. 2013-04-17 17:05:39 +08:00
minggo 18a345071a Merge pull request #2375 from billy1380/master 
fix for issue #2366
 2013-04-17 01:48:34 -07:00
James Chen 6581a414dc Merge pull request #2385 from dumganhar/iss2059-js-getstring 
fixed #2059: cc.FileUtils.getInstance().getStringFromFile(filename) doesn't return a whole string.
 2013-04-17 01:10:11 -07:00
James Chen ddd6d9d155 fixed #2059: cc.FileUtils.getInstance().getStringFromFile(filename) doesn't return a whole string. 2013-04-17 16:08:48 +08:00
minggo 2d92ba4d6a Update AUTHORS 2013-04-17 15:44:02 +08:00