Commit Graph

9153 Commits

Author SHA1 Message Date
minggo 05db67e8ae Merge pull request from ricardoquesada/configuration_format_2
CCConfiguration has format
2013-05-29 01:59:34 -07:00
Ricardo Quesada ebb392ca8e CCConfiguration has format
CCconfiguration has a file format.
It has a data and metadata
2013-05-28 18:15:16 -07: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
minggo 27b9a4d4ae Merge pull request from minggo/ETC1-support
modify ORGANIZATIONNAME
2013-05-28 03:09:45 -07:00
minggo 98b1d95a74 modify ORGANIZATIONNAME 2013-05-28 18:04:42 +08: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
minggo d6e547cd02 issue #2161:add CCTextureETC.cpp/.h into vs2010 project 2013-05-28 10:04:19 +08: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
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
Sergey Shambir 06e6048537 Linux port: added libX11 to linked libraries.
Otherwise build fails on linux.
2013-05-24 23:36:21 +04: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
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
Lu Guanqun aeb1e53026 remove the un-used static variable in PluginUtilsIOS 2013-05-24 03:54:07 +08:00
James Chen 0a20c73f68 Merge pull request from zynga/XMLHttpRequest_cchttpclient
fixed : Fixed setHeader while Android had problems with stringstreams.
2013-05-23 06:34:50 -07:00
Carsten Sandtner 820983f40c Fixed setHeader while Android had problems with stringstreams. 2013-05-23 14:37:32 +02:00
James Chen 19e7771130 Merge pull request from samuele3hu/MenuTest
issue : Add menu test sample of testlua
2013-05-23 03:26:48 -07:00
samuele3 bfce20d1ae Merge branch 'MenuTest' of https://github.com/samuele3hu/cocos2d-x; branch 'master' of https://github.com/cocos2d/cocos2d-x into MenuTest 2013-05-23 17:51:06 +08:00
James Chen 870818ec9c Merge pull request from CocosRobot/updategeneratedsubmodule_1369302025
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-05-23 02:47:11 -07:00
samuele3 4c5ceb7ac3 Merge branch 'MenuTest' of https://github.com/samuele3hu/cocos2d-x; branch 'master' of https://github.com/cocos2d/cocos2d-x into MenuTest 2013-05-23 17:44:41 +08:00
CocosRobot 41c7adb532 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-05-23 09:40:35 +00:00
James Chen 62552f94cb Merge pull request from dumganhar/iss2217-atlas-fps
fixed : Using CCLabelAtlas instead of CCLabelTTF to show FPS.
2013-05-23 02:35:21 -07:00
James Chen 91a355cdb0 Updating cocos2dx/Android.mk. 2013-05-23 17:10:30 +08:00
James Chen 131d97a3d6 fixed : Updating the comment for FPS display by using CCLabelAtlas. 2013-05-23 16:55:53 +08:00
James Chen 8448280ed3 issue 2217: Updating Make file and project configuration to add ccFPSImage.c. 2013-05-23 16:50:48 +08:00
James Chen d6a0af86eb fixed : Updating logic when m_bIgnoreContentScaleFactor is enabled. 2013-05-23 16:12:04 +08:00
James Chen 42102bcf0a issue 2217: Removing unused fps_image png data. 2013-05-23 16:04:40 +08:00
James Chen 733b551bf6 issue : Revert changes in CCPlatformMacro.h. 2013-05-23 15:59:45 +08:00