e24ad0380b
[fix] CCNotificationObserver performSelector & CCNotificationObserver function. Let's m_object is right perform to target.
2012-09-25 14:54:13 +08:00
ee6ffd8f0e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-09-25 14:43:20 +08:00
364d7a487a
Update cocos2dx/platform/android/java/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java
...
Comment some debug codes, because it will cause auto-building fail.
2012-09-25 14:42:45 +08:00
b5cfc3034b
Jenkins script to generate JS bindings
2012-09-24 21:48:12 -07:00
d01b6093d8
gendbings.sh generates userconf.ini
...
* ... and reads userconf.ini from current working directory
* ... also specify that this script is run by /bin/bash
2012-09-24 21:48:12 -07:00
1a6581383c
Spidermonkey headers are not used for generation
2012-09-24 21:48:11 -07:00
df24c919a4
Merge pull request #1377 from minggo/gles20
...
fix auto building error
2012-09-24 21:14:10 -07:00
74b9e2539b
fix auto building error
2012-09-25 12:13:06 +08:00
450f8f3a30
Merge pull request #1360 from jzgenius/NEWplatform-third_party-ios-libraries-libcurl
...
Ne wplatform third party ios libraries libcurl
2012-09-24 21:05:17 -07:00
3d177f926b
Merge pull request #1373 from ByungChoi/fontconfig_link_fix
...
fixed cocos2dx linux TestCpp build break
2012-09-24 19:18:12 -07:00
8693c54997
Minor memory-logic error. textField is a retain property, so assigning to it retains it, and assigning NULL to it releases it. Also, an init method called release outside the proper scope (the do{}while(0); block).
...
If you don't like the autorelease pool, it's easy enough to change this fix.
Aside: someone pulled tools/cxx-generator again, not me(!) :-)
2012-09-24 14:55:40 -07:00
8937a3f9cc
Merge pull request #1375 from walzer/gles20
...
update copyright to 2012, update cocos2d version to 2.0.3
2012-09-24 06:24:04 -07:00
06f639edab
update copyright to 2012, update cocos2d version to 2.0.3
...
1. update all copyright from 2010-2011 to 2010-2012 cocos2d-x.org
2. update COCOS2D_VERSION to 0x00020003
3. update const char* cocos2dVersion() to "cocos2d-2.0-x-2.0.3"
2012-09-24 21:22:20 +08:00
583b01f218
Merge pull request #1374 from walzer/gles20
...
revert back SimpleGame to enableRetinaDisplay approach. Update background image of HelloCpp to 640x1136.
2012-09-24 06:15:49 -07:00
609c4b12f9
revert back SimpleGame to enableRetinaDisplay approach. Update background image of HelloCpp to 640x1136.
2012-09-24 21:14:08 +08:00
624bedad38
fixed cocos2dx linux makefile to link libfontconfig
2012-09-24 20:14:42 +09:00
0e934be5ce
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-09-24 17:58:46 +08:00
ea9c183473
Merge pull request #1371 from minggo/gles20
...
revert modification of AppDelegate.cpp
2012-09-24 02:25:24 -07:00
a568c1d221
revert modification of AppDelegate.cpp
2012-09-24 17:24:00 +08:00
e0fe233752
Update samples/TestCpp/Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp
...
Added test to show use of HttpRequest::setHeaders
2012-09-24 12:15:53 +03:00
eb952e7c69
Merge pull request #1370 from minggo/ptr_int
...
Ptr int
2012-09-24 00:27:21 -07:00
f17545a1ae
fix a compile error
2012-09-24 15:26:18 +08:00
87cd1bfc9c
Merge pull request #1369 from walzer/adapt-4inch-iphone5
...
add sample code in HelloCpp & SimpleGame to teach how to adapt design resolution on all iphone screens
2012-09-24 00:21:35 -07:00
caa67d1eed
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into adapt-4inch-iphone5
...
Conflicts:
samples/TestJavascript/proj.ios/TestJavascript.xcodeproj/project.pbxproj
2012-09-24 15:17:58 +08:00
88952396e4
Merge branch 'ptr_int_casting_issue' of https://github.com/ByungChoi/cocos2d-x into ptr_int
2012-09-24 15:16:30 +08:00
95a5da83b0
Merge pull request #1368 from minggo/gles20
...
make TestJavaScript work and fix some warnings
2012-09-24 00:02:44 -07:00
48f9df7680
fix conflict
2012-09-24 15:01:24 +08:00
78ef574962
add touch callback to HelloCpp. Users can learn setDesignResolution easily.
2012-09-24 14:14:53 +08:00
7088b19a1a
add sample code in HelloCpp & SimpleGame to teach how to adapt design resolution to different iPhone screens (HVGA, 3.5 inch retina, and 4.0 inch retina)
2012-09-24 13:59:16 +08:00
e20b933f1a
make TestJavaScript work and fix some warnings
2012-09-24 13:57:45 +08:00
ed936dcd48
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into adapt-4inch-iphone5
2012-09-24 12:03:36 +08:00
5c5544f823
Merge pull request #1363 from walzer/gles20
...
fix ios6 orientation error, which is caused by ios6 api change.
2012-09-23 21:00:30 -07:00
5dfeb46235
move cxx-generator submodule pointer from db61f83 to 40ad793 as Rolando committed.
2012-09-24 11:58:29 +08:00
c6c98466cb
Merge pull request #1367 from dumganhar/gles20
...
[1] Fixed some compilation error for win32 platform.
[2] Delete 'cocos2d::' since extension is the sub-namespace of cocos2d.
[3] Added libExtensions.lib for TestJavascript vs2010 project. Removed some calling of 'USING_NS_CC;' in extensions.
2012-09-23 20:53:22 -07:00
37825acfd0
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-09-24 11:47:58 +08:00
e4cee68688
Added libExtensions.lib for TestJavascript vs2010 project.
...
Removed some calling of 'USING_NS_CC;' in extensions.
2012-09-24 11:47:33 +08:00
2ed7b9febe
Merge pull request #1365 from dualface/luafix
...
luabinding bugfix
2012-09-23 20:17:23 -07:00
a413496a1a
Delete 'cocos2d::' since extension is the sub-namespace of cocos2d.
2012-09-24 11:08:10 +08:00
426915dd4a
fixed some compilation error for win32 platform.
2012-09-24 11:05:15 +08:00
5b3bb2a087
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts fixed:
cocos2dx/platform/ios/FontLabel/FontLabel.m
cocos2dx/platform/ios/FontLabel/FontLabelStringDrawing.m
template/xcode4/lib_js.xctemplate/TemplateInfo.plist
2012-09-24 11:03:26 +08:00
37f508b415
Merge pull request #1327 from Weeds/gles20
...
[linux] font rendering enhancements
2012-09-23 19:58:48 -07:00
863b0b89a3
Revert "[iOS] fix: enableRetina() and setDesignResolutionSize() can not be used simultaneously. FROM kunlun.com, THANKS"
...
This reverts commit 6eabead4e3
2012-09-24 10:58:43 +08:00
c50a62be7a
issue #1482 , fix typos, mehod -> method.
2012-09-24 10:54:03 +08:00
59a4b0460b
HelloCpp and SimpleGame teaches how to adapt on all iPhone/iPad multi-resolutions, especially for 4-inch retina screen.
2012-09-24 10:46:15 +08:00
ff40b010f0
Merge pull request #1364 from minggo/gles20
...
merge pull request to resolve deprecation warnings
2012-09-23 19:35:55 -07:00
5e225467e4
merge pull request to resolve deprecation warnings
2012-09-24 10:33:31 +08:00
2c9399cdea
Merge pull request #1355 from folecr/refactor_scripting_core
...
Refactor scripting core
2012-09-23 18:45:03 -07:00
8d51c0ed19
fixed #1482 , deal with ios6 orientation in templates/xcode4, with a little refactoring.
...
1. I think you guys haven't tested Xcode templates before 2.0.2 release. The templates are ALL BROKEN because CCHttpClient requires libcurl, which is excluded by xcode4_template_generator/run_generator.sh. It means developers on 2.0.2 would create a new project with compilation error, damn!
2. ios/AppController.*, ios/RootViewController.*, ios/main.m are moved from cocos2dx_*.xctemplate folder to base_ios.xctemplate folder. I don't want to modify tons of RootViewController clones any more.
2012-09-23 22:11:29 +08:00
88b98faa88
fixed #1482 , fix orientation problem caused by ios6 api change.
...
AppDelegate.mm & RootViewController.mm are updated.
2012-09-23 20:24:51 +08:00
b699133567
Merge with upstream re: tools/cxx-generator subproject commit.
2012-09-22 21:02:46 -07:00
jzgenius