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

252 Commits

Author SHA1 Message Date
James Chen 7c0af610ff issue #1056: Added CCArray::copyWithZone implementation. CCDictElement bound check. 2012-03-20 23:30:18 +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 645d561276 fixed #737: remove view id 2012-03-08 12:40:27 +08:00
minggo ed68855e19 fixed #1009: fix a typo error 2012-03-06 09:35:36 +08:00
YuLei Liao 6ebdf9cb4b * add CCScriptSupport 2012-02-09 14:07:11 +08:00
YuLei Liao 7a96d13fb6 rename all FuncID to Handler 2012-02-07 11:43:29 +08:00
YuLei Liao 9164e90515 * fix some issues 2012-02-02 15:58:10 +08:00
YuLei Liao 003fa1f1a0 * add some methods for fast read/write position 
* add CCNode::getChildrenCount() for Lua
 2012-02-02 10:39:19 +08:00
dumganhar d61f87ba92 modify construct and destruct function of some class, for example CCNode() --> CCNode.cpp(void) 2012-01-09 23:21:31 +08:00
minggo 3bf11dba7e issue #892: modify pkg for lua 2011-12-07 15:24:03 +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
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
Eli Yukelzon 9c5fa51e6b usuful macros for defining scene() and node() methods with params 2011-07-30 11:55:38 +03:00
minggo d48c3fdfb1 upgrade to 1.0.0-final 07-11 2011-07-12 11:20:41 +08:00
minggo 3dc1967f6c fixed #579: change zorder to int 2011-07-06 20:48:56 +08:00
natural-law 0378a6a36d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 
Conflicts:
	cocos2dx/include/CCNode.h
 2011-07-01 16:24:23 +08:00
natural-law 7d7f3a9241 fixed #562, Upgrade folder sprite_nodes to rc3. 2011-07-01 16:11:31 +08:00
minggo 16f79cb0be fixed #554: upgrade base_nodes to 1.0.0-rc3 2011-07-01 15:48:05 +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 697368cf20 support lua 2011-05-31 14:04:14 +08:00
yangws de977bc6c2 use 0 replace NULL 2011-05-30 16:49:08 +08:00
yangws 7e2d1d5c48 fixed #490 Text input on android use a different way, TextInputTest OK now. 2011-05-30 16:36:12 +08:00
Walzer c790fba340 avoid a bug in clang, see this post http://www.cocos2d-x.org/boards/7/topics/1638 Thanks to Cem Aslan's contribution! 2011-05-27 16:26:59 +08:00
natural-law 15ef0b9105 issue #428, fix the bug created by issue 428. Have some loop in wrong arrays. 2011-04-28 10:16:58 +08:00
natural-law 5d2ac1fc0c fixed #428, Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren. 2011-04-21 14:46:15 +08:00
minggo 37bb33d9e5 fixed #452: refactor CCDirector CCNode CCGrid 2011-04-11 15:10:09 +08:00
minggo 7d52161804 fixed #441: Initialize pointer in contruction & detect pointer value in destruction 2011-04-01 16:06:53 +08:00
yangws be966dbddb fixed #430 Solved bug by replacing glColor4ub with glColor4f. 2011-03-25 13:50:57 +08:00
walzer abd2725ed4 issue #148, add copyright 2011-03-19 10:34:26 +08:00
minggo b5a99f90df issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
natural-law 3dfd530b38 Merge branch 'iss295' into upto-0.99.5 2010-12-31 09:48:48 +08:00
minggo d6fb209861 merged from minggo-upto-0.995 to upto-0.99.5 2010-12-24 15:21:57 +08:00
minggo 994a3b05ea fixed #273 2010-12-23 11:19:56 +08:00
minggo 9aa7e1bc84 fixed #245 2010-12-18 16:12:59 +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
Walzer 94806c9194 merge with tag/0.99.4-uphone-0.9.0 2010-11-11 03:18:58 +00:00
Walzer a279e5dc9b issue 169, we should retain the new variable first, and then release the old one. assignment at last. 2010-09-27 10:19:10 +00:00
Ming 12d6df9717 issue #154 2010-09-24 10:10:32 +00:00
Ming 7131389535 issue #61: 2010-09-06 05:52:57 +00:00
Walzer 4226dcede9 issue #61, add retain for member variable 2010-09-04 10:06:26 +00:00
Walzer 5fd1bf85b6 issue #121, return bool in function init**** 2010-09-04 04:02:52 +00:00
Ming 857595d644 issue #116 2010-09-02 08:46:25 +00:00
Ming 39c6ebf503 issue #85:remove the using of dynamic_cast() 2010-08-31 03:20:37 +00:00
Ming b9587a7062 2010-08-30 07:45:39 +00:00
natural-law 6e7fede2bb fixed #103 
add ActionManager Test code
 2010-08-30 07:04:46 +00:00
