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

8148 Commits

Author SHA1 Message Date
James Chen 1eb79530c6 fixed #1847: -DCC_ENABLE_BOX2D_INTEGRATION ~> -DCC_ENABLE_BOX2D_INTEGRATION=1, 
-DCC_ENABLE_CHIPMUNK_INTEGRATION ~> -DCC_ENABLE_CHIPMUNK_INTEGRATION=1.
 2013-04-17 12:49:25 +08:00
James Chen d4c40c7f37 fixed #1847: Updating template for iOS. 2013-04-17 12:44:55 +08:00
James Chen a005852fa5 issue #1847: Using luajit for win32. 2013-04-17 10:46:38 +08:00
akira_cn e1f9e1a300 update keypad support 2013-04-17 10:40:46 +08:00
James Chen 2384d97ce8 issue #1847: Adding luajit library for win32. 2013-04-17 10:09:17 +08:00
James Chen c311085dea issue #1847: Updating multi-platform-lua/proj.ios/HelloLua.xcodeproj. 2013-04-17 10:00:56 +08:00
James Chen 47991f3992 issue #1847: Updating Info.plist for TestLua, the package was updated: org.cocos2d-x.TestLua -> org.cocos2dx.TestLua. 2013-04-17 09:53:53 +08:00
James Chen 928b6ad361 issue #1847: Fix a typo in Ball.lua and Paddle.lua. 2013-04-17 09:52:26 +08:00
James Chen 6a56bb6d73 issue #1847: [iOS] Using LuaJit for HelloLua and TestLua. 2013-04-17 09:51:28 +08:00
NatWeiss f875366cc6 Properly resets the tile's Y flipping 
This bug caused many tiles to be Y flipped if only one tile was actually intended to be flipped.
 2013-04-16 15:01:22 -07:00
Oleg Baluk af71b881df fix wrong buffer name 2013-04-17 01:59:23 +04:00
James Chen 4a7bacf0b5 Updating Android.mk. 2013-04-16 18:19:46 +08:00
James Chen bbbf139c8d Adding luajit iOS prebuilt library. 2013-04-16 18:19:25 +08:00
James Chen 79d58bcdb9 issue #1847: Adding sources of Luajit2.0.1-hotfix, and adding android support. 2013-04-16 17:34:58 +08:00
James Chen b3e499c6db Merge pull request #2379 from natural-law/master 
issue #1723 : Remove the protocol IAP Online.
 2013-04-15 23:52:55 -07:00
zhangbin d762283c9b Resolve the ndk build error. 2013-04-16 14:51:32 +08:00
zhangbin 244740a0c9 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-04-16 14:42:51 +08:00
zhangbin 75557bbe7b Remove the protocol IAP Online 2013-04-16 14:41:35 +08:00
akira_cn 54f18be09a add back key support 2013-04-16 10:19:36 +08:00
James Chen 5da2b53869 Merge pull request #2377 from CocosRobot/updategeneratedsubmodule_1366077719 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-04-15 19:08:58 -07:00
CocosRobot 5928d2836c cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-16 10:02:11 +08:00
billy1380 16b9506690 fixed a bug that was causing http client to fail on mac os x with 
semaphore error
 2013-04-15 22:49:29 +01:00
James Chen f478da6e2f Update AUTHORS 2013-04-15 23:11:57 +08:00
James Chen bf4344a53f Merge pull request #2231 from sbc100/physics_fixes 
fixed #2055: Physics fixes.
1) Fix CCPhysicsSprite getPosition variants …
CCPhysicsSprite was overriding only some of the getPosition
methods on a node resulting in, for example, getPositionX
and getPositionY not working for physics nodes.

This change also makes this overloads shared between box2d
and chipmunk implementations.

2) Fix typo in make-all-linux-project.sh
3) The ENABLE_BOX2D/ENABLE_CHIPMUNK defines were previously
hardcoded in the Makefiles. Now you get chipmunk by default
on both platforms and can enble Box2D by setting USE_BOX2D in
your environment.

Also remove erroneous -D__CC_PLATFORM_FILEUTILS_CPP__ and
-D__CC_PLATFORM_IMAGE_CPP__ from linux Makefiles. These should
never be defined globally like this.
 2013-04-15 08:06:15 -07:00
Sam Clegg ffb7360e46 Enable easy swithing between Box2D and chipmunk in linux and nacl 
The ENABLE_BOX2D/ENABLE_CHIPMUNK defines were previously
hardcoded in the Makefiles.  Now you get chipmunk by default
on both platforms and can enble Box2D by setting USE_BOX2D in
your environment.

Also remove erroneous -D__CC_PLATFORM_FILEUTILS_CPP__ and
-D__CC_PLATFORM_IMAGE_CPP__ from linux Makefiles.  These should
never be defined globally like this.
 2013-04-15 07:35:50 -07:00
