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

9267 Commits

Author SHA1 Message Date
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
minggo 72f1fadca2 Merge pull request #2380 from NatWeiss/patch-2 
Properly resets the tile's Y flipping
 2013-04-17 00:42:08 -07:00
minggo f87af4633b Merge pull request #2384 from minggo/iss1613-reload-resource 
fixed #1613:not reload resources on Android platform after return from background
 2013-04-17 00:38:13 -07:00
minggo 78d3c7f048 fixed #1613:not reload resources on Android platform after return from background 2013-04-17 15:34:57 +08:00
James Chen 3ecdb66553 Update AUTHORS 2013-04-17 13:01:47 +08:00
James Chen e07d11d1e2 Merge pull request #2381 from lgb/blackberry-compile-fix 
fix compilation error in cocos2dx for BlackBerry PlayBook
 2013-04-16 22:00:08 -07:00
James Chen 19b06c6b5d Update AUTHORS 2013-04-17 12:58:21 +08:00
James Chen 694c47f5d6 Merge pull request #2382 from wedteam/keypad-support 
fixed #2057: [JSB] Adding response for back and menu keypad event for Android.
 2013-04-16 21:56:37 -07:00
James Chen 34be87a736 Merge pull request #2383 from dumganhar/iss1847-lua-jit 
fixed #1847: Adding luajit support for iOS, Android and Win32.
 2013-04-16 21:51:00 -07:00
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
tianTian 9a04eee8d1 do it atomically; 2013-04-16 12:38:53 +08:00
tianTian 91ddfe7382 Add support for CCDictionary contains CCArray; 2013-04-16 12:34:09 +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
James Gregory 54fc4d8583 Add libxml2 build for Emscripten. 2013-04-15 14:59:39 -07: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