Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,596 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

5596 Commits

Author SHA1 Message Date
minggo 6878b626cd add new GUI component 2012-09-25 18:00:06 +08:00
minggo 2b35f1a20f Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into layer_gradient 2012-09-25 17:38:17 +08:00
James Chen 3e442d161f Merge pull request #1381 from dumganhar/iss1483_sync_cccontrol 
issue #1483: Synchronizing CCControlExtension to latest version.
 2012-09-25 02:30:30 -07:00
James Chen d91d7c8317 issue #1483: Added LICENSE_CCControlExtension.txt, and added license information for headers of CCControlExtension. 2012-09-25 17:26:09 +08:00
minggo 418816ea77 add fps_image.png into TestCpp 2012-09-25 17:06:59 +08:00
James Chen 83fe21b4f4 issue #1483: Removed a comment. 2012-09-25 17:03:29 +08:00
James Chen f7229f74d8 issue #1483: Synchronizing CCControlExtension to latest version. 2012-09-25 16:57:51 +08:00
dualface 8d104b8244 [Lua] add CCApplication:getTargetPaltform() 2012-09-25 16:43:36 +08:00
dualface a2b468f2b3 [Lua] fix CCActionInterval, CCFiniteTimeAction, CCAction declare 2012-09-25 16:27:54 +08:00
minggo da97921099 fix compile errors of TestJavaScript 2012-09-25 16:21:28 +08:00
minggo bfb886bdd2 Merge pull request #1378 from folecr/jsbindingsscript 
JS Bindings generator script for Jenkins
 2012-09-25 00:06:52 -07:00
jzgenius e24ad0380b [fix] CCNotificationObserver performSelector & CCNotificationObserver function. Let's m_object is right perform to target. 2012-09-25 14:54:13 +08:00
jzgenius ee6ffd8f0e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-25 14:43:20 +08:00
minggo 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
folecr b5cfc3034b Jenkins script to generate JS bindings 2012-09-24 21:48:12 -07:00
folecr 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
folecr 1a6581383c Spidermonkey headers are not used for generation 2012-09-24 21:48:11 -07:00
minggo df24c919a4 Merge pull request #1377 from minggo/gles20 
fix auto building error
 2012-09-24 21:14:10 -07:00
minggo 74b9e2539b fix auto building error 2012-09-25 12:13:06 +08:00
Walzer 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
minggo 3d177f926b Merge pull request #1373 from ByungChoi/fontconfig_link_fix 
fixed cocos2dx linux TestCpp build break
 2012-09-24 19:18:12 -07:00
Donald Alan Morrison 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
Walzer 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
walzer 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
Walzer 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
walzer 609c4b12f9 revert back SimpleGame to enableRetinaDisplay approach. Update background image of HelloCpp to 640x1136. 2012-09-24 21:14:08 +08:00
Byung Choi 624bedad38 fixed cocos2dx linux makefile to link libfontconfig 2012-09-24 20:14:42 +09:00
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