Rohan Kuruvilla
76f334797d
Refactoring applicationDidFinishLaunching. Also adding scaling for large non-retina Android tablets
2013-04-25 18:41:33 -07:00
Rohan Kuruvilla
2636bafd0c
Fixing network logging for Android and iOS
2013-04-25 18:41:29 -07:00
Rohan Kuruvilla
cecb157f22
Fixing rotation for iOS
2013-04-25 18:41:24 -07:00
Rohan Kuruvilla
0378a97fa0
Adding sending of filelist when reset is pressed on iOS
2013-04-25 18:41:18 -07:00
Rohan Kuruvilla
7bd3f2a260
Fixing resolution handling for iOS and Android
...
1. Adding iPhone5 support
2. Changing Android resolution management based on DPI (Tablet mode or Phone mode)
3. Modifying distribution of xlarge,large,medium,small and xsmall assets to do it properly
4. Using kResolutionFixedWidth (kResolutionFixedHeight for landscape games) to properly calculate aspect ratio
5. Tested on all iOS devices and Nexus 4 (which is correctly identified as Retina phone)
2013-04-25 18:41:14 -07:00
Rohan Kuruvilla
f95b802866
Adding rudemntary support for Rotation in Android
2013-04-25 18:41:01 -07:00
Rohan Kuruvilla
bb91f1eb30
Adding rudementary support for Rotation in iOS
2013-04-25 18:40:56 -07:00
Rohan Kuruvilla
d8c30e0c5b
Adding log redirect over the network for iOS. Also fixing Stop command crash in Android
2013-04-25 18:39:51 -07:00
Rohan Kuruvilla
e6fc611346
Commiting out orientation change code. was causing gl errors with landscape games
2013-04-25 18:39:47 -07:00
Rohan Kuruvilla
9b86791eef
Adding CocosPlayer for iOS
2013-04-25 18:39:43 -07:00
James Chen
b648d392ba
Merge pull request #2457 from dumganhar/master
...
Fixing a bug in CCFileUtilsIOS::isFileExist(). Improving performance of isFileExist for all platforms.
2013-04-25 07:09:15 -07:00
James Chen
c5cb886b72
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into lua-bytecode-test
2013-04-25 22:06:43 +08:00
James Chen
d1afe6cfa6
Fixing a bug in CCFileUtilsIOS::isFileExist().
2013-04-25 22:02:20 +08:00
James Chen
93a8b60111
If file path is an empty string, return false directly in CCFileUtils::isFileExist.
2013-04-25 21:51:13 +08:00
James Chen
1ff07223de
Merge pull request #2456 from dumganhar/lua-bytecode-test
...
fixed #2083 : Bytecode of LuaJIT can't work on android.
2013-04-25 06:48:01 -07:00
Rodrigo Goncalves de Oliveira
6f994b16cf
Fixing broke linux build
...
The spine code building on Linux stops when checking that some variables
can be used when not initialized. This commit fixes it.
Signed-off-by: Rodrigo Goncalves de Oliveira <rodrigo.goncalves@openbossa.org>
2013-04-25 09:36:23 -04:00
James Chen
30cc4bb1af
Merge pull request #2454 from CocosRobot/updategeneratedsubmodule_1366896612
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenera...
2013-04-25 06:36:14 -07:00
James Chen
5337234e22
Android also uses executeScript to load lua source file or byte code file. So unused codes need to be deleted.
2013-04-25 21:31:52 +08:00
Ed Bartley
c7222c2b14
CCScrollView should set the TouchPriority from the CCLayer, thus allowing the developer to set a custom TouchPriority with a call to setTouchPriority(…);
2013-04-25 09:30:24 -04:00
CocosRobot
c501a73a54
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-25 21:30:20 +08:00
James Chen
862ce85c7a
fixed #2083 : Bytecode of LuaJIT can't work on android.
2013-04-25 21:29:31 +08:00
James Chen
bd4f2b51a2
Merge pull request #2452 from dumganhar/update-bindings-generator
...
Updating bindings-generator.
2013-04-25 06:11:54 -07:00
James Chen
acaff0a208
Updating bindings-generator.
2013-04-25 21:10:10 +08:00
James Chen
7fc038c688
Merge pull request #2451 from dumganhar/master
...
Synchronizing some JSB changes in cocos2d-iphone. Fix a bug of "Too much recursion" in loop.
2013-04-25 05:58:38 -07:00
James Chen
5572990e5d
Synchronizing some JSB changes in cocos2d-iphone. Fix a bug of "Too much recursion" in loop.
2013-04-25 20:56:27 +08:00
zhangbin
73f0b6df04
Add licenses in source code files.
2013-04-25 20:43:58 +08:00
minggo
b6c8e78149
remove js files from compiling
2013-04-25 18:37:27 +08:00
zhangbin
2b5238c64b
1. Change the implementation of callback in Social plugins.
...
2. Add licenses in source code files.
2013-04-25 18:25:48 +08:00
zhangbin
4611027d47
1. Change the implementation of callback in IAP plugins.
...
2. Add licenses in source code files.
2013-04-25 17:33:42 +08:00
minggo
3f72473aba
Merge https://github.com/cocos2d/cocos2d-x
2013-04-25 16:25:55 +08:00
James Chen
31a61072a4
Merge pull request #2449 from dumganhar/master
...
Updating cocos2d-js-tests.
2013-04-25 01:19:39 -07:00
James Chen
7bd1d8cde1
Updating cocos2d-js-tests.
2013-04-25 16:16:39 +08:00
James Chen
f25ce0c256
Merge pull request #2448 from CocosRobot/updategeneratedsubmodule_1366871707
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenera...
2013-04-25 00:50:34 -07:00
CocosRobot
1e4370f43b
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-04-25 14:35:16 +08:00
James Chen
1d7986cf59
Merge pull request #2446 from dumganhar/master
...
Updating TestJavascript project configuration.Updating tools/tojs/cocos2dx.ini, adding CCReuseGrid and CCStopGrid bindings.
2013-04-24 23:34:14 -07:00
James Chen
a9f3ae0e33
Updating tools/tojs/cocos2dx.ini, adding CCReuseGrid and CCStopGrid bindings.
2013-04-25 14:32:52 +08:00
James Chen
9913358dde
Updating TestJavascript project configuration.
2013-04-25 14:31:11 +08:00
minggo
9881012459
Merge https://github.com/cocos2d/cocos2d-x
2013-04-25 12:01:59 +08:00
James Chen
e4a8d4ba91
Merge pull request #2445 from dumganhar/master
...
Updating project configuration for iOS.
2013-04-24 20:33:08 -07:00
James Chen
631b08e984
Updating project configuration for iOS.
2013-04-25 11:30:35 +08:00
James Chen
ec26e52278
Update AUTHORS
2013-04-25 10:37:36 +08:00
James Chen
805285ab47
Merge pull request #2444 from dumganhar/iss2080-realOpacity
...
fixed #2080 : _realOpacity isn't assigned in CCLayerColor::initWithColor.
2013-04-24 19:34:11 -07:00
Ed Bartley
b2b10ba5f7
CCLayerColor::_realOpacity is not set in ::initWithColor(…) causing unexpected behavior if a ::runAction(CCFadeTo::create(…)) applied to the LayerColor.
2013-04-25 10:32:03 +08:00
zhangbin
f30aaed426
Modify the permission of plugin twitter.
2013-04-24 17:23:35 +08:00
minggo
fb7851b429
define checkAnim() before using it
2013-04-24 17:06:59 +08:00
zhangbin
f7e07188b2
Adjust the implementation of ProtocolSocial & plugin twitter.
2013-04-24 16:53:02 +08:00
zhangbin
98bd3f79ed
Merge branch 'master' of https://github.com/natural-law/cocos2d-x
2013-04-24 16:46:35 +08:00
minggo
93ed85903f
Merge pull request #2437 from dumganhar/iss2075-spine-support
...
fixed #2075 : Adding spine editor support.
2013-04-24 01:12:23 -07:00
Bin Zhang
d657524859
Merge pull request #1 from lihex/master
...
Add twitter social share plugin
2013-04-24 01:03:23 -07:00
lihex
661977645e
Add HelloSocial sample
2013-04-24 16:00:36 +08:00