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

27 Commits

Author SHA1 Message Date
Donald Alan Morrison 6816fb94fc A few more minor documentation changes. OK, enough for today! :-) 2012-09-15 15:12:28 -07:00
Donald Alan Morrison 216ebab0e1 Minor English Spelling Corrections, etc. 2012-09-15 14:19:14 -07:00
James Chen 7d8b261ced fixed #1477: Abstracts Lua and JS binding protocol, some bugs fixes in lua-binding, adding custom menu on win32 and mac for switching resolutions. 2012-09-11 14:02:33 +08:00
James Chen 9ba5a1bfef issue #1454: Removed COCOS2D_JAVASCRIPT macro. 2012-08-31 21:23:23 +08:00
Walzer 9eab0c19f8 add groups to all classes for doxygen 2012-06-20 18:09:11 +08:00
minggo 9ec29d715a issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx 2012-06-19 13:50:11 +08:00
Nicolas Gramlich 5550d9f2b0 Merge with gles20. 2012-06-13 15:56:52 -07: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
James Chen 08fc714a7f issue #1310: Reverted floatr to CCTimer. 2012-06-12 17:07:54 +08:00
Nicolas Gramlich 4378731418 Merge with gles20. 2012-06-11 10:43:07 -07: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 0f36a89c7e issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00
natural-law 2f438483e5 fixed #137 
add SchedulerTest code
 2010-09-09 08:15:21 +00:00
Walzer 35fe435800 issue #121, return bool in function init**** 2010-09-04 05:39:37 +00:00
Ming 0468bbf3f3 issue #122 2010-09-04 03:30:39 +00:00
Ming 8b1e5f71c0 issue #122 2010-09-04 03:20:10 +00:00
Ming f4fc30f651 fixed #32: changed because the implementation of CCActionManager 2010-08-05 06:38:42 +00:00
Ming 76f62adf62 fixed #30: change some header files to include 2010-08-04 08:45:00 +00:00
Walzer 14427a24d7 2010-08-04 07:46:12 +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
Ming 5eede62659 fixed #16: fixed compile errors 2010-07-27 05:47:29 +00:00
Ming 4160abc669 issue #6: fixed compile error because some file is deleted 2010-07-26 02:35:45 +00:00
Ming 9ab774cd8b issue #6: update CCScheduler.h and selector_protocol.h 2010-07-14 02:35:20 +00:00
Ming a1e1a5f484 issue #6: add CCScheduler.h 2010-07-13 01:36:15 +00:00