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

1270 Commits

Author SHA1 Message Date
James Chen 2e13d45848 Merge pull request #5819 from Dhilan007/develop_menu 
fixed content size of MenuItem is incorrect when font size or font name ...
 2014-03-15 01:27:05 +08:00
Dhilan007 e20676f939 fixed content size of MenuItem is incorrect when font size or font name change. 2014-03-15 01:24:23 +08:00
James Chen a47923e06d Fix potential overflow in Texture::getCachedTextureInfo. 2014-03-15 01:09:22 +08:00
James Chen c033591e6a [win32] Overflow fix when using MultiByteToWideChar and WideCharToMultiByte. 2014-03-15 01:05:04 +08:00
James Chen 306df0537e Reverts changes in CCApplication.cpp/.mm, pollEvent must after main loop, otherwise, potential crash will happen. 2014-03-15 00:10:39 +08:00
James Chen 9bc48a7ac1 PollEvents before main loop and beautifies codes in CCApplication.cpp/.mm. 2014-03-14 18:40:04 +08:00
James Chen a5775e9e6a Merge pull request #5793 from koowolf/win32_crash 
Crash while clicking close button on desktop platforms
 2014-03-14 18:26:34 +08:00
James Chen edde48e132 Merge pull request #5798 from Dhilan007/develop_label 
closed #4377: LabelAtlas::setColor takes no effect.
 2014-03-14 18:07:36 +08:00
Dhilan007 c4d91f512d LabelAtlas:fixed display incorrect color. 
MenuItem:using Label to replace LabelTTF.
 2014-03-14 17:36:05 +08:00
koowolf ad5f870f7c fix close crash in linux and mac 2014-03-14 17:21:27 +08:00
koowolf 90f5d6511e fix win32 crash while click close button. 2014-03-14 16:13:32 +08:00
James Chen 8c7bc11931 Merge pull request #5790 from dumganhar/warning-fix-and-project-update 
Warning fix and update VS project to fix compilation errors when building in Release mode
 2014-03-14 15:48:55 +08:00
James Chen 177bf4df9d Some warning fixes. 2014-03-14 15:38:43 +08:00
James Chen a94b82e738 Updates VS project to fix compilation errors when building in Release mode. 2014-03-14 15:30:12 +08:00
Dhilan007 5f6fbc6a33 label:fixed getter for font size and font name. 2014-03-14 15:18:45 +08:00
Dhilan007 971b1dd557 Label:fixed text display incorrect when come to foreground on android. 2014-03-14 14:59:26 +08:00
Dhilan007 36bfd6d2c2 label:fixed incorrect effect of outline. 2014-03-14 09:51:39 +08:00
James Chen 8743b00d9f Merge pull request #5768 from Dhilan007/develop_label2 
Refactor setter of label's font name and font size.
 2014-03-13 21:14:36 +08:00
Dhilan007 fe6f485a6b label:rename some API for clearly. 2014-03-13 21:00:36 +08:00
Dhilan007 62d0fa8564 label:rename some API for clearly. 2014-03-13 20:52:33 +08:00
andyque c4e20dd63a fix ease action error 2014-03-13 19:53:06 +08:00
Dhilan007 bc68c6b629 Refactor setter of label's font name and font size. 2014-03-13 18:46:35 +08:00
heliclei c26b103b23 remove node name related features from v3.0 2014-03-13 10:45:02 +08:00
James Chen ac0aecb394 Merge pull request #5737 from dumganhar/runtime-fix 
Lua Runtime fix
 2014-03-12 21:48:35 +08:00
James Chen 77a8476c80 GLView::end needs to release self. 2014-03-12 21:45:57 +08:00
James Chen ac4faeb8c4 Merge pull request #5730 from Dhilan007/develop_label 
Label:Fixes the font rendering on Windows and  possible crash when create the label by font name.
 2014-03-12 21:25:38 +08:00
Dhilan007 3acaf3ece5 1.Label:Fixes the font rendering on Windows. 
2.fixed Label::setColor crash when create the label by font name.
 2014-03-12 20:39:13 +08:00
James Chen f609d57a00 Merge pull request #5671 from heliclei/walk-node-tree 
Add enumerateChildrenByName for walking through node tree with callback
 2014-03-12 18:23:43 +08:00
