Commit Graph

6761 Commits

Author SHA1 Message Date
James Chen d03ff0616a issue #1469: Added MoonWarriors sources and made it works on windows. 2012-10-10 14:50:04 +08:00
minggo f75547e9d4 Merge pull request #1436 from folecr/latestjsbindings
Update to latest generated JS bindings
2012-10-09 21:55:06 -07:00
minggo 3f619d624d Merge pull request #1437 from folecr/updatescript
Allow partial run of JS bindings script when cocos2dx remote repository is not set.
2012-10-09 21:54:43 -07:00
folecr e6622eebd0 Allow partial run of script when cocos2dx remote repository is not set.
* Also fix some comments.
2012-10-09 21:36:32 -07:00
folecr 12d711a13e Update to latest generated JS bindings 2012-10-09 21:18:58 -07:00
minggo 36f3b12ebc Merge pull request #1435 from minggo/iss1500_rendertexture
Iss1500 rendertexture
2012-10-09 21:06:41 -07:00
minggo d8b0c75675 fixed #1500:fix a memory leak 2012-10-10 12:02:56 +08:00
minggo 96b3232910 fixed #1500:make rendertexture work ok on certain Qualcomm Andreno gpu 2012-10-10 11:36:02 +08:00
minggo e7fea0449f Merge pull request #1433 from rohankuruvilla/gles20
Adding CCSchedule bindings. Also adding CCOrbitCamera bindings and modif...
2012-10-09 18:34:36 -07:00
James Chen 14a56ddc8f Merge branch 'gles20' of https://github.com/rohankuruvilla/cocos2d-x into rohan-schedule 2012-10-10 09:33:54 +08:00
minggo b7cfb6cbe9 Merge pull request #1434 from folecr/autogenscript
Jenkins script for auto-generating and committing JS bindings.
2012-10-09 18:29:17 -07:00
folecr 66d843ce38 Jenkins script for auto-generating and committing JS bindings. 2012-10-09 15:12:15 -07:00
Rohan Kuruvilla 12292afee6 Adding CCSchedule bindings. Also adding CCOrbitCamera bindings and modifying cocos2dx.ini 2012-10-09 15:03:14 -07:00
johnangel e510bee238 Displaying window size in Debug mode 2012-10-09 10:58:56 +02:00
walzer 394af672d8 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Conflicts:
	cocos2dx/cocoa/CCDictionary.cpp
	cocos2dx/platform/win32/CCImage.cpp
