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

259 Commits

Author SHA1 Message Date
James Chen 70dd83512c Renames s_isIOS7 to s_isIOS7OrHigher 2014-04-01 15:08:08 +08:00
James Chen 47320e7c7c closed #4383: Fixed missing letters if using old LabelTTF and running on 
iphone 64bit simulator(device).
 2014-04-01 14:47:52 +08:00
Dale Stammen afe561cccc added wp8 and winrt support files and projects 2014-03-28 12:52:16 -07:00
James Chen 22fdbbb198 Merge pull request #5980 from Dhilan007/develop_label2 
Refactor implementation of label's shadow and fixed stroke was not 'outside stroke' for Label generated by 'Font name'
 2014-03-26 16:32:04 +08:00
James Chen 1003847cd1 Mac build fix after merging https://github.com/cocos2d/cocos2d-x/pull/5989 2014-03-26 15:44:38 +08:00
James Chen 21ba509a35 Merge pull request #5989 from dumganhar/iss4559-ios-64bit 
closed #4559: Wrong behavior of multi-touch on iphone5s/ipadAir (arm64 arch)
 2014-03-26 15:27:57 +08:00
James Chen 691442d80d closed #4559: Wrong behavior of multi-touch on iphone5s/ipadAir (arm64 arch) 2014-03-26 15:04:11 +08:00
Dhilan007 fa91bf1167 remove unused code and fixed warning. 2014-03-26 14:11:40 +08:00
minggo a374241f65 Merge pull request #5924 from MSOpenTech/wp8-3.0-cocos2d-changes 
Windows Phone 8,0 cocos2d-x 3.0  changes
 2014-03-26 13:58:46 +08:00
James Chen 7a8db8271f Merge pull request #5930 from andyque/Branch_issue4429 
closed #4429: Boolean value could not be written to specified plist file
 2014-03-26 11:46:56 +08:00
Dhilan007 674dffce21 Merge branch 'develop-label-stroke' of https://github.com/dumganhar/cocos2d-x into develop_label_fixs 2014-03-25 16:10:47 +08:00
minggo 3fc15e5e7d Merge pull request #5896 from splhack/remove_nativeactivity 
Remove NativeActivity
 2014-03-25 15:37:12 +08:00
boyu0 db0fe60974 closed #3804: Change Image private function and variable to protected, for the subclasses can use them. 2014-03-25 11:13:44 +08:00
Kazuki Sakamoto 3fba61f384 Remove NativeActivity 2014-03-24 19:57:29 -07:00
James Chen 6defa062a8 closed #4530: Using 'Outside stroke' instead of 'Inside Stroke' for Label generated by 'Font name'. And fix stroke could not work on iOS7. 2014-03-24 16:58:31 +08:00
Dale Stammen 409ad77b6c disabled webp for wp8 and winrt 2014-03-22 05:51:39 -07:00
Dale Stammen e3e4e88bce added WP8 and WINRT platforms 2014-03-22 05:50:55 -07:00
James Chen da0c15c982 Merge pull request #5847 from newnon/develop_small_improvements 
Adds getCurrentLanguageCode() which returns iso 639-1 language code
 2014-03-21 16:33:43 +08:00
andyque 2dcc600fa1 remove unused accelerometer 2014-03-20 14:29:05 +08:00
andyque 6c16f16b1d fix CCDirectorCaller warnings 2014-03-20 11:32:43 +08:00
andyque 7ae77c9335 fix cocos2dx engine internal warnings 2014-03-20 10:58:04 +08:00
Sergey 13df593ae7 file attributes fixed 2014-03-19 18:58:19 +04:00
James Chen db4dd81030 Merge pull request #5871 from dumganhar/iss4450-missing-slash 
closed #4450: FileUtils::addSearchResolutionsOrder doesn't check whether there is a 'slash' at the end of path.
 2014-03-19 17:57:40 +08:00
James Chen a84873a67b closed #4450: FileUtils::addSearchResolutionsOrder doesn't check whether there is a 'slash' at the end of path. 2014-03-19 17:56:29 +08:00
James Chen 740aa30713 closed #4447: [Desktop] Can't receive touchEnded event when mouse up outside of window 2014-03-19 17:09:10 +08:00
andyque c90ef00668 add bool support for other platform 2014-03-19 16:47:57 +08:00
andyque cadbfbe9b1 add Bool Integer Float Double support to CCDictionary 2014-03-19 16:47:57 +08:00
andyque 00249328a6 add boolean support for mac and ios 2014-03-19 16:47:57 +08:00
samuele3hu 76abe8d1c9 make FileUtilsWin32::getWritablePath() return value unified whether release or debug 2014-03-18 10:51:07 +08:00
Sergey f65ef462e5 getCurrentLanguageCode() for all platforms return iso 639-1 language code 
iPhone template improvements(for game center support)
 2014-03-17 22:34:21 +04: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
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 177bf4df9d Some warning fixes. 2014-03-14 15:38:43 +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 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
James Chen 1cfd14f27d Tab -> 4 spaces, remove unused spaces for CCGLView.h 2014-03-07 14:03:57 +08:00
James Chen ae2f7a4a7d updateDesignResolution -> updateDesignResolutionSize. 2014-03-07 14:01:30 +08:00
James Chen d699f62193 Tab -> 4 spaces, remove unused spaces. 2014-03-07 13:59:56 +08:00
James Chen 8b359dd90e Refactoring GLView for desktop platforms, and adding protected method `updateDesignResolutionSize` for GLViewProtocol class. 2014-03-07 13:51:12 +08:00
Ricardo Quesada c63f210e26 Compiles on Android 2014-03-04 16:59:39 -08:00
James Chen 1b91234325 Merge pull request #5283 from seemk/director_cleanup_fix 
closed #4099: Fixed crashing when calling CCDirector's end() on win32.
 2014-02-24 16:58:34 +08:00
James Chen 3885772e5f Merge pull request #5263 from boyu0/iss2920_voice_recognition_input_crash_on_ios7 
closed #2920: fix bug: voice recognition input crash on ios7
 2014-02-21 13:46:31 +08:00
James Chen c5bf3950bc closed #4107: Director::setAnimationInterval could not work on Mac platform. Also removed unused files (CCDirectorCaller.h/.mm). 2014-02-21 11:55:37 +08:00