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

25 Commits

Author SHA1 Message Date
samuele3 9f5095b9c3 Reslove the compiled error 2013-11-07 16:43:04 +08:00
samuele3 e6fd1fece1 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCheck 2013-11-07 15:28:48 +08:00
CaiWenzhi fa0011346e fixed linux build error 2013-11-07 09:58:24 +08:00
Ricardo Quesada ddb0111392 continue replacing `const char*` with `const std::string&` 
This patch includes:

* Continue replacing `const char*` with `const std::string&`  where it makes sense.
* It also removes some Hungarian notation from the code.
* It fixes some indentation issues in part of the code
* It replaces `int` or `unsigned int` with `long` where it makes sense.
 2013-11-06 17:05:13 -08:00
CaiWenzhi 94896b5b74 Modify mk files 2013-11-06 17:20:14 +08:00
CaiWenzhi 7a207431cd Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 
Conflicts:
	cocos/gui/UIHelper.h
 2013-11-06 16:13:10 +08:00
CaiWenzhi e0aa82da13 Merge master branch to develop branch 2013-11-06 16:04:06 +08:00
samuele3 b76865c692 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-05 15:11:05 +08:00
samuele3 b445f0824a issue #2868:Bind UI and Scene parser to lua by bindings-generator and add releated test samples 2013-11-05 15:09:51 +08:00
James Chen 9be8ca3714 [cmake] output lib to root/lib 2013-11-04 21:03:08 +08:00
James Chen 922924e1ab TestCpp is ok. 2013-11-04 21:03:07 +08:00
Dhilan007 a68d92ff5a perfect vs-project configuration 2013-10-31 10:51:38 +08:00
James Chen 48ce5e39fe EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
James Chen cf20329b71 issue #3069: Removing unused codes in UILayer. 2013-10-25 16:33:54 +08:00
James Chen cfaef2a01a Adding onEnterHook, onXXXHook for Node. 2013-10-25 10:53:45 +08:00
minggo d07d054a01 issue #2905:ndk-r8e build ok now 2013-10-23 17:44:20 +08:00
minggo abcf8f268d fix conflicts 2013-10-22 18:36:13 +08:00
minggo 6a664d480a issue #2905:samples build ok on linux 2013-10-22 18:01:56 +08:00
Dhilan007 232f0d598b issues #2905:add new vs project 2013-10-21 22:21:11 +08:00
minggo 63c13d8eaa issue #2905:simplify Android.mk dependence 2013-10-18 14:18:36 +08:00
minggo 8f9756f030 issue #2905:TestJavascript build ok on Android 2013-10-17 11:28:57 +08:00
minggo 8f7a489a4d issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
James Chen 7dc8aeb156 issue #2905: Updating include path for 'cocostudio' module, adding 'cocostudio' prefix. 2013-10-16 11:19:01 +08:00
minggo 6fc2be62f5 issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00