Commit Graph

331 Commits

Author SHA1 Message Date
James Chen 782d3cd3be issue #4729: Linux fixes 2014-04-09 19:51:05 -07:00
James Chen 890dd64d38 issue #4729: some warning fixes and compilation error fixes on win32. 2014-04-10 01:29:13 +08:00
James Chen 5615717617 issue #4729: NULL -> nullptr in constructor or setXXX(NULL) 2014-04-10 00:36:43 +08:00
James Chen 9d8d256bee issue #4729: Android build works ok. 2014-04-10 00:36:42 +08:00
Nick Barrios 64fc13cae2 CCGLView.h: Remove createWithFullscreen declaration. 2014-04-09 12:15:24 -04:00
James Chen 61134426a8 Some fixes detected by xcode analyze 2014-04-09 20:41:09 +08:00
Sergey fdb863ae00 merge error fix 2014-04-09 13:59:22 +04:00
Anton Sokolchenko 87015ae888 2026:72: Result of 'malloc' is incompatible with type 'unsigned char *'
2026:72: Result of 'malloc' is converted to a pointer of type 'unsigned char', which is incompatible with sizeof operand type 'unsigned char *'
2014-04-09 11:37:56 +03:00
Sergey a6dc241986 On activity result listener added
it is strongly need fro most extensions like Game Center and In app billing
2014-04-09 11:27:53 +04:00
Dhilan007 d310d8d099 closed #4659:Remove the usage of OpenSL 2014-04-09 14:57:07 +08:00
Nick Barrios 9c2a148256 CCGLView: Remove createWithFullScreen(const std::string& viewName, Size size) overload. Use more specific createWithFullScreen(const std::string& viewName, const GLFWvidmode &videoMode, GLFWmonitor *monitor) instead. 2014-04-08 14:02:36 -04:00
Nick Barrios 6b8d5dd090 CCGLView: Add support for specifying video mode and monitor for fullscreen window creation. 2014-04-08 13:33:24 -04:00
Dhilan007 c378b42191 closed #4714:Fixed Cocos2dxHelper.runOnGLThread() can not work 2014-04-08 21:08:20 +08:00
minggo 0c2b654410 Merge pull request #6171 from minggo/iss4683-assert_not_thread_safe
use assert because CCASSERT is not thread safe
2014-04-08 17:16:28 +08:00
James Chen e04b820cfc closed #4711: [win32] Passing empty string to FileUtils::isFileExist may also return true 2014-04-08 15:24:47 +08:00
minggo e28093ee1a closed #4683: use assert because CCASSERT is not thread safe 2014-04-08 14:53:57 +08:00
Nick Barrios eae1ccb279 CCGLView: Remove frameZoomFactor param from createWithFullScreen overload. 2014-04-04 06:26:00 -04:00
Nick Barrios 58224d9b23 CCGLView: Add createWithFullscreen overloaded method that allows passing in Size, to set video mode. 2014-04-04 06:02:29 -04:00
minggo 439b30434e Merge pull request #6097 from newnon/android_crash_fix
Android crash fix on new devices
2014-04-04 18:01:59 +08:00
James Chen 1178d67dd6 issue #4639: Reverts the definition of FileUtils::isFileExist, remove
the second parameter(outFullPath).
2014-04-02 16:33:05 +08:00
James Chen 5fa839b16b closed #4639: FileUtils::isFileExist doesn't consider SearchPaths and ResolutionOrders 2014-04-02 15:35:09 +08:00
Sergey b153131097 Android crash fix on new devices 2014-04-01 15:14:25 +04:00
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
James Chen 95143da782 Merge pull request #4990 from daltomi/debug
closed #4102: Uses 'cbegin/cend', 'const std::string' where it's reasonable.
2014-02-20 20:29:56 +08:00
boyu0 6f7dde3a99 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7 2014-02-20 16:51:21 +08:00
James Chen 62e0deaf35 Merge pull request #5384 from wefiends/s3tc_nomipmaps
closed #4096: s3tc compressed textures with no mipmaps fail to be loaded.
2014-02-20 15:58:13 +08:00
James Chen 0af0ce9032 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss4058-ref-step1
Conflicts:
	cocos/scripting/auto-generated
