Commit Graph

5725 Commits

Author SHA1 Message Date
Sergey Vikhirev 05eb4352e8 Remove retina specific methods and logic 2012-09-24 14:22:02 +04:00
jzgenius 0e934be5ce Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-24 17:58:46 +08:00
minggo ea9c183473 Merge pull request #1371 from minggo/gles20
revert modification of AppDelegate.cpp
2012-09-24 02:25:24 -07:00
minggo a568c1d221 revert modification of AppDelegate.cpp 2012-09-24 17:24:00 +08:00
ncrothe 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
minggo eb952e7c69 Merge pull request #1370 from minggo/ptr_int
Ptr int
2012-09-24 00:27:21 -07:00
minggo f17545a1ae fix a compile error 2012-09-24 15:26:18 +08:00
Walzer 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
walzer 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
minggo 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
minggo 95a5da83b0 Merge pull request #1368 from minggo/gles20
make TestJavaScript work and fix some warnings
2012-09-24 00:02:44 -07:00
minggo 48f9df7680 fix conflict 2012-09-24 15:01:24 +08:00
walzer 78ef574962 add touch callback to HelloCpp. Users can learn setDesignResolution easily. 2012-09-24 14:14:53 +08:00
walzer 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
minggo e20b933f1a make TestJavaScript work and fix some warnings 2012-09-24 13:57:45 +08:00
walzer ed936dcd48 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into adapt-4inch-iphone5 2012-09-24 12:03:36 +08:00
Walzer 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
walzer 5dfeb46235 move cxx-generator submodule pointer from db61f83 to 40ad793 as Rolando committed. 2012-09-24 11:58:29 +08:00
James Chen 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
James Chen 37825acfd0 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-24 11:47:58 +08:00
James Chen 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
minggo 2ed7b9febe Merge pull request #1365 from dualface/luafix
luabinding bugfix
2012-09-23 20:17:23 -07:00
James Chen a413496a1a Delete 'cocos2d::' since extension is the sub-namespace of cocos2d. 2012-09-24 11:08:10 +08:00
James Chen 426915dd4a fixed some compilation error for win32 platform. 2012-09-24 11:05:15 +08:00
walzer 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
minggo 37f508b415 Merge pull request #1327 from Weeds/gles20
[linux] font rendering enhancements
2012-09-23 19:58:48 -07:00
dualface 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
walzer c50a62be7a issue #1482, fix typos, mehod -> method. 2012-09-24 10:54:03 +08:00
walzer 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
minggo ff40b010f0 Merge pull request #1364 from minggo/gles20
merge pull request to resolve deprecation warnings
2012-09-23 19:35:55 -07:00
minggo 5e225467e4 merge pull request to resolve deprecation warnings 2012-09-24 10:33:31 +08:00
minggo 2c9399cdea Merge pull request #1355 from folecr/refactor_scripting_core
Refactor scripting core
2012-09-23 18:45:03 -07:00
Walzer 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
Walzer 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
Donald Alan Morrison b699133567 Merge with upstream re: tools/cxx-generator subproject commit. 2012-09-22 21:02:46 -07:00
Donald Alan Morrison dec9fff7a7 UITextAlignment deprecated for NSTextAlignment.
UITextAlignment on NSTextAlignment is injective, not surjective.
There is an equivalence relationship for a subset of NSTextAlignment.

http://en.wikipedia.org/wiki/One-to-one_function
2012-09-22 20:56:10 -07:00
ncrothe b3f5a04ad4 Update extensions/network/HttpClient.cpp
Added custom header capability to http wrapper (using curl features). This allows setting non-default content-type for POSTs.
2012-09-22 17:52:04 +03:00
ncrothe 7b9c15176e Update extensions/network/HttpRequest.h 2012-09-22 17:45:02 +03:00
Byung Choi 68f38914b1 fixes #1359 , MSVC's stdint absence 2012-09-22 17:36:36 +09:00
jzgenius ad5b687848 [lib] New libcurl.a, armv7 & armv7s & simulator Supported. 2012-09-22 13:16:23 +08:00
jzgenius 3f0f5edb94 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-22 12:04:33 +08:00
folecr 78bfc2df62 Fix spurious file introduced into makefile 2012-09-21 12:09:26 -07:00
folecr 12e88ac514 Update bindings 2012-09-21 12:07:30 -07:00
folecr cbade952f6 Update to latest cxx-generator 2012-09-21 12:07:30 -07:00
folecr 5ff4d73688 Use new directives for renaming functions and classes 2012-09-21 11:41:08 -07:00
folecr 901146e2ee Synchronize cocos2dx.ini 2012-09-21 11:41:08 -07:00
folecr 2a78f8d176 Separate out cocos specific manual type conversions. 2012-09-21 11:38:19 -07:00
folecr 6730294dbe Generated bindings are a submodule pointing to a separate repository
* This allows bindings to be generated by a build server
 * ... when the Cocos2D-X API changes
2012-09-21 11:38:19 -07:00
Byung Choi dad0573b29 fixed build breakage for linux from change of test src name. 2012-09-22 03:18:26 +09:00
Byung Choi 2ed9119d4f fixed pointer to int casting warnings and errors, based on stdint 2012-09-22 03:02:29 +09:00