Sam Clegg 57d34bf161 Fix typo in make-all-linux-project.sh 2013-04-15 07:35:50 -07:00
Sam Clegg 87f57d6ca6 Fix CCPhysicsSprite getPosition variants 
CCPhysicsSprite was overriding only some of the getPosition
methods on a node resulting in, for example, getPositionX
and getPositionY not working for physics nodes.

This change also makes this overloads shared between box2d
and chipmunk implementations.
 2013-04-15 07:35:49 -07:00
James Chen 92647db858 Merge pull request #2373 from dumganhar/iss1876-9sprite-setColor 
fixed #1876:  CCScale9Sprite::setColor(...), setOpacity(...) are broken.
 2013-04-15 01:38:58 -07:00
James Chen 5b2196075a fixed #1876: CCScale9Sprite::setColor(...), setOpacity(...) are broken. 2013-04-15 16:37:35 +08:00
Marcel Bloemendaal 76b222978c Changed some property names to match conventions. 
Changed m_pSecureTextEntry to m_bSecureTextEntry and renamed
getSecureTextEntry to isSecureTextEntry
 2013-04-15 09:11:04 +02:00
James Chen 85932f1120 Merge pull request #2371 from CocosRobot/updategeneratedsubmodule_1366005697 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-04-14 23:56:44 -07:00
CocosRobot d6e9d4420e cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-15 14:01:47 +08:00
James Chen d1b1c6972b Update AUTHORS 2013-04-15 13:40:02 +08:00
James Chen bfa766f705 Merge pull request #2356 from MarkEHenderson/master 
Fix variable initialization in SpriteBatchNode and LabelBMFont to allow JS extension
 2013-04-14 22:37:46 -07:00
James Chen d89b5cbcb2 Merge pull request #2370 from dumganhar/iss2054-s9sp-anchorpoint-ccb 
Fixed #2054: AnchorPoint property of CCScale9Sprite doesn't work in CCBReader.
 2013-04-14 20:54:02 -07:00
James Chen 7a676982db Updating AUTHORS. 2013-04-15 11:51:47 +08:00
James Chen b7e16e9895 Fixed #2054: AnchorPoint property of CCScale9Sprite doesn't work in CCBReader. 
Invoking init method in CCScale9Sprite::create().
 2013-04-15 11:51:26 +08:00
James Chen b228a13218 Merge branch 'patch-1' of https://github.com/zhanghaojie/cocos2d-x into iss2054-s9sp-anchorpoint-ccb 2013-04-15 11:45:59 +08:00
James Chen 233a987265 Update AUTHORS 2013-04-15 11:12:44 +08:00
James Chen ca2f203947 Merge pull request #2343 from Yodesoft/master 
fixed #2053: [Linux] Setting writable path to "<user's home>/.config/<app name>".
 2013-04-14 20:10:23 -07:00
James Chen 028bba3959 Update AUTHORS 2013-04-15 10:47:17 +08:00
James Chen 0c8e3e9129 Merge pull request #2349 from rogerzanoni/master 
fixed #2052: [Linux] [-Werror=array-bounds] error appears when compiling Box2dTestBed.
 2013-04-14 19:45:35 -07:00
James Chen 4ae375e7fe Merge pull request #2369 from dumganhar/iss1860-subccb-onNodeLoaded 
fixed #1860: onNodeLoaded will be called twice if ccb was added as a CCBFile and adding test.
 2013-04-14 19:41:08 -07:00
James Chen a5d78830db fixed #1860: onNodeLoaded will be called twice if ccb was added as a CCBFile. 2013-04-15 10:39:44 +08:00
James Chen c7631d5343 Merge pull request #2368 from dumganhar/iss2040-ccb-getScale 
fixed #2040: Getting scale property from sub-ccb node may trigger an assert of 'CCAssert( m_fScaleX == m_fScaleY, "CCNode#scale. ScaleX != ScaleY. Don't know which one to return");'.
 2013-04-14 19:20:36 -07:00
James Chen a1568d1f74 fixed #2040: Getting scale property from sub-ccb node may trigger an assert of 'CCAssert( m_fScaleX == m_fScaleY, "CCNode#scale. ScaleX != ScaleY. Don't know which one to return");'. 2013-04-15 10:18:35 +08:00
James Chen a06d2c44c1 Merge pull request #2367 from dumganhar/iss1862-setContainer 
fixed #1862: CCScrollView::setContainer may cause dangling pointer when NULL is passed into.
 2013-04-14 18:57:13 -07:00
James Chen 6c15c75c78 fixed #1862: CCScrollView::setContainer may cause dangling pointer when NULL is passed into. 2013-04-15 09:52:46 +08:00
James Chen fdd6529bd2 Merge pull request #2364 from dumganhar/iss2051-builder-crash-64bit 
fixed #2051: TestCpp/ExtensionsTest/CocosbuilderTest crashes under x86_64 target.
 2013-04-14 01:06:51 -07:00
James Chen 84b4c5ac2b fixed #2051: Comment update, int ~> intptr_t. 2013-04-14 16:05:54 +08:00