heliclei 2a3cb0847e refactor api name 2014-03-12 18:10:45 +08:00
James Chen f01ca554aa Merge pull request #5708 from Dhilan007/develop_label 
fixed incorrect initial value of label's TextVAlignment.
 2014-03-12 16:46:22 +08:00
Dhilan007 c11ef679da fixed incorrect initial value of label's TextVAlignment. 2014-03-12 16:11:12 +08:00
James Chen 2ae283d506 Merge pull request #5702 from dumganhar/glview-inherit-order 
Changes the order of inheritance for GLView. Reason:
 2014-03-12 15:34:53 +08:00
James Chen a974e5e42b Merge pull request #5704 from Dhilan007/develop_label 
label: Change default font size from `32` to `12`, it's compatible with old LabelTTF.
 2014-03-12 15:33:30 +08:00
Dhilan007 f5daf1af24 label:change default font size 2014-03-12 15:30:14 +08:00
James Chen ca27bc4d6f Merge pull request #5703 from Dhilan007/develop_label 
label:fixed crash and incorrect getter.
 2014-03-12 15:23:06 +08:00
Dhilan007 2786b40dc3 using string::empty() for judge whether string is empty. 2014-03-12 15:03:22 +08:00
Dhilan007 233b04269b label: 
1.fixed crash if create label by font name and text is empty.
2.fixed getter of font name and font size is incorrect.
 2014-03-12 14:49:19 +08:00
James Chen 42c724a59d Changes the order of inheritance for GLView. Reason: 
```
 	bool ok = true;
 	JSObject *obj = JS_THIS_OBJECT(cx, vp);
 	js_proxy_t *proxy = jsb_get_js_proxy(obj);
	cocos2d::GLViewProtocol* cobj = (cocos2d::GLViewProtocol *)(proxy ? proxy->ptr : NULL);   // This line will cause the 'cobj' to be an invalid object, since the instance is a 'GLView', but we force cast it to 'GLViewProtocol*'.
 	JSB_PRECONDITION2( cobj, cx, false, "js_cocos2dx_GLViewProtocol_setDesignResolutionSize : Invalid Native Object");
 	if (argc == 3) {
 		double arg0;

```
After changing the order, the result could be fixed. But I don't know whether it's the best way to fix it. Anyway, it wouldn't break anything right now.
 2014-03-12 14:43:51 +08:00
heliclei d57d2f3059 Merge remote-tracking branch 'upstream/develop' into walk-node-tree 2014-03-12 14:19:55 +08:00
heliclei a907580d0a use lambda callback 2014-03-12 14:15:45 +08:00
James Chen 4b4b706066 Merge pull request #5635 from andyque/fix_ease_action 
fix wrong display of ease elastic action test.
 2014-03-12 12:07:26 +08:00
James Chen 0bf58c8096 Merge pull request #5690 from Dhilan007/develop_labelttf 
issue #3821: LabelTTF was re-implemented as a wrapper of Label.
 2014-03-12 11:18:40 +08:00
Dhilan007 6f165bb592 fixed incorrect initial value of label type. 2014-03-12 11:06:51 +08:00
Dhilan007 aefafdbe77 Add conditions to evaluate for setter of font size and font name. 2014-03-12 10:53:51 +08:00
Dhilan007 bc7e39283f issue #3821:LabelTTF re-implemented as a wrapper of Label. 2014-03-12 10:19:33 +08:00
Dhilan007 d96cc9ecb9 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-12 10:08:57 +08:00
minggo b2e27947a3 Merge pull request #5654 from dabingnn/develop_RenderTextureImprovement 
Develop render texture improvement
 2014-03-11 18:50:51 +08:00
Dhilan007 df12ca963e issue #4337:label support create by font name,compatible with old labelTTF 
1.fixed color and opacity has not yet gone into effect.
2.fixed display is not consistent with old LabelTTF when content scale factor of Director not equal to 1.
 2014-03-11 18:06:14 +08:00
Dhilan007 b72d009eac Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-11 16:16:07 +08:00
heliclei 80417f0f35 correct naming convetion 2014-03-11 15:27:28 +08:00