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

76 Commits

Author SHA1 Message Date
YuLei Liao 7a6253d9aa * merge cocos2d-1.0.1-x-0.9.2-luafix to master 2011-11-21 16:38:00 +08:00
YuLei Liao 09d12be875 * format cocos2d-x source files 2011-11-18 21:23:54 +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 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 d6fb209861 merged from minggo-upto-0.995 to upto-0.99.5 2010-12-24 15:21:57 +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
Walzer 4226dcede9 issue #61, add retain for member variable 2010-09-04 10:06:26 +00:00
Ming 857595d644 issue #116 2010-09-02 08:46:25 +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 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 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 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