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

227 Commits

Author SHA1 Message Date
minggo 1e20f2b6db fixed #1185: reload image data and recreate buffer of object when backing to foreground 2012-04-24 15:02:18 +08:00
James Chen 5e0682ed77 Merge branch 'iss1177_platform' of https://github.com/dumganhar/cocos2d-x into iss1177_platform 2012-04-23 15:41:01 +08:00
James Chen 8fd3518160 issue #1177: fixed a bug about retina in CCDirector. 2012-04-23 15:38:02 +08:00
James Chen 24515f009e issue #1177: Updated ios project configuration. 2012-04-23 14:35:41 +08:00
James Chen 909a759ff6 issue #1177: Updated android project configuration. 2012-04-20 17:33:28 +08:00
James Chen d1d0fd619a issue #1177: Added CCEGLViewProtocol class as CCEGLView's super class. Updated win32, android project configuration. 2012-04-20 15:23:00 +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
James Chen 044729dab9 Updated CCControlExtension 2012-04-16 23:16:03 +08:00
minggo 34c805590f Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1156_director 2012-04-13 14:11:58 +08:00
minggo b43d5aa654 fixed #1156 syn CCDirector 2012-04-13 14:11:35 +08:00
James Chen 94e056d964 fixed #1160: Renamed 'CGFloat' to 'CCFloat'. 2012-04-13 14:09:02 +08:00
minggo a20f3fe638 remove unneeded codes 2012-04-13 11:57:25 +08:00
minggo 9bbac0d33d issue #1156: remove unneeded macros and functions 2012-04-13 11:45:41 +08:00
minggo 028cf7874e issue #1156: remove unneeded macros and functions 2012-04-13 11:22:17 +08:00
James Chen da76def60a Fixed a heap crash in CCDirector, and reverted CCDirector singleton to global variable rather than a pointer. 2012-04-11 12:03:37 +08:00
James Chen b4d74700e4 Merge branch 'iss1094_gles20_particlebat' of https://github.com/dumganhar/cocos2d-x into new_ipad 
Conflicts:
	tests/tests/ParticleTest/ParticleTest.cpp
 2012-04-09 10:28:21 +08:00
minggo 355e27dada merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86 2012-04-08 14:16:29 +08:00
James Chen 4baebb8cab issue #1094: renamed CCPoolManager::getInstance() to CCPoolManager::sharedPoolManager(), and added CCPoolManager::purgePoolManager() method. Using pointer rather than global variable to make a singleton. 
fixed a memory leak in CCParticleSystem.
 2012-04-08 12:50:15 +08:00
James Chen df58a09255 Update: 
1. init CCSprite::m_pobBatchNode at the beginning of CCSprite::initWithTexture.
2. Add CCAssert in ccArrayRemoveObjectAtIndex.
3. Use new method to allocate CCDirector.
 2012-04-05 18:53:53 +08:00
James Chen c73c84f79b issue #1056: Fixed a bug in CCDirector::setProjection. 
We should invoking kmGLMultMatrix(&orthoMatrix) after invoking kmMat4OrthographicProjection.
 2012-03-28 17:02:07 +08:00
James Chen f529bcd659 issue #1056: Move some singletons to CCDirector. It is easily managed by CCDirector. 2012-03-21 17:35:20 +08:00
James Chen b5fca2f5f3 issue #1056: Fixed a bug in CCTouchDispatcher which will cause crash when app exit. Fixed some memory leaks. 2012-03-20 21:04:29 +08:00
James Chen 6ce06bd906 issue #1056: Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost. 2012-03-20 15:04:53 +08:00
James Chen e021ae9821 #1056: issue #1056: synchronise cocos2d-iphone-2.0-rc0a, update some files. 2012-03-16 17:56:19 +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 aefdb852a2 issue #1056: synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok. 2012-03-14 14:55:17 +08:00
minggo b0b6b85a79 fixed #946: HD image for both retina and normal 2012-02-16 10:47:16 +08:00
James Chen f8ff388e8d rename Resource(in HelloLua and HelloWorld project) and Res(in tests project) to Resources. 
test ok on win32 and android
 2012-02-14 18:04:56 +08:00
