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

4339 Commits

Author SHA1 Message Date
James Chen 734ea54aba fixed #1302: The parameter of CCMenu::setHandlerPriority should be signed int. 2012-06-06 15:16:02 +08:00
James Chen 10e0180809 Merge pull request #971 from dumganhar/gles20 
Removed some unused codes.
 2012-06-05 23:34:37 -07:00
James Chen 37aa196c73 Removed some unused codes. 2012-06-06 14:31:49 +08:00
James Chen 84441e8595 Merge pull request #970 from dumganhar/gles20 
fixed #1301: CCEGLView::sharedOpenGLView().setScissorInPoints() should apply scissor in points.
 2012-06-05 23:25:32 -07:00
James Chen 2238db301b fixed #1301: CCEGLView::sharedOpenGLView().setScissorInPoints() should apply scissor in points. 2012-06-06 14:13:40 +08:00
James Chen c8b62d4ec8 Merge pull request #969 from dumganhar/gles20 
fixed #1300: Typo: CC_ENABLE_CACHE_TEXTTURE_DATA -> CC_ENABLE_CACHE_TEXTURE_DATA
 2012-06-05 19:09:17 -07:00
James Chen d827cdacc0 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-06 10:07:12 +08:00
James Chen 6bb2941ec9 fixed #1300: Typo: CC_ENABLE_CACHE_TEXTTURE_DATA -> CC_ENABLE_CACHE_TEXTURE_DATA 2012-06-06 10:06:51 +08:00
Nicolas Gramlich bcf53f1453 Added CCNodeLoaderLibrary (more of a factory pattern, compared to adding the CCNodeLoaders directly to the CCBReader. Fixed all TODOs regarding (potential) memory leaks (Thanks to Ricardo Quesada). CCNodeLoaders are now autorelease objects (having a static 'loader()' method to be used). 2012-06-05 17:15:28 -07:00
Nicolas Gramlich c9db868d93 CCLabelTTF: Now internally using std::string instead of std::string *. 2012-06-05 17:12:41 -07:00
Nicolas Gramlich 2d86a4089c CCLabelBMFont: Now using std::string to store internal data instead of just storing a 'foreign' const char *. 2012-06-05 17:11:50 -07:00
Nicolas Gramlich 0702becaf5 CCAutoreleasepool: Fixed typo. 2012-06-05 16:22:42 -07:00
James Chen 07269f8505 Merge pull request #968 from dumganhar/gles20 
fixed #1297: Retina mode can't work in 'Projection2D' mode.
 2012-06-05 00:30:34 -07:00
James Chen 56817244ed fixed #1297: Retina mode can't work in 'Projection2D' mode. 2012-06-05 15:27:46 +08:00
minggo 0ff2e55c0c Merge pull request #967 from minggo/iss1296_tilemap 
fixed #1296: fix logical error of CCTMXTileMap::tilesetForLayer()
 2012-06-04 19:53:06 -07:00
minggo 7733607fe2 fixed #1296: fix logical error of CCTMXTileMap::tilesetForLayer() 2012-06-05 10:51:53 +08:00
minggo 91813bf082 Merge pull request #966 from minggo/iss1290_shader_path 
fixed #1290:use Shaders folder in correct way
 2012-06-04 18:41:50 -07:00
Nicolas Gramlich 420a731138 Switched from std::string to const char *. 2012-06-04 17:45:25 -07:00
Nicolas Gramlich d3e0f8dc92 Added support for resolutionScale. 2012-06-04 16:16:42 -07:00
Nicolas Gramlich 28862c30cf CCNodeLoader: Fixed small memory leak. 2012-06-04 16:03:45 -07:00
Nicolas Gramlich 5c38dd7193 Added CCBMemberVariableAssigner and CCBSelectorResolver. 2012-06-04 15:52:49 -07:00
Nicolas Gramlich 6c5be5e56e CCScale9Sprite: Removed debug logging. 2012-06-04 15:30:03 -07:00
minggo dc24094b5f fixed #1290:use Shaders folder in correct way 2012-06-04 11:41:03 +08:00
James Chen 1b4de48e86 Merge pull request #961 from icewind/gles20 
fixed #1289: CCControlButton update. Added zoomOnTouchDown property and setPreferredSize.
 2012-06-03 19:55:39 -07:00
minggo ae15525e32 Merge pull request #965 from NatWeiss/gles20 
fixed #1288:Enhances CCTransitionScene to work even if there is no running scene.
 2012-06-03 07:36:17 -07:00
minggo a0186cd081 Merge pull request #964 from NatWeiss/patch-1 
Update AUTHORS
 2012-06-02 18:47:47 -07:00
minggo ddcd69c453 Update AUTHORS 2012-06-03 09:47:07 +08:00
minggo 1d59f0ced6 Update AUTHORS 2012-06-03 09:45:51 +08:00
minggo 414be07f59 Merge pull request #962 from NatWeiss/8b6026f932ef6d0f284b8d73ac5657b79eec10ea 
fixed #1287:Android template's build_native.sh automatically copies new icons
 2012-06-02 18:45:05 -07:00
NatWeiss b17eeb4cb7 Update AUTHORS 2012-06-01 17:53:47 -07:00
Nicolas Gramlich bb49eaebe9 Added CCParticleSystemQuadLoader. 2012-06-01 16:45:30 -07:00
Nicolas Gramlich 8576837e5e CCParticleSystemQuad: Added CCParticleSystemQuad::node(). 2012-06-01 16:38:43 -07:00
Nicolas Gramlich 43682e6857 Added CControlLoader and CCControlButtonLoader. 2012-06-01 15:14:18 -07:00
Nicolas Gramlich 2340c93c17 Fixed CCNodeLoader::parsePropTypeSpriteFrame not trying to load 'null' sprites/spritesheets. Also minor renaming. 2012-06-01 15:13:16 -07:00
Nicolas Gramlich 9951ba8ad2 Minor changes. 2012-06-01 15:12:07 -07:00
Nicolas Gramlich 67d9b8ea25 Minor changes. 2012-06-01 15:11:42 -07:00
Nicolas Gramlich eee8ba7586 CCLabelTTF: Added getters for fontName and fontSize. 2012-06-01 15:11:16 -07:00
Nicolas Gramlich 9576db1e28 CCControlButton: Added LabelAnchorPoint property. (According to: https://github.com/YannickL/CCControlExtension/ : 623f10433a088140adbb1e1d7d6c97e1ae05adf9) 2012-06-01 15:10:20 -07:00
Nicolas Gramlich 18fba1664d CCControlButton: Added getters and setters for backgroundspriteframe, titlettf, titlettfsize, titleBMGont. Added ZoomOnTouchDown property. (According to: https://github.com/YannickL/CCControlExtension/ : 9dfb9d97a5fe729115b461d9a52ebc36aba51c72, b31256ad6b26e7f645719f203f0e72d717e68c75, 7a79cd702d4ccb958281bcec5d8a7658723f7c2a, c4bbcb9beb2febfb4b55323709e30082af902c90, d4a88349e1f60100225d49e43af587dc10def66f) 2012-06-01 12:29:48 -07:00
Nicolas Gramlich 8dbe897755 CCLabelBMFont: Made fntFile a property. (According to: ffbdb60a5908f5baef227bb0365a0b2653a3a59a) 2012-06-01 11:59:10 -07:00
icewind ac268896f1 CCControlButton update. Added zoomOnTouchDown property and setPreferredSize 
Ported some functions from original CCControlExtensions repository.
Added feature to set the preferred size of the background sprite and
toggle zooming on TouchDown event
 2012-06-01 14:07:45 +04:00
Nat Weiss 0fedc8a84a Enhances CCTransitionScene to work even if there is no running scene. 2012-06-01 00:54:17 -07:00
Nat Weiss 8b6026f932 Android template's build_native.sh automatically copies new icons from your assets directory. 2012-06-01 00:36:16 -07:00
James Chen f6ae01c523 Merge pull request #959 from dumganhar/typo_fix 
Typo fixed in CCGL.h
 2012-05-31 23:50:11 -07:00
James Chen 3959fe8f4d typo fixed in CCGL.h 2012-06-01 14:48:45 +08:00
minggo 987374c76b Update AUTHORS 2012-06-01 14:48:13 +08:00
minggo 63cf48f548 Merge pull request #958 from NatWeiss/gles20 
fixed #1286: Fixes the declaration of tgaLoadRLEImageData()
 2012-05-31 23:46:36 -07:00
Nat Weiss 472c98b652 Fixes the declaration of tgaLoadRLEImageData() to match it's implementation. This causes an android build to be successful. 2012-05-31 23:20:56 -07:00
James Chen 4ad8690c21 Merge pull request #957 from dumganhar/iss1282_ati 
Deleted libEGL.dll(.lib).
 2012-05-31 22:58:06 -07:00
James Chen 2b235fd705 Delete libEGL.dll(.lib). 2012-06-01 13:56:22 +08:00