2012-10-09 14:40:25 +08:00
johnangel e7340f6c1b ESC button on Windows will now behave like Back button on mobile phones 2012-10-08 18:46:19 +02:00
johnangel 72aa46afe5 Refactoring code 2012-10-08 18:38:04 +02:00
johnangel c6da27b793 Debug app uses executable directory; Non-debug app uses local app data
directory
2012-10-08 17:22:27 +02:00
johnangel ad7dacc281 Merge remote branch 'upstream/gles20' into gles20 2012-10-08 16:35:43 +02:00
Walzer f1d9629404 Merge pull request #1361 from ncrothe/gles20
add the capability to set custom http header to HttpClient
2012-10-08 01:06:39 -07:00
James Chen b149bbb5e5 Merge pull request #1431 from dumganhar/gles20
Adding some comments for CCDictionary::objectForKey method.
2012-10-07 23:59:41 -07:00
James Chen be236155e9 Fix a typo. 2012-10-08 14:58:24 +08:00
James Chen f6c34e23e6 Adding some comments for CCDictionary::objectForKey method. 2012-10-08 14:55:46 +08:00
James Chen 7eb5be1e51 Merge pull request #1430 from dumganhar/gles20
fixed #1496: An error of comparing font's face name in CCImage of win32 port.
2012-10-07 23:54:56 -07:00
James Chen 70286073e1 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-10-08 14:53:22 +08:00
James Chen 719cb7b7a6 fixed #1496: An error of comparing font's face name in CCImage of win32 port. 2012-10-08 14:52:08 +08:00
James Chen b52b2c94ab Merge pull request #1428 from dumganhar/gles20
fixed #1495: CCScrollView display area and touch area are wrong if its parent's postion isn't at CCPointZero in world.
2012-10-07 23:14:32 -07:00
minggo b291fff32e Merge pull request #1427 from dumganhar/iss1494-autorelease
fixed #1494: Missing removing auto-release object from AutoReleasePool if invoking 'autorelease' method more times.
2012-10-07 23:13:30 -07:00
James Chen cb2f3efc2c fixed #1495: CCScrollView display area and touch area are wrong if its parent's postion isn't at CCPointZero in world. 2012-10-08 14:12:34 +08:00
James Chen 6d29e63294 fixed #1494: Change the value of CCObject::m_uAutoreleaseCount in CCAutoreleasePool class. 2012-10-08 14:05:03 +08:00
James Chen 54b4c690d1 fixed #1494: Missing removing auto-release object from AutoReleasePool if invoking 'autorelease' method more times. 2012-10-08 13:41:48 +08:00
minggo 58b46b2f53 Merge pull request #1419 from folecr/ndkgdb
Run Android debugger with Cocos2D-X projects!
2012-10-07 19:52:12 -07:00
minggo da4456ffee Merge pull request #1426 from FlowerpotGames/gles20
Android - Cocos2dxActivity update
2012-10-07 19:04:19 -07:00
minggo 5170e0ac2d Merge pull request #1425 from folecr/parallelbuild
Minor update to help speed up build time
2012-10-07 18:36:39 -07:00
Ed Bartley 04527f7378 Added some flexibility to the Cocos2dxActivity. View creation can be overridden by developers that use a custom Layout and custom views. 2012-10-06 23:39:47 -04:00
folecr d8a26a8623 Use "-j8" flag to ndk-build when building TestJavaScript
* If a "-p" for "parallel build" option is set
2012-10-05 12:36:04 -07:00
Ed Bartley a9177fed6f Fix Typo.
Make mGLSurfaceView public so that subclasses can may initialize mGLSurfaceView from a custom xml layout.
2012-10-05 10:24:17 -04:00
folecr bc05a650ec Add a template for the debugger script that is used when generating a new project 2012-10-04 11:48:17 -07:00
walzer f1b87ef0e9 fix bugs in CCDictionary::objectForKey(int/string) 2012-10-04 09:03:22 +08:00
walzer 16afe5b616 fix bugs in CCDictionary & platform/win32/CCImage.cpp::setFont, according to BitWave's codereview. 2012-10-02 22:30:27 +08:00
folecr abcb6b33a7 set -x in build script so that entire command line is available in the build log 2012-10-01 11:58:46 -07:00
folecr 2f5613595b Helper script to launch this application via ndk-gdb 2012-10-01 11:58:45 -07:00
Sergey Buravtsov 9eec2d69ee Fix removeTileAt crash corresponding this post: http://www.cocos2d-x.org/boards/6/topics/4336 2012-10-01 16:08:11 +04:00
johnangel 0f2dac9d8e Saving data to C:\Documents and Settings\<User Name>\Local
Settings\Application Data as designed for Windows apps
2012-10-01 11:55:21 +02:00
minggo 9d9f69186e Update AUTHORS 2012-09-29 15:39:38 +08:00
minggo 6b9affae65 Merge pull request #1402 from Horcruxes/patch-1
Update cocos2dx/platform/ios/CCFileUtils.mm
2012-09-29 00:35:35 -07:00
minggo 936cb19684 Merge pull request #1405 from dualface/complete_delete_ccdirector
Complete delete CCDirector after called CCDirector::purgeDirector()
2012-09-28 19:20:36 -07:00
Walzer 586f5100de Merge pull request #1414 from walzer/gles20
fixed #1492, assert if user add an CCObject* into CCAutoreleasePool twice.
2012-09-28 03:23:17 -07:00
walzer 0cca568ffe fixed #1492, assert if user add an CCObject* into CCAutoreleasePool twice. 2012-09-28 18:22:00 +08:00
Walzer 3c7994b19f Merge pull request #1413 from walzer/gles20
add iOS 5.0, 6.0 build targets to jenkins_scripts
2012-09-27 21:00:54 -07:00