James Chen c3d23a7923 issue #972: Modify project setting for all platforms. Use new icons for ios template. 2012-02-14 15:13:54 +08:00
James Chen 81ec2c8586 issue #972: add support for CCNotificationCenter, and add the test demo for it. 
modify the project setting for VS2008 and VS2010
 2012-02-10 11:48:33 +08:00
dumganhar 57eee38f4e Merge branch 'master' into moveSel2CCObject 2012-01-19 15:46:31 +08:00
gzito c87881ff94 Added Marmalade support to TextInputTest and HelloLua samples 2012-01-15 15:57:10 +01:00
dumganhar a773e4fb96 move SelectorProtocol to CCObject 2012-01-08 21:03:16 +08:00
dumganhar 625d299717 Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade 2011-12-13 10:01:29 +08:00
gzito d4ea6d4ef5 Rollback changes about CCDirector::sharedInstance as pointer 
Optimized a little bit CCImage::initWithString
Fixed CCApplication::run in order to handle closing Marmalade simulator
 2011-12-12 14:50:35 +01:00
dumganhar 4b9cbb85ff #issue 908: Merge marmalade to latest cocos2d-x source 
Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade

Conflicts:
	cocos2dx/platform/CCFileUtils.cpp
	cocos2dx/platform/CCPlatformConfig.h
	cocos2dx/support/zip_support/ioapi.cpp
 2011-12-12 17:46:21 +08:00
Giovanni Zito c17d7de0a1 For CC_PLATFORM_MARMALADE used pointers instead of static instances for singletons 2011-12-09 22:02:19 +01:00
Giovanni Zito 0c1b058629 Changed symbols from "airplay" to "marmalade", added files and folders for marmalade 2011-12-08 12:16:32 +01:00
Giovanni Zito b60eac2505 integrating libXml2 2011-12-07 23:49:52 +01:00
minggo cdc842051f issue #892: use RTTI to simplify codes, work ok on win32 2011-12-07 14:28:22 +08:00
minggo f0d22ae504 issue #879: replase assert with CCAssert 2011-11-28 17:28:43 +08:00
minggo c034f84b2d fixed #760: implement functions in .cpp 2011-11-25 10:17:32 +08:00
minggo 101f076a44 fixed #760: implement functions in .cpp 2011-11-25 10:13:59 +08:00
Phenix Yu 786feb6a8d Merge remote-tracking branch 'remotes/upstream/master' 
Conflicts:
	HelloLua/Classes/AppDelegate.cpp
	HelloLua/Resource/hello.lua
	HelloLua/ios/HelloLua.xcodeproj/project.pbxproj
	HelloLua/win32/HelloLua.win32.vcproj
	HelloLua/win32/HelloLua.win32.vcxproj.filters
	cocos2dx/include/ccMacros.h
	cocos2dx/platform/ios/AccelerometerDelegateWrapper.mm
	lua/cocos2dx_support/LuaCocos2d.cpp
	lua/cocos2dx_support/LuaEngineImpl.cpp
	template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode4/cocos2dx_lua.xctemplate/Resources/hello.lua
	template/xcode4/cocos2dx_lua.xctemplate/TemplateInfo.plist
	tests/test.win32/test.win32.vcxproj.filters
 2011-11-15 14:43:55 +08:00
Phenix Yu ed42bc388c fixed lua memory leak 2011-08-18 12:26:33 +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
minggo 09dc164fff issue #645: update to v1.0.1 2011-08-02 15:45:27 +08:00
RongHong 935051a363 set gl perspctive project 2011-07-12 16:04:13 +08:00
minggo 7adb140439 fixed #568 2011-07-05 14:51:17 +08:00
minggo 022e2b9998 issue #528: refactor ok on win32 2011-06-20 17:31:38 +08:00
minggo 8003de7468 update to latest code and merge 2011-06-14 11:01:38 +08:00
liswei 1591c7edc8 fixed #512 fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
minggo a8b6b850de use precompile macro to cantrol if enable lua support 2011-06-01 17:51:08 +08:00
minggo fe8fcb0b00 invode lua registerred tick 2011-05-31 14:49:47 +08:00
minggo 697368cf20 support lua 2011-05-31 14:04:14 +08:00
yangws ec23d7ed55 fixed #508 Dynamic switch retina display support. 2011-05-23 16:21:31 +08:00
Walzer c7fb183dcb [airplay] After exclude CurlTest & CCUserDefault, UserDefaultTest, HelloWorld & Tests can be compiled successfully now. 2011-05-12 21:58:11 +08:00
yangws 21c8628e68 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into input2 
Conflicts:
	cocos2dx/platform/wophone/CCApplication_wophone.h
	tests/tests/tests.h
 2011-05-10 16:09:26 +08:00
