Commit Graph

35834 Commits

Author SHA1 Message Date
James Chen ae439ff8dc Adds test case for showing border of TTF label, it will be easier to find out wrong offset of Label. 2016-10-14 17:14:15 +08:00
Sergey fd902e52cf adjustForDistanceMap need to be negative to 2016-10-14 11:45:29 +03:00
Sergey f05053329b fix font rendering position 2016-10-12 16:21:09 +03:00
Bin Zhang 93609ff586 Update submodule cocos2d-console. (#16683)
Solve the error prebuilt Android.mk generated by cocos gen-libs.
2016-10-12 16:53:11 +08:00
QingliWang 7c1f88423b Fix bug when app paused the music is still resumed to play after interruption completed. (#16679)
* Support audio interruption and resume callback when change earphone status.

* Refactor keyevent callback and add makecurrent for compatible with different binary.

* Enable Tizen indicator.

* Remove the unnecessary evasobject in the window and refactor the function for glview mode.

* Fix the compatible issue between Tizen 2.3 and 2.4.

* Fix the wrong directory of script resources for HellLua template project.

* Create performance-test project for Tizen platform.
2016-10-12 15:48:27 +08:00
子龙山人 431725a2bb Merge pull request #16675 from CocosRobot/update_lua_bindings_1476209018
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-10-11 20:46:31 -07:00
CocosRobot 23ff5fc51f [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16676) 2016-10-11 11:40:11 -07:00
CocosRobot#Set 47a980c0c8 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2016-10-11 18:03:42 +00:00
Wilson E. Alvarez cdee1e11de Performance tweak: use range-based for-loops instead of iterator-based for-loops. (#16642)
* Use ++ prefix instead for non-primitive data types in CCAutoPolygon.cpp

* Use ++ prefix instead for non-primitive data types in SimpleAudioEngine.cpp

* Use ++ prefix instead for non-primitive data types in CCNodeLoaderLibrary.cpp

* Use ++ prefix instead for non-primitive data types in CCActionManagerEx.cpp

* Use ++ prefix instead for non-primitive data types in CCDataReaderHelper.cpp

* Use ++ prefix instead for non-primitive data types in HttpClient-android.cpp

* Use ++ prefix instead for non-primitive data types in CCDevice-linux.cpp

* Use ++ prefix instead for non-primitive data types in ScriptingCore.cpp

* Switched implementation to range-based for loops

* Added readability, fixed loop in CCDataReaderHelper.cpp

Thanks to Dimon4eg for the code review.
2016-10-11 10:59:44 -07:00
Ricardo Quesada e4be87a059 Adds Spine binary-file format support (#16629)
* Adds Spine binary-file format support

fixes issue #10438

* ignore SkeletonBinary.c from linter

* add another file to the exclude list

* lua manual fixes for spine

* SkeletonBinary.c and not .cpp

* missing files for win8.1

* don't compile it as crt

* new updates from spine
2016-10-11 10:56:14 -07:00
子龙山人 3c1e6122e0 Merge pull request #16673 from CocosRobot/update_lua_bindings_1476150657
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-10-11 00:34:42 -07:00
CocosRobot#Set f280ed2cdb [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2016-10-11 01:51:00 +00:00
mogemimi ccc141fc99 Remove unnecessary const return qualifiers (#16671) 2016-10-11 09:33:05 +08:00
mogemimi 5efddc9cf2 Fix minor typo in issue_template (#16672) 2016-10-11 09:30:18 +08:00
9b9387 0c8376411e Update GuiConstants.lua (#16666)
- fixed PageView constant
2016-10-10 13:56:42 +08:00
子龙山人 eeab15b2c9 Merge pull request #16659 from zilongshanren/fix-mac-font-name
fix mac system font creation with NSFont
2016-10-09 19:06:55 -07:00
minggo 56e0e6f741 correct search path (#16660) 2016-10-08 14:44:18 +08:00
zilongshanren 5b109854c3 fix mac system font creation with NSFont 2016-10-08 14:34:55 +08:00
Paul Gardiner 1c0602e130 Remove unnecessary arguments from some lua cc.mat4 methods (#16658)
* Lua: remove unused 3rd argument from cc.mat4.transformVector

cc.mat4.transformVector takes a mat4 and a 4vector and returns the result
of applying the mat4 to the vector. Strangely it had been made to also
require a third argument called dst which it doesn't use but did check
was a vec4. This commit allows cc.mat4.transformVector to be called
without the unnecessary argument. We still permit calling with it for
backward compatibility.

Also changed is the wrapper in Cocos2d.lua so that a second form of
cc.mat4.transformVector can be used where the vector is supplied as
4 separate numbers.

Changed the test files to call without the unnecessary argument.

* Lua: remove unused argument from cc.mat4.createTranslation/Rotation

Both these functions have an extra unnecessary argument called dst,
although neither use it either to pass in or out a value. This
commit removes the extra argument and updates the test programs
correspondingly.

Also, within Cocos2d.lua, remove some definitions that are later
overwritten by new ones
2016-10-08 14:33:50 +08:00
mogemimi 611b6fafc8 Suppress unused function warning (#16657) 2016-10-08 10:14:58 +08:00
Wilson E. Alvarez a4769cdf2e Removed COCOS2D_DEBUG from Android simulator on release build (#16645) 2016-10-08 10:04:39 +08:00
mogemimi 59dea5a487 Removed unnecessary comments (#16649) 2016-10-07 11:47:48 -07:00
Dmitry 771a69709f fix for #16589 (#16636) 2016-10-04 22:26:40 -07:00
mogemimi d68eacd10a Remove unused functions (#16640) 2016-10-04 22:10:52 -07:00
mogemimi 868e6f62c5 Fix typos in doc: accpetable / accepteable -> acceptable (#16641) 2016-10-04 22:08:56 -07:00
minggo 5785c3fcdd use SharedPreferences.apply() instead (#16632) 2016-09-30 14:58:30 +08:00
CocosRobot c046257efc [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16630) 2016-09-30 09:44:34 +08:00
子龙山人 c3bbbb6cb2 Refactoring ui related code and fix label atlas and BMFont rendering issue with ETC1 texture format (#16615)
* refactoring ui related code

* fix label bmfont/charmap etc drawing

* make code more robust
2016-09-30 09:42:21 +08:00
Paul Gardiner 68ec773f39 lua: generate bindings for Sprite3DMaterial (#16609)
Add Sprite3DMaterial to the list of classes for autogeneration of
lua bindings.

Add a new test case to the end of Sprite3DTest.lua showing the
use of outline.material.
2016-09-30 09:34:16 +08:00
mogemimi db4e7c398a Turn on recommended warnings for Xcode 8 (#16612) 2016-09-30 09:32:38 +08:00
minggo a6f3773aef Luajit (#16620)
* update console

* load lua according architecture

* install android-13 in travis
2016-09-28 16:19:20 +08:00
James Chen 189ffc4e27 Minor fix for TextureCache::addImage(image, key). (#16613)
* Removes insignificant log: `prevents overloading the autorelease pool`
* Removes unused retain -> autorelease stuff
* Checks the return value of `texture->initWithImage`, if it returns false, texture should be released and set to nullptr.
* More specifc log output in TextureCache::addImage(image, key)
* Checks arguments validation for VolatileTextureMgr::addImage
2016-09-27 15:10:16 +08:00
halx99 2ee439e3f5 Fix issue: 16603 (#16604)
see: https://github.com/cocos2d/cocos2d-x/issues/16603
2016-09-27 13:59:24 +08:00
mogemimi 8b703a8d12 Fix implicit conversion warning (#16598)
* Fix implicit conversion warning

* Change SAXParser::textHandler parameter type from int to size_t
2016-09-26 14:49:47 +08:00
pandamicro 466053b740 Fix JS AssetsManagerTest and Improve scheduler wrapper (#16605)
* Fix tests for v3.12 web

* Improve scheduler wrapper

* Update web engine ref
2016-09-26 14:44:32 +08:00
Wilson E. Alvarez 59574f95e0 Fix mismatched memory deallocators (#16596)
* Fix mismatched memory deallocator in CCFastTMXLayer.cpp

* Fix mismatched memory deallocator on SkeletonRenderer.cpp

* Fix mismatched memory deallocator in CCTMXLayer.cpp
2016-09-26 14:18:48 +08:00
Steve Tranby b22efc9115 Features: add events for window resize, focus, and unfocus (#16578)
* add events for window resize, focus, and unfocus

* fix typo
2016-09-20 20:32:33 -07:00
TankorSmash f93c6edb1f tidy up TextureAtlas::resizeCapacity (#16588)
My intent is to reduce clutter and improve readability, so that going forward it's a little easier to edit this.

No behaviour change.
2016-09-20 20:31:24 -07:00
mogemimi e8c3082229 Move skipBOM function outside to prevent shadowing warning (#16585) 2016-09-20 14:52:15 +08:00
colajam93 1d3a40f8be Fix warning (#16591) 2016-09-20 14:50:47 +08:00
colajam93 e7f739897c Fix deprecated warning (#16592) 2016-09-20 14:48:00 +08:00
mogemimi 63b3043dc0 Remove extra semicolon after member function definition (#16595) 2016-09-20 14:43:48 +08:00
halx99 a46b30f8a6 use more plain API FileUtils::getStringFromFile (#16586) 2016-09-19 11:49:35 +08:00
minggo 0960ffe64f Merge pull request #16584 from minggo/merge-v3.13.1
Merge v3.13.1
2016-09-19 09:49:49 +08:00
minggo 4dd1af5485 fix compiling error 2016-09-18 11:34:01 +08:00
minggo 84a102edf8 merge v3.13.1 back to v3 2016-09-15 10:08:28 +08:00
mogemimi 91cdb3394b Suppress warning C4101 on MSVC (#16573) 2016-09-14 10:49:14 -07:00
Steve Tranby 2776d1e715 XCode sometimes gets confused with multiple 'Rect' types (#16579) 2016-09-14 10:46:17 -07:00
mogemimi 63637139dc Fix -Wpessimizing-move warning when using Xcode 8 (#16580) 2016-09-14 10:45:26 -07:00
mogemimi afe8b05da8 Remove semicolons before method bodies (#16566) 2016-09-14 10:44:00 -07:00