tianTian
9144946176
Fix bug: CCControl's touch priority is not set correctly; m_nDefaultTouchPriority is never used;
2013-03-23 12:18:00 +08:00
James Chen
636f07a43f
Merge pull request #2243 from sbc100/fix_linux_build
...
Fix linux compilation of CCTexturePVR.cpp
2013-03-22 19:07:24 -07:00
Sam Clegg
fe86b9d6df
Fix linux compilation of CCTexturePVR.cpp
...
On linux (and possibly other platforms)
GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG is simply not defined since we don't
include GLES/gl2ext.h.
2013-03-22 10:40:35 -07:00
minggo
71659f4aa9
Merge pull request #2247 from hailongiPhone/master
...
release && set nil
2013-03-22 04:09:47 -07:00
James Chen
e7c44ec77b
Merge pull request #2248 from dumganhar/walzer-jsb_obfuscate
...
Merging https://github.com/cocos2d/cocos2d-x/pull/2245 and updating JS Test.
2013-03-22 00:21:02 -07:00
James Chen
54bd3c1925
Updating JSTest.
2013-03-22 15:11:56 +08:00
minggo
1538c72581
Merge pull request #2197 from dumganhar/ios-default-font
...
[iOS] Using system font by `[UIFont systemFontOfSize]` when font name wasn't found.
2013-03-22 00:10:09 -07:00
hailong
2ea447dbfd
Update CCDirectorCaller.mm
...
First destroy CCDirector instance with cocos2d::CCDirector::sharedDirector()->end()
Then create new CCDirector instance with
cocos2d::CCApplication::sharedApplication()->run();
APP will crash at
CCApplication::setAnimationInterval
[[CCDirectorCaller sharedDirectorCaller] setAnimationInterval: interval ];
2013-03-22 15:02:46 +08:00
Dawid Drozd
21cab34029
Fixing profiling compile error
2013-03-22 07:58:57 +01:00
James Chen
0faeb5da5e
Merge branch 'jsb_obfuscate' of https://github.com/walzer/cocos2d-x into walzer-jsb_obfuscate
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2013-03-22 14:12:38 +08:00
walzer
9371bbf799
roll back samples/Javascript/Shared to the ref before.
2013-03-22 12:10:21 +08:00
James Chen
8bf7f96eef
Merge pull request #2244 from dumganhar/master
...
fixed #1855 : std_string_to_jsval generates messy js string when passing non-ascii UTF8 std::string.
2013-03-21 21:07:38 -07:00
walzer
42c73fb820
Fixed #1841 , obfuscated js source can run on iOS correctly now.
2013-03-22 12:06:04 +08:00
James Chen
d80d68f7e0
fixed #1855 : std_string_to_jsval generates messy js string when passing non-ascii UTF8 std::string.
2013-03-22 12:01:08 +08:00
minggo
828b228239
Merge pull request #2239 from fape/android_eclipse2
...
Eclipse Project import - Windows part 2
2013-03-21 18:50:24 -07:00
fape
9c6a65d898
Update template android projects README files
2013-03-21 19:06:58 +01:00
fape
e9343c2d8a
- update README files
...
- format javascript sample README files like cpp samples
2013-03-21 16:04:53 +01:00
fape
77207ea494
Remove "-o igncr" from CocosPlayer Android Eclipse project
2013-03-21 15:05:02 +01:00
walzer
c52bbec5bc
add icons into TestJavascript.xcodeproj
2013-03-21 20:50:21 +08:00
walzer
6f41b7c4ea
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into jsb_obfuscate
2013-03-21 17:37:28 +08:00
walzer
d1e2cf8b4c
remove jsb_*_.js from compile list
2013-03-21 17:35:36 +08:00
minggo
61685762a8
Merge pull request #2236 from minggo/iss1848-pvrtc
...
use CCConfiguration::supportsPVRTC() to determine if the device supports pvrtc format
2013-03-21 02:22:08 -07:00
walzer
0a252aceaf
update submodule scripting/javascript/bindings/generated to the same ref ptr as upstream/master branch.
2013-03-21 17:13:24 +08:00
walzer
a590a27606
update submodule samples/Javascript/Shared to the same ref ptr as master branch
2013-03-21 17:10:14 +08:00
walzer
67cda2bfd4
issue #1841 , TestJavascript is obfuscated successfully
2013-03-21 16:55:55 +08:00
minggo
949700ca1a
issue #1848:use CCConfiguration::supportsPVRTC() to determine if the device support powertc format
2013-03-21 15:50:41 +08:00
minggo
66f9623fcd
Merge pull request #2234 from dumganhar/memory-leak
...
Fixing memoryleaks.
2013-03-20 18:32:19 -07:00
James Chen
e2e9bc8ce0
Fixing memoryleaks.
2013-03-21 09:00:55 +08:00
James Chen
387d1e6e33
Merge pull request #2233 from dumganhar/master
...
[VS2012] Adding dependence for AssetsMangerTest.
2013-03-20 17:16:46 -07:00
James Chen
8c70955547
[VS2012] Adding dependence for AssetsMangerTest.
2013-03-21 08:11:02 +08:00
minggo
89af0e0a52
Merge pull request #2232 from minggo/test-damganhar
...
fix some bugs when creating android project
2013-03-20 15:22:16 -07:00
minggo
ae9675c3bd
fix some bugs when creating android project with multi-platform tool
2013-03-21 06:20:19 +08:00
minggo
15826ea15b
Merge pull request #2230 from dumganhar/master
...
Updating the template of multi-platform.
2013-03-20 14:46:10 -07:00
minggo
2430f28ea1
Merge https://github.com/dumganhar/cocos2d-x into test-damganhar
2013-03-21 05:33:17 +08:00
James Chen
daea6ed3ea
Removing unused codes.
2013-03-20 23:19:55 +08:00
James Chen
3f43456072
Updating multi-platform templates.
2013-03-20 23:18:41 +08:00
James Chen
f7d3a23a98
Updating the template of multi-platform-js for win32.
2013-03-20 22:45:41 +08:00
James Chen
668d3ce638
Updating TestJavascript.vcxproj and WatermelonWithMe.vcxproj.
2013-03-20 22:07:30 +08:00
minggo
13ad6af87b
Merge pull request #2229 from minggo/master
...
don't modify .project file when creating a new android project
2013-03-20 05:55:41 -07:00
minggo
666279e30d
don't modify .project file when creating a new android project
2013-03-20 20:54:31 +08:00
waiter
a7ee5d9ce6
Merge pull request #5 from cocos2d/master
...
update cocos2d-x
2013-03-20 05:09:43 -07:00
James Chen
03a6181ee3
Merge pull request #2228 from dumganhar/master
...
[iOS] Updating ccbi files of js template.
2013-03-20 04:06:12 -07:00
James Chen
bd3bd045ed
[iOS] Updating ccbi file of js template.
2013-03-20 19:03:18 +08:00
James Chen
034cbcc5da
Merge pull request #2227 from CocosRobot/updategeneratedsubmodule_1363775777
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-20 03:39:19 -07:00
CocosRobot
5414a02c9f
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2013-03-20 18:36:26 +08:00
James Chen
6d97f71e42
Merge pull request #2226 from dumganhar/master
...
Fix a crash in cc.Scheduler.unscheduleAll cpp binding codes.Renaming function: initWithFile ~> init for CCSprite, CCSpriteBatchNode.
2013-03-20 03:35:42 -07:00
James Chen
33fc16261b
Updating blackberry project settings.
2013-03-20 18:34:28 +08:00
James Chen
4a9e426d2d
Renaming function: initWithFile ~> init for CCSprite, CCSpriteBatchNode.
2013-03-20 18:34:28 +08:00
James Chen
4bf7f9bad4
Fix a crash in cc.Scheduler.unscheduleAll cpp binding codes.
2013-03-20 18:32:30 +08:00
minggo
9c3c531483
Merge pull request #2225 from minggo/test-before-release
...
update changelog
2013-03-20 02:58:31 -07:00