yangws fc01bada97 input from sencond twindow named input view. 
ps: TWindow doesn't support switch.
ps2: TWindow as memory window doesn't support rotate.
 2011-05-09 16:59:26 +08:00
minggo e14040730b fixed #455: release CCUserDefault at end & fix a bug when the user delete CCUserDefault carelessly 2011-05-06 17:46:19 +08:00
minggo 37bb33d9e5 fixed #452: refactor CCDirector CCNode CCGrid 2011-04-11 15:10:09 +08:00
natural-law e0570d43ad Fix bugs.Run HelloWorld and tests in cocos2d-win32 successful. 2011-01-06 14:04:03 +08:00
minggo dc55c164ba fixed #292 2010-12-29 18:01:37 +08:00
natural-law 4a64f899fe update label_nodes to 0.99.5. 2010-12-24 17:07:31 +08:00
natural-law 0f0a8ed956 rename the files related to label_nodes. 2010-12-24 14:00:49 +08:00
minggo 87b926c74f match the declaration of cocos2dVersion 2010-12-18 16:08:57 +08:00
natural-law 8cb331994d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 2010-12-13 17:55:02 +08:00
natural-law 2706e3a003 fixed #251 CCKeypadDelegate implement 2010-12-13 14:10:39 +08:00
minggo 534a55eaa1 issue #220: All tests run on android emulator, but the effect of some tests are wrong 2010-12-06 09:51:21 +08:00
Walzer 820c2f0714 issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
Walzer b4328354af issue #211 cocos2dx -> cocos2d-x 2010-11-18 14:07:17 +00:00
Walzer fb25984f12 rename getShared methods to shared 2010-11-16 07:12:09 +00:00
Ming 416a319344 fixed #203 2010-11-13 03:34:49 +00:00
Walzer 94806c9194 merge with tag/0.99.4-uphone-0.9.0 2010-11-11 03:18:58 +00:00
Ming 992ad7e75d fix the method of computing frame rate 2010-10-16 07:29:53 +00:00
yangws 2ba7ba409b fixed #184 support deviceOrientation on win32 now. 2010-10-15 08:06:05 +00:00
Ming 0298500abe add setContentScaleFactor() 2010-10-15 07:47:48 +00:00
yangws c1225b9396 fixed #183 run test ok. 2010-10-13 06:46:06 +00:00
yangws 040f68160a issue #176 add test code in test_win32, which same with test_uphone . 2010-10-12 09:15:44 +00:00
Walzer 2a43160d39 fix a warning 2010-10-12 04:07:49 +00:00
Ming 0247182dc3 fixed #173 2010-09-30 07:54:15 +00:00
Ming 12d6df9717 issue #154 2010-09-24 10:10:32 +00:00
Ming 300e1abbbb issue #142 2010-09-16 07:53:58 +00:00
natural-law 2c682380ed issue #143 
Clear memory leaks
 2010-09-11 07:48:37 +00:00
Ming 1c0d6b1d31 issue #138 2010-09-10 07:47:10 +00:00
natural-law 8eb885382e issue #130 
Add function to set the resource path
 2010-09-07 08:05:18 +00:00
