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

149 Commits

Author SHA1 Message Date
James Gregory 77dda8c828 More client side buffer fixes. 2013-04-08 21:07:49 -07:00
James Gregory 3e5acf992b Fix Motion streak client side buffers 2013-04-08 19:09:38 -07:00
Sam Clegg 38878b084b Fix all compiler warnings produced by gcc. 
This allows the linux and NaCl builds (and perhaps others)
to be compiles with -Wall and -Werror, and it makes the build
output much less noisy.
 2013-03-05 17:01:00 -08:00
minggo c75e440e22 issue #1686:synchronized RenderTexture 2013-02-28 16:35:42 +08:00
minggo 8dc431425c issue #1686:synchronize CCMenuItem.cpp 2013-02-27 17:23:39 +08:00
minggo 7eb93128c2 issue #1686:synchronize CCMotionStreak.cpp 2013-02-27 16:52:19 +08:00
minggo 4b8708b762 issue #1686:synchronize CCProgressTimer.cpp 2013-02-27 15:52:14 +08:00
minggo 088bc959f6 issue #1686:synchronize CCRenderTexture.cpp 2013-02-27 15:44:36 +08:00
minggo 0c5bcb3f7b issue #1702:fix a typo error 2013-02-06 18:04:40 +08:00
James Chen 7f81db038c issue #1697: fixed two logical error in CCRenderTexture::initWithWithAndHeight. 2013-02-04 11:33:13 +08:00
James Chen 6565fa92cc fixed #1649: Changed return type to const reference for member variable access. 2013-01-14 15:51:53 +08:00
James Chen 9f322d9646 fix a typo. 2013-01-10 15:58:52 +08:00
minggo a75f8b7e7a fixed #1593:remove all deprecated methods expect CCBAnimationManager 2012-12-06 18:51:33 +08:00
William Chen 132a76d801 Fix for CCRenderTexture on Android sleep/resume 
When an android app goes into the background, all gl context is lost, including any frame buffer objects that are required for rendering to a texture. When the android app returns to focus, a new FBO is generated for each render texture allowing rendering to the texture to continue.
 2012-11-29 18:04:07 -05:00
minggo 96ecb05ca9 issue #1564: make tests run on mac osx 2012-11-23 14:22:50 +08:00
minggo 14dbe091c8 fix a logical bug in CCRenderTExture 2012-11-22 11:06:07 +08:00
James Chen e1f7c0bab6 issue #1564: Removing one unnecessary line in CCRenderTexture::visit. 2012-11-22 09:55:43 +08:00
James Chen 170978d6a5 issue #1564: Added ClippingNodeTest. 2012-11-21 15:22:54 +08:00
James Chen ebd522e3fa issue #1564: Return a new object instead of 'const reference' for some get methods. 2012-11-20 16:34:55 +08:00
minggo a4a53df159 issue #1555:build ok on android 2012-11-16 14:23:14 +08:00
minggo a701eaecce issue #1555:update to v2.1 beta3 2012-11-14 18:05:15 +08:00
minggo d2a5723973 issue #1555:add CCDrawNode 2012-11-09 12:08:18 +08:00
minggo 6159a8b592 issue #1555:add CCClippingNode 2012-11-08 17:55:25 +08:00
James Chen 2c670a9efc issue #1486: Fix a bug in CCRenderTexture.cpp about calculate width and height by multiply CC_CONTENT_SCALE_FACTOR(). 2012-10-13 18:19:37 +08: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
Donald Alan Morrison 4cbd993091 Minor English Spelling Corrections. A few grammar corrections. 2012-09-17 00:02:24 -07:00
minggo 56ce6869d6 Merge pull request #1227 from donaldalanmorrison/gles20 
Gles20
 2012-08-23 18:32:39 -07:00
minggo 3b442dfc0f fixed #1439:synchronize to cocos2d-iphone v2.0.0 2012-08-22 15:51:25 +08:00
Donald Alan Morrison c482a246be Plugged potential memory leak found by LLVM Static Analyzer. 2012-08-20 16:40:26 -07:00
Walzer 685b70e6fb fixed #1402, résolve conflicting "create" functions 
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
 2012-07-23 22:49:11 +08:00
minggo f9c40f7372 issue #1399: work ok on iOS after adjusting directory structure 2012-07-19 17:22:36 +08:00
James Chen a901b0bb12 fixed #1367: Refactor "createWith***" to "create". 2012-06-27 14:21:29 +08:00
Walzer 9eab0c19f8 add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
James Chen 24e3ec7499 fixed #1336: Updated comment information for deprecated apis. 2012-06-20 14:31:36 +08:00
James Chen b818c0afa6 fixed #1336: Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces. 2012-06-20 11:48:31 +08:00
minggo 90448ec7d0 issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
minggo 9ec29d715a issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
James Chen 1d0fa4a9aa fixed #1292: Updated lua bindings. 2012-06-15 17:26:11 +08:00
minggo d0f905992a issue #1292:make some function names more readable 2012-06-15 15:10:40 +08:00
minggo c965c8d770 fixed 1181: synchronize latest codes 2012-06-15 10:27:52 +08:00
minggo 9d9e2579e3 issue #1181: save render texture when comming to background 2012-06-14 18:37:57 +08:00
James Chen 3a410c14a1 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1324_create 
Conflicts:
	cocos2dx/extensions/CCBReader/CCBReader_v2.cpp
	cocos2dx/extensions/CCControlExtension/CCScale9Sprite.cpp
	cocos2dx/label_nodes/CCLabelBMFont.cpp
	cocos2dx/menu_nodes/CCMenuItem.cpp
	cocos2dx/menu_nodes/CCMenuItem.h
	cocos2dx/misc_nodes/CCRenderTexture.h
	cocos2dx/tileMap_parallax_nodes/CCTileMapAtlas.cpp
	tests/tests/ExtensionsTest/CocosBuilderTest/HelloCocosBuilder.cpp
	tests/tests/LabelTest/LabelTest.cpp
 2012-06-14 17:36:31 +08:00
James Chen 7fe3f7357e issue #1324: Reverted old interfaces. 2012-06-14 17:18:05 +08:00
James Chen 23574172ff issue #1324: Added create() for static member functions that new an autorelease object, updated cocoa folder. 2012-06-14 16:05:58 +08:00
James Chen 3f7b44fc23 issue #1324: Added create() for static member functions that new an autorelease object 2012-06-14 15:13:16 +08:00
Nicolas Gramlich e2a1a246a0 Converted removed all Carriage Returns (dos line-endings, ^M.) in cocos2dx, except in the windows project/platform files. 2012-06-13 14:26:28 -07:00
Nicolas Gramlich 58b53be708 Merge with gles20. 2012-06-11 11:50:32 -07:00
Nicolas Gramlich 4378731418 Merge with gles20. 2012-06-11 10:43:07 -07:00
James Chen 12a9d13443 issue #1310: Synchronize to RC2, HelloWorld works ok on win32. 2012-06-08 16:54:38 +08:00