Commit Graph

12223 Commits

Author SHA1 Message Date
Jaroslaw Lewandowski 2999abed2b Explicitly initialising CCAcceleration structure to report zeros when run in device simulator 2013-05-29 00:02:36 +01:00
Lee, Jae-Hong c20e4f3700 Keep a previous text on Tizen CCEditBox. 2013-05-28 20:43:47 +09:00
Lee, Jae-Hong 5031aa1fd3 Encoding UTF-8 on Tizen CCEditBox and check empty string. 2013-05-28 20:04:37 +09:00
James Chen 1b1fb1253b Merge pull request from CocosRobot/updategeneratedsubmodule_1369737138
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-05-28 03:44:37 -07:00
CocosRobot 49780e3fcb [AUTO] : updating submodule reference to latest autogenerated bindings 2013-05-28 10:32:21 +00:00
James Chen 8293f68949 Merge pull request from CocosRobot/updategeneratedsubmodule_1369736349
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-05-28 03:23:42 -07:00
CocosRobot 0f64be0ce4 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-05-28 10:19:13 +00:00
zhangbin 4022e002e8 issue : Modify the implementation of plugin flurry & umeng. 2013-05-28 18:10:09 +08:00
minggo 27b9a4d4ae Merge pull request from minggo/ETC1-support
modify ORGANIZATIONNAME
2013-05-28 03:09:45 -07:00
minggo 8902d7b762 Merge pull request from minggo/ETC1-support
modify ORGANIZATIONNAME
2013-05-28 03:08:43 -07:00
Michael Contento 026026e3af use onWindowFocusChanged(bool) instead of onResume()/onPause()
we should use onWindowFocusChanged(bool) to detect if the app is currently
visitible to the user or not. because onPause()/onResume() leads to false
positives on some android versions (e.g. Kindle Fire). if you lock those
devices, while the app running, everything is fine (onPause() is handled
properly). but as soon as you wake up the device, and the lock screen gets
visible, the app is resumed and the music is played (onResume() is
called to early).

this is a) not the best behaviour and b) such games will be rejected on the
samsung app store. onWindowFocusChanged(bool) is, like onPause()/onResume(),
available since API level 1 and it should be safe to simply switch.
2013-05-28 12:05:46 +02:00
minggo 98b1d95a74 modify ORGANIZATIONNAME 2013-05-28 18:04:42 +08:00
minggo 35eeb5d829 Merge pull request from minggo/ETC1-support
Support ETC1 format on Android
2013-05-28 00:07:24 -07:00
minggo dee652c989 Merge pull request from minggo/ETC1-support
Support ETC1 format on Android
2013-05-28 00:07:04 -07:00
minggo 5f37e854c4 issue : resolve conflict 2013-05-28 11:50:14 +08:00
minggo 6f624351b3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support 2013-05-28 11:36:05 +08:00
Yongqin Liu 56037a4939 CCTextureAtlas::updateQuad modify for the memcpy hot spot
change the place that call CCTextureAtlas::updateQuad method to
update the quads with pointer reference directly.

