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

6085 Commits

Author SHA1 Message Date
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
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
walzer 418fa5301a add iOS 5.0, 6.0 build targets to jenkins_scripts 2012-09-28 12:00:03 +08:00
Walzer f781931ee5 Merge pull request #1412 from walzer/gles20 
update javascript/bindings/generated/ submodule revision pointer
 2012-09-27 19:30:14 -07:00
walzer d6ba2b44c4 update javascript/bindings/generated/ submodule revision pointer 2012-09-28 10:29:21 +08:00
Walzer b4230648cd Merge pull request #1411 from walzer/gles20 
update doxygen config for v2.0.3
 2012-09-27 19:28:51 -07:00
walzer f4c8c3bf7a Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-28 10:19:23 +08:00
minggo fc2ba4730f Merge pull request #1410 from folecr/jsbindings_audioengine 
Add JavaScript bindings for CocosDenshion SimpleAudioEngine
 2012-09-27 18:57:32 -07:00
folecr 5859260b25 Update to latest generated bindings 2012-09-27 13:39:49 -07:00
folecr f1aff597a2 Update makefile to include CocosDenshion 2012-09-27 13:39:49 -07:00
folecr d57842bec5 Generate bindings for CocosDenshion's SimpleAudioEngine 
* Bindings configured to rename SimpleAudioEngine to AudioEngine
 2012-09-27 13:39:49 -07:00
walzer 2f779a3a27 update doxygen config 2012-09-27 14:06:39 +08:00
Walzer c07f6ae272 Merge pull request #1403 from walzer/gles20 
add landscape orientation setting to TestJavascript Xcode proj.
 2012-09-26 19:59:55 -07:00
walzer dcbf450cb3 add landscape orientation setting to TestJavascript Xcode prom. 2012-09-27 10:58:48 +08:00
Horcruxes cb66f1673e Update cocos2dx/platform/ios/CCFileUtils.mm 
fixing cannot read data using CCArray::createWithContentsOfFile
 2012-09-27 12:31:53 +10:00
Walzer bfa71ebdf5 Merge pull request #1400 from walzer/gles20 
fix compilation error in xcodebuild command line mode, which are caused by ios6 compatibility
 2012-09-26 19:29:53 -07:00
walzer d18eecf247 UIInterfaceOrientationMaskLandscape -> UIInterfaceOrientationMaskAllButUpsideDown, developers still need to set orientation in xcode->targets 2012-09-27 10:28:00 +08:00
minggo 216a47ab1b Merge pull request #1401 from folecr/gles20 
Ignore userconf.ini when running from jenkins
 2012-09-26 18:24:10 -07:00
folecr c8d108d350 Ignore userconf.ini when running from jenkins 2012-09-26 10:49:02 -07:00
walzer edaf22f14d fix xcode4 templates compilation error for xcodebuild command line mode, caused by ios6 compatibility. 2012-09-27 00:46:09 +08:00
walzer c9772c76ec fix compilation error in xcodebuild command line, which are caused by ios6 deprecated marcos and enums 2012-09-27 00:44:40 +08:00
Walzer 70e16a5835 Update AUTHORS 2012-09-26 19:31:01 +08:00
James Chen 7bb2e183da Merge pull request #1398 from dumganhar/gles20 
Updated win32 template.
 2012-09-26 02:57:17 -07:00
James Chen 6f6dd5daea Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-26 17:55:44 +08:00
James Chen e4b428a875 Updated win32 template. 2012-09-26 17:55:18 +08:00
minggo 50cce4f399 Merge pull request #1397 from minggo/gles20 
modify xcode project to include correct files
 2012-09-26 02:13:53 -07:00
minggo f3e2a385e1 modify xcode project to include correct files 2012-09-26 17:12:57 +08:00
James Chen 16f77f6f53 Merge pull request #1396 from dumganhar/gles20 
Reverted CCNotificationCenter.cpp.
 2012-09-26 01:28:59 -07:00