Ming 710e29b086 issue #80 2010-08-25 02:19:20 +00:00
Ming 1cb377bca8 fixed #79 2010-08-24 01:56:09 +00:00
Ming 17e866f5ac issue #61 2010-08-20 01:31:35 +00:00
Walzer ccca95746e issue #18, debug 2010-08-19 07:29:38 +00:00
Walzer 1dc617174a issue #18, debug 2010-08-19 06:25:52 +00:00
Walzer 29d9a489b8 issue #18, debug 2010-08-19 06:11:35 +00:00
Ming c8ea0e7eb6 fixed #54 2010-08-17 06:25:41 +00:00
Ming 0ef3574562 move include/CCGrid.h to effects/CCGrid.h 2010-08-16 08:53:14 +00:00
Ming f45e14bc85 fixed #47: 2010-08-16 08:46:45 +00:00
natural-law a32ed04e07 issue #33 
fix a bug and submit the prototype test framework
 2010-08-06 09:50:20 +00:00
Walzer e08807083c issue #18, debug, change description 2010-08-06 08:05:19 +00:00
Walzer 324a9fac83 issue #18, debug 2010-08-06 06:32:32 +00:00
Walzer 2bf3a73c2d fixed #3, complete CCNode CCAtlasNode 2010-08-06 01:46:56 +00:00
Walzer 512f5d2121 issue #18, debug 2010-08-04 10:03:15 +00:00
Walzer 14427a24d7 2010-08-04 07:46:12 +00:00
natural-law b11c03cff3 fixed #27 
fix some bugs of node and director
 2010-08-04 02:36:37 +00:00
Walzer 9db3106303 issue #18, debug 2010-08-03 08:49:25 +00:00
Walzer db49ed49b9 issue #18, debug 2010-08-03 03:28:34 +00:00
Walzer 6a40e3e1d2 issue #18, debug 2010-08-02 08:00:01 +00:00
Walzer a161e4ed3e issue #18, debug 2010-08-02 07:44:41 +00:00
Walzer 33394ce4f7 issue #18, debug 2010-08-02 07:42:07 +00:00
Walzer f38734b879 issue #18, debug 2010-08-02 06:46:06 +00:00
Walzer 88ce1c8f83 issue #7, implement 2010-07-30 08:35:07 +00:00
yangws f12d51f7ae fixed #14 impliment CCTouch and treate touch msg in CCXEGLView EventHandler. 2010-07-29 04:12:11 +00:00
Walzer eefb4ce9e9 issue #7, remove gridbase methods 2010-07-28 06:10:12 +00:00
Walzer b34c778e79 issue #7, remove unusable include in .h 2010-07-22 10:39:40 +00:00
Walzer 9934149257 issue #7, change string to const char* 2010-07-22 03:15:25 +00:00
Walzer 59c7a734ba issue #7 , implement .cpp 2010-07-21 09:40:10 +00:00
Walzer adbf70a033 issue #7 , implement .cpp 2010-07-21 03:13:32 +00:00
Walzer 2e5357dc30 issue #7, change the include directory 2010-07-20 06:29:18 +00:00
Walzer 5d60c2ca0a issue #7, change the use of NSMutableArray 2010-07-20 05:49:13 +00:00
Walzer e0b4307d30 fixed #3, CCAtlasNode complete, CCNode is short of Action 2010-07-19 08:45:53 +00:00
Walzer cc9c52d0c7 issue #5, do some implementation 2010-07-16 09:53:59 +00:00
Walzer 63b87af767 issue #7 : add CCTexture2D.h and implement CCTexture2D.cpp partly 2010-07-15 10:15:00 +00:00
Walzer 8eff6998dd issue #5 : add description to CCNode 2010-07-15 03:39:05 +00:00
Walzer df8150582c issue #5 : implement a part of the methods in .cpp 2010-07-14 08:30:25 +00:00
Walzer 2394258ed1 issue #5 : implement selector methods in CCNode.cpp 2010-07-14 03:52:27 +00:00
Walzer ee1a33867c issue #5 : add include 2010-07-14 03:18:05 +00:00
Walzer c39a43c0cc issue #5, implementation in CCNode.cpp 2010-07-14 02:36:26 +00:00
Walzer 1c2b95973d issue #5, add declares in .cpp files, but still no implementation. change some methods to virtual. 2010-07-12 09:56:06 +00:00
Walzer 8672eea9da issue #5, modify some bugs in all my .h files 2010-07-09 10:24:08 +00:00
Walzer c5e4169ec8 issue #3, remove "init" from CCNode 2010-07-09 08:22:02 +00:00
Walzer 8951d0133b issue #5, add CCScene 2010-07-08 08:23:06 +00:00
Walzer 297b508122 issue #3, simple modify 2010-07-08 06:00:51 +00:00
Walzer ffe2e31fec issue #3, 2010-07-08 02:26:58 +00:00
Walzer da9a1abf4d 2010-07-07 07:24:44 +00:00