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

111 Commits

Author SHA1 Message Date
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
James Chen 76a560a474 issue #1310: Made CCFileUtils as a singleton. 2012-06-08 16:22:57 +08:00
James Chen c8dfe7f92b issue #1310: Finished CCRenderTexture.h(.cpp). 2012-06-08 14:30:55 +08:00
James Chen 26cf81e42e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts:
	cocos2dx/CCScheduler.h
	cocos2dx/include/ccTypes.h
 2012-06-08 14:14:13 +08:00
James Chen c5cf23c859 issue #1310: First commit since sync to rc2. 2012-06-08 14:11:48 +08:00
minggo cc16320445 issue #1310: syncronize actions 2012-06-08 13:55:28 +08:00
James Chen 4b7f9f582f fixed #1297: fixed a bug in CCRenderTexture::begin. The parameters of glViewPort should not multiply CC_CONTENT_SCALE_FACTOR(). 2012-06-06 15:56:55 +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
Walzer 1e732930b7 fixed #1258, testjs and spidermonkey-ios is merged. But only test_actions.js works. 2012-05-24 17:48:05 +08:00
James Chen 1d94ba05a0 fixed #1189: updated linebreak and tab(4 space) for all source files. 2012-04-25 18:17:04 +08:00
James Chen 0f36a89c7e issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00
James Chen 0c6d21c0f9 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform 2012-04-20 17:34:47 +08:00
James Chen 909a759ff6 issue #1177: Updated android project configuration. 2012-04-20 17:33:28 +08:00
minggo f3d97bd9b6 fixed #1180: synchronize CCConfiguration 2012-04-20 11:39:12 +08:00
James Chen f619c3e006 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1176_refactor 
Conflicts:
	cocos2dx/misc_nodes/CCRenderTexture.cpp
 2012-04-19 17:51:58 +08:00
minggo 92043b4db3 fixed #1150: use texture format kCCTexture2DPixelFormat_RGBA8888 to save image 2012-04-19 17:01:24 +08:00
James Chen 230b8a386b issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
 2012-04-19 14:35:52 +08:00
minggo 39ba6b4618 issue #1506: RenderTextureTest 2012-03-22 16:36:03 +08:00
minggo 39738e4270 issue #1056: implement ActionsProgressTest and run ok on win32 2012-03-19 18:20:32 +08:00
James Chen 275891dfb0 issue #1056: synchronise cocos2d-iphone-2.0-rc0a 2012-03-16 13:42:53 +08:00
James Chen 9e89171557 issue #1056: Rename ccGLState to ccGLStateCache, add some ccShader_***_.h, update CCGLProgram class. 2012-03-15 10:42:22 +08:00
James Chen 8aa3f7f9ae issue #1056: TestCases works ok except Box2dTest and ChipmunkTest. 2012-03-14 18:11:25 +08:00
James Chen b8d760064d issue #1056: Add CCVertex.h CCVertex.cpp, implement CCMotionStreak. 2012-03-14 16:10:01 +08:00
James Chen aefdb852a2 issue #1056: synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok. 2012-03-14 14:55:17 +08:00
minggo f0d22ae504 issue #879: replase assert with CCAssert 2011-11-28 17:28:43 +08:00
Leon 70a4942ea6 fix some warning 2011-10-19 15:24:19 +08:00
minggo c24d1d3fd6 Merge branch 'LinuxPort' of https://github.com/laschweinski/cocos2d-x into linux_port 2011-09-16 13:53:18 +08:00
RongHong 53227073a7 fixed #696 to modify some end() usilization 2011-09-06 11:43:09 +08:00
RongHong fea3da3156 fixed #696 Some android machines may crash at CCRenderTexture::end(bool bIsTOCasheTexture) 2011-09-06 11:33:48 +08:00
RongHong 624e27497a fixed #696 Some android machines may crash at CCRenderTexture::end(bool bIsTOCasheTexture) 2011-09-06 09:51:35 +08:00
laschweinski 871abb4a32 Merge branch 'master' into LinuxPort 2011-08-19 13:20:23 +08:00
laschweinski ad305648c0 modified: cocos2dx/misc_nodes/CCRenderTexture.cpp 
modified:   cocos2dx/platform/CCGL.h
	modified:   cocos2dx/platform/CCImage.cpp
	CocosDenshion/Linux/
	CocosDenshion/third_party/
	HelloWorld/Linux/
	cocos2dx/.settings/
	cocos2dx/platform/Linux/
	tests/test.linux/
 2011-08-19 13:07:50 +08:00
moadib a8d87a9976 Non-trivial arguments passed by reference now. 
Removed unnecessary cocos2d:: prefix inside namespace.
 2011-08-17 17:26:26 +04:00
laschweinski 5d20ebe24b modified: HelloWorld/AppDelegate.cpp 
modified:   HelloWorld/HelloWorldScene.cpp
	modified:   cocos2dx/cocoa/CCNS.cpp
	modified:   cocos2dx/include/CCActionInstant.h
	modified:   cocos2dx/misc_nodes/CCRenderTexture.cpp
	modified:   cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
	modified:   cocos2dx/platform/CCAccelerometer_platform.h
	modified:   cocos2dx/platform/CCApplication_platform.h
	modified:   cocos2dx/platform/CCArchOptimalParticleSystem.h
	modified:   cocos2dx/platform/CCCommon.cpp
	modified:   cocos2dx/platform/CCEGLView_platform.h
	modified:   cocos2dx/platform/CCGL.cpp
	modified:   cocos2dx/platform/CCGL.h
	modified:   cocos2dx/platform/CCImage.cpp
	modified:   cocos2dx/platform/CCPlatformConfig.h
	modified:   cocos2dx/platform/CCPlatformMacros.h
	modified:   cocos2dx/platform/CCSAXParser.h
	modified:   cocos2dx/platform/CCStdC.h
	modified:   cocos2dx/support/CCUserDefault.cpp
	modified:   cocos2dx/support/data_support/ccCArray.h
	modified:   tests/AppDelegate.cpp
	deleted:    tests/Res/music.mid
	modified:   tests/tests/controller.cpp
	modified:   tests/tests/tests.h
	HelloWorld/Linux/
	cocos2dx/.settings/
	cocos2dx/platform/Linux/
	tests/test.linux/
 2011-08-17 11:36:54 +08:00
minggo 2b5635898a fixed #665: add test of RenderTextureSave 2011-08-08 14:06:03 +08:00
RongHong 5f08bb24fe Merge branch 'master' into 608 2011-08-05 10:59:40 +08:00
natural-law 3a80e51d25 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-08-03 11:39:03 +08:00
natural-law 94f2d8a5e2 fixed #513, CCProgressTimer support sprite generated from CCSpriteFrame. 2011-08-03 11:38:38 +08:00
minggo b9374663cd Merge pull request #440 from flyingpacer/savecrash 
fixed #649 the user could save any domain of the render texture
 2011-08-02 03:16:20 -07:00