Signed-off-by: Yongqin Liu<liuyq0307@thundersoft.com>
2013-05-28 10:23:47 +08:00
minggo d6e547cd02 issue #2161:add CCTextureETC.cpp/.h into vs2010 project 2013-05-28 10:04:19 +08:00
Lucian Varlan a70569ff03 OnEnterTransitionDidFinish was called twice when a node is added in onEnter
Fix ported from cocos2d-iphone:
99b7bef880
2013-05-27 16:07:09 +03:00
minggo b038741d78 issue : make linux,marmalade,native client,mac and emscripten project to include CCTextureETC.cpp 2013-05-27 15:06:43 +08:00
minggo beef61fc90 issue : android supports ETC format now 2013-05-27 14:42:22 +08:00
zhangbin c5965989b0 issue : Modify the implementation of plugin admob. 2013-05-27 14:40:08 +08:00
zhangbin 35bc7a51d8 issue : Modify the implementation of plugin alipay & nd91. 2013-05-27 14:19:36 +08:00
zhangbin 9f61f92017 issue : Modify the implementation of plugin twitter & weibo on android for the new framework of plugin. 2013-05-27 13:58:31 +08:00
James Chen 3976445848 Merge pull request from dumganhar/master
Merge branch 'develop'
2013-05-26 18:51:42 -07:00
James Chen 998c9bb399 Merge branch 'develop' 2013-05-27 09:49:13 +08:00
James Chen 9f45c23222 Merge pull request from sergey-shambir/fix_linux_linkage
Linux port: added libX11 to linked libraries.
2013-05-26 18:41:43 -07:00
James Chen adf7eef0ab Merge pull request from pyrasis/tizen_2.1
Implement CCEditBox for Tizen.
2013-05-26 07:36:52 -07:00
Lee, Jae-Hong 47fac0ed98 Implement CCEditBox for Tizen. (develop branch) 2013-05-26 20:40:13 +09:00
loong0 3cff8bee16 correct the library path 2013-05-26 15:58:17 +08:00
Sergey Shambir 06e6048537 Linux port: added libX11 to linked libraries.
Otherwise build fails on linux.
2013-05-24 23:36:21 +04:00
sunxiaoyu cc7e858fe1 Update CCEditBoxImplIOS.mm
02c6647306
2013-05-24 18:10:04 +08:00
James Chen 44e1382b9a Merge pull request from CocosRobot/updategeneratedsubmodule_1369387859
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-05-24 02:37:01 -07:00
zhangbin c89bf0f1a8 Refactor the implementation of plugin protocols on android. 2013-05-24 17:34:01 +08:00
CocosRobot bad653a900 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-05-24 09:31:15 +00:00
James Chen 74a39d9bf3 Merge pull request from samuele3hu/issue2103_testlua
modify some skip function name to tools/tojs/cocos2dx_extenson.ini
2013-05-24 02:26:15 -07:00
James Chen ca050cc084 Update generate-jsbindings.sh [ci skip], send pull request to the branch which is being built. 2013-05-24 16:54:18 +08:00
James Chen 3bb1fe0cc7 Update generate-jsbindings.sh [ci skip], send pull request to the branch which is being built. 2013-05-24 16:53:42 +08:00
James Chen 498bf3ad7a Merge pull request from samuele3hu/issue2103_testlua
modify some skip function name to tools/tojs/cocos2dx_extenson.ini
2013-05-24 01:39:26 -07:00
samuele3hu 26267aee56 issue modify some skip function name to tools/tojs/cocos2dx_extension.ini 2013-05-24 16:27:03 +08:00
James Chen bdc70fb312 Merge pull request from samuele3hu/issue2103_testlua
Add some skip function name to tools/tojs/cocos2dx_extension.ini
2013-05-24 01:12:14 -07:00
James Chen d771853058 Merge pull request from samuele3hu/issue2103_testlua
Add some skip function name to tools/tojs/cocos2dx_extension.ini
2013-05-24 01:11:52 -07:00
samuele3hu a1ef0db7b7 issue add some skip function name to tools/tojs/cocos2dx_extension.ini 2013-05-24 15:40:02 +08:00
James Chen 2e3023b863 Merge pull request from samuele3hu/issue2103_testlua
add more test lua
2013-05-23 23:51:17 -07:00
James Chen 60a0f4ec6b Merge pull request from samuele3hu/issue2103_testlua
Add more Test Lua
2013-05-23 23:50:57 -07:00
samuele3hu 8b5450ef4a issue modify some build script 2013-05-24 13:55:05 +08:00
samuele3hu 0a1c12a2d3 issue add some overlapping file and delete some comment line 2013-05-24 13:45:06 +08:00
samuele3hu 01399f9d5e issue add more test lua 2013-05-24 11:46:07 +08:00
samuele3hu 338c7c8d67 issue add more test lua 2013-05-24 11:42:27 +08:00
James Chen 9a36d8080a Merge pull request from guanqun/current-master
remove the un-used static variable in PluginUtilsIOS
2013-05-23 19:34:55 -07:00