2014-02-20 15:13:40 +08:00
zhangbin 9b2c5f71af closed #3540, Solve the bug: Sometimes RenderTexture not drawn after a background/foreground. 2014-02-20 14:43:07 +08:00
Nick Barrios d9cbc5625c CCImage.cpp: If dds header reports 0 mipmaps, force _numberOfMipmaps to 1 to enable software decoding. Set _renderFormat just once for both hardware and software decoding (moved out of "load mipmaps" loop). 2014-02-20 00:48:09 -05:00
Nick Barrios 45d751caa7 CCImage.cpp: initWithS3TCData() - When there is s3tc hardware support, set PixelFormat before loading mipmaps, to allow for textures with no mipmaps. 2014-02-19 22:13:12 -05:00
James Chen 5e6130c92c issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
boyu0 810196d25b closed #2920: add a variable to save shared director. 2014-02-19 14:23:41 +08:00
boyu0 49cb2ce9d5 closed #2920: fix compile error after merge. 2014-02-19 14:12:57 +08:00
boyu0 0b07d376f6 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7 2014-02-19 13:42:02 +08:00
James Chen 19205e3db8 Merge pull request #5365 from natural-law/issue3964
closed #3964: Solve the bug of Image::saveImageToPNG().
2014-02-18 11:49:09 +08:00
James Chen b4121f47fc [Android] Don't free BitmapDC::_data in BitmapDC's destructor. Remove unused BitmapDC::env. 2014-02-18 11:07:58 +08:00
James Chen 905443d17c new[] free mismatching after PR #5326. 2014-02-18 10:11:04 +08:00
James Chen f67f324378 Merge commit 'refs/pull/5289/head' of git://github.com/cocos2d/cocos2d-x into merge5289
Conflicts:
	cocos/2d/platform/win32/CCImage.cpp
2014-02-17 22:10:45 +08:00
Dhilan007 4f94064242 closed #4048:fixed LabelTTFMultiline test case show nothing on mac. 2014-02-17 14:35:49 +08:00
zhangbin e02f488224 Merge branch 'develop' into issue3964 2014-02-16 11:01:07 +08:00
James Chen 1693ea0ef6 Typo fix in CCDevice.mm. 2014-02-14 09:41:06 +08:00
Dhilan007 0d5c702708 move labelttf's platform-dependent code from CCImage to CCDevice 2014-02-13 21:08:43 +08:00
zhangbin 8ae5d2a049 closed #3964, Solve the bug of logic code in method Image::saveImageToPNG(). 2014-02-13 16:22:41 +08:00
chuanweizhang2013 e9dd3d828a issue #3498: commit jsruntime 2014-02-10 18:15:30 +08:00
Ricardo Quesada 560abe77c8 better Console support
* Arguments are passed as std::string
* Adds `resolution` and `projection` command
* `texture` and `fileutils` supports the `flush` argument
2014-02-08 12:46:44 -08:00
boyu0 20ee1d2666 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2920_voice_recognition_input_crash_on_ios7 2014-02-07 11:37:01 +08:00
Maks 72ede55ac7 fix string size check and assert condition
1. std::string::size() return size_t (is never < 0)
2. "event must be larger than 0" and 'event' has unsigned int type
2014-02-03 22:12:03 +02:00
James Chen 3026e6d5ca Removes unused variable (GLViewProtocol::_delegate) and relevant method (GLViewProtocol::setTouchDelegate). 2014-02-02 20:46:15 +08:00
Siim Kallas 881757a792 Fixed crashing when calling CCDirector's end(). 2014-02-01 22:10:00 +02:00
Ricardo Quesada 924951d3b5 glview uses rect instead of size
this is because it could be needed if you want to create a view
inside a window in an specific position
2014-01-30 20:16:40 -08:00
Ricardo Quesada c9dc113fa2 Fixes compilation issues on Android and Linux 2014-01-30 17:28:12 -08:00