yangws 4a52e5aaf9 impliment CCXEGLView for uPhone device. 2010-09-06 10:35:24 +00:00
Walzer 5fd1bf85b6 issue #121, return bool in function init**** 2010-09-04 04:02:52 +00:00
Ming d52678bca9 issue #61 2010-09-04 03:36:40 +00:00
Ming 863fc8584a issue #116 2010-09-02 08:58:04 +00:00
Ming 6a4af3bcfd issue #116 2010-09-02 02:33:39 +00:00
Ming ed023fc129 fixed #112 2010-09-01 07:36:25 +00:00
Ming 39c6ebf503 issue #85:remove the using of dynamic_cast() 2010-08-31 03:20:37 +00:00
natural-law 6e7fede2bb fixed #103 
add ActionManager Test code
 2010-08-30 07:04:46 +00:00
natural-law 4a42f2d334 issue #78 
add code to show FPS and particle count
 2010-08-25 05:45:28 +00:00
Ming 710e29b086 issue #80 2010-08-25 02:19:20 +00:00
Ming 4b34b3a015 fixed #79 2010-08-23 09:29:52 +00:00
Ming 2f638dbe14 issue #55 2010-08-18 06:57:36 +00:00
Ming 950c8cff82 fixed #54 2010-08-17 06:43:00 +00:00
Ming c8ea0e7eb6 fixed #54 2010-08-17 06:25:41 +00:00
natural-law 298768aeec issue #33 
fix little bugs of CCDirector and Actions
 2010-08-11 07:24:15 +00:00
Walzer ffce4ec6b3 issue #18, debug 2010-08-06 05:48:02 +00:00
yangws cde36d0de9 fixed #34 impliment setDeviceOrientation function. 2010-08-05 03:02:30 +00:00
Ming 52982764c8 issue #6: implement setDeviceOrientation() 2010-08-05 02:38:21 +00:00
Ming 5404fd879b issue #6: initialize m_pLastUpdate 2010-08-04 08:50:51 +00:00
Ming 76f62adf62 fixed #30: change some header files to include 2010-08-04 08:45:00 +00:00
Ming 8ab5072885 issue #6: use struct timeval * instead of struct timeval 2010-08-04 08:18:09 +00:00
Walzer 14427a24d7 2010-08-04 07:46:12 +00:00
Ming 2262a122d3 issue #6: use dynamic_cast<> 2010-08-04 03:13:03 +00:00
natural-law b11c03cff3 fixed #27 
fix some bugs of node and director
 2010-08-04 02:36:37 +00:00
Ming 3b2425d8bf issue #6: autorelease pool management 2010-08-02 09:48:01 +00:00
Ming ca3918933b issue #6: initialize default value to m_pobOpenGLView 2010-08-02 09:10:04 +00:00
Ming a2083303e9 issue #6: implement some function 2010-08-02 04:00:06 +00:00
Ming a324e38cb2 issue #21: change INT32 to int, change UINT to unsigned int 2010-08-02 02:58:00 +00:00
yangws de4cb4fcf7 issue #14 add CCXEGLView attach with EGLTouchDelegate 2010-07-28 10:18:27 +00:00
Ming 6115e7b6a1 issue #6: set dispatcher to view 2010-07-28 10:02:36 +00:00
Ming 9c984b8a34 issue #17: fixed link error 2010-07-28 07:16:00 +00:00
yangws fc139bf12a issue #14 change CCXApplication to CCXEGLView, CCDirector compile ok. 2010-07-28 02:15:02 +00:00
Ming b6dd87fb64 issue #6: fix some compile error 2010-07-27 07:49:39 +00:00
Ming 47774f0c77 issue #6: fixed some compile error 2010-07-26 05:53:08 +00:00
Ming da11b924ab issue #6: update CCDirector.cpp, CCDirector.h 2010-07-26 02:00:08 +00:00
Ming a3687c7e37 issue #6: update CCDirector.cpp 2010-07-22 07:56:02 +00:00
Ming 4963bc4223 issue #6: update CCDirector.h, CCDirector.cpp 2010-07-20 06:07:27 +00:00
Ming 56ba688df0 issue #6: update CCDirector.cpp 2010-07-16 06:22:43 +00:00
Ming a82195717d issue #6: update CCDirector.h, add CCDirector.cpp 2010-07-16 06:09:31 +00:00