Commit Graph

35818 Commits

Author SHA1 Message Date
CocosRobot ee4d59cf76 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16454) 2016-08-29 11:48:21 +08:00
mogemimi 6c3f5e6d6b Fix variable shadowing warnings caused by Spine 3.4 (#16445) 2016-08-29 09:42:34 +08:00
mogemimi 86563af08a Add missing override keywords 2016-08-28 23:45:15 +09:00
Alfonso Grillo 6c9a05f831 PageView with custom 'scrollToPage' time (#16390)
* PageView with custom scrollToPage time

* fix compiler error
2016-08-25 15:48:01 +08:00
Nakhyun Choi a9898b9875 possible memory leak when font size is 0 (#16424) 2016-08-24 18:27:44 -07:00
Dawid Drozd 662cbbe657 Fix BUILD_SHARED_LIBS ON needs -fPIC #16426 (#16427)
Fix for issue #16426
2016-08-24 17:50:12 -07:00
CocosRobot 6d7140d4af [AUTO][ci skip]: updating cocos2dx_files.json (#16439) 2016-08-24 17:47:51 -07:00
halx99 5bc3659a33 #Improve XML parse performance with rapidxml pure SAX parser (#16419)
* Update CCSAXParser.cpp

* #Improve XML parse performance with rapidxml pure SAX parser without compatible break.

* put rapidxml to external

* Update deps
2016-08-24 16:37:03 -07:00
Aaron e62af99db7 Fixed Camera::_viewProjectionUpdated state (#16405)
Camera::_viewProjectionUpdated is not initialised in constructor. Should be initialised to false.
This can lead to redundant visibility checks if _viewProjectionUpdated happens to resolve true.

As Camera::visit() is never called, _viewProjectionUpdated is never actually updated, resulting in no visibility tests when the camera transform changes.

Fixes #16404
2016-08-24 18:15:19 +08:00
mogemimi a9a8add717 Add missing class declaration and remove duplicate declaration (#16423) 2016-08-24 18:09:29 +08:00
Michael Kösel c339266556 [UserDefault-android] Return defaultValue parameter instead of some default value (#16416)
* Return defaultValue parameter instead of some default value

* Remove unnecessary semicolon
2016-08-24 18:07:17 +08:00
CocosRobot 331faac9d1 [AUTO][ci skip]: updating cocos2dx_files.json (#16436) 2016-08-24 17:54:11 +08:00
minggo 460e1e2da9 update release note (#16435) 2016-08-24 17:41:51 +08:00
minggo 20a0798007 avoid to use __system_get_property__ (#16433)
* avoid to use __system_get_property__

* add utils

* revert console
2016-08-24 17:11:41 +08:00
pandamicro bd0173a826 Doctoc docs and update web ref (#16430) 2016-08-24 15:17:47 +08:00
minggo 1748dfa79d update agreement (#16431) 2016-08-24 14:52:55 +08:00
yanli.huang 5db61ca26f fix cocos package can't update (#16428)
* update cocos2d-console commit id : cocos package so change pyc

* update cocos2d-console  commit id: fix cocos package can't update
2016-08-24 10:09:42 +08:00
minggo 2c68163081 add ETC1 alpha picture (#16425)
* add ETC1 alpha picture

* update VR plugin section
2016-08-23 14:57:25 +08:00
9b9387 e124fe4fc5 Update CCBProxy.cpp (#16421)
fixed bug
2016-08-23 14:48:06 +08:00
Adrien de Sentenac 3c60398c09 Fix size/position calculations for Linux system fonts. (#16328) 2016-08-23 12:01:43 +08:00
Slack-Moehrle e7be4fc7df updated VR, per Minggo (#16417) 2016-08-23 11:47:08 +08:00
minggo e6521fa173 update release note (#16422) 2016-08-23 11:43:31 +08:00
minggo 1b3ff00cef fix compiling error (#16420) 2016-08-23 11:05:01 +08:00
Ricardo Quesada f174dd1141 fix: improves test for issue #16155 (#16418)
improves test for github issue #16155
2016-08-23 09:47:55 +08:00
yanli.huang b0c8a8505a update cocos2d-console commit id : cocos package so change pyc (#16413) 2016-08-22 16:06:29 +08:00
yanli.huang 13a503bda7 update cocos2d-console commit fix part of mac can`t use cocos package (#16391)
* update cocos2d-console commit

* update cocos2d-console commit:
fix: Interrupt to compile when cocos package prompted user to update

* update cocos2d console commit  :fault-tolerant for cocos package
1.add mode param when call cocos package encrypt
2.fault-tolerant. call encrypt if and only if used cocos package to import plugin

* update cocos2d-console commit id :fix part of mac can't use cocos package

* update cocos2d-console commit id:cocos package so change pyc
2016-08-22 15:57:30 +08:00
Furkan Üzümcü 5b83fa1ac0 Fix LNK4098 and LNK2001 warnings (#16372)
* Fix LNK4098 warnings

Fixes these two warnings:
```
warning: LNK4098: defaultlib 'MSVCRT' conflicts with use of other libs; use /NODEFAULTLIB:library
warning: LNK4098: defaultlib 'LIBCMT' conflicts with use of other libs; use /NODEFAULTLIB:library
```

* Fix LNK2001 error

The `version` library is not linked for MSVC compiler and it produces these errors when compiling with MSVC 19.
```
cocos2dInternal.lib(CCApplication-win32.cpp.obj) : error LNK2001: unresolved external symbol _GetFileVersionInfoSizeW@8
cocos2dInternal.lib(CCApplication-win32.cpp.obj) : error LNK2001: unresolved external symbol _GetFileVersionInfoW@16
cocos2dInternal.lib(CCApplication-win32.cpp.obj) : error LNK2001: unresolved external symbol _VerQueryValueW@16
```

This commit fixes that problem
2016-08-22 15:50:17 +08:00
CocosRobot 56cfd76b4c [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16411) 2016-08-22 15:49:43 +08:00
pandamicro ec52cf4aa4 [ci skip] Remove LayerRGBA in scripts to avoid issues and update web ref (#16412)
* Remove LayerRGBA in scripts to avoid issues and update web ref

* Doctoc docs
2016-08-22 10:55:21 +08:00
halx99 4d801ba1d0 #Fix use const std::string& instead a temp string (#16392)
* #Fix use const std::string& instead a temp string

* #Fix use const std::string& instead a temp string
2016-08-22 09:43:41 +08:00
James Chen 727c501285 Fixes crash while invoking pause&resume right after play2d. (#16406) 2016-08-22 09:43:06 +08:00
mogemimi 7afde8c7a6 Remove unnecessary ActionInterval casts (#16402) 2016-08-22 09:39:58 +08:00
CocosRobot 0fbc404cd9 [AUTO][ci skip]: updating cocos2dx_files.json (#16403) 2016-08-22 09:38:51 +08:00
pandamicro f0be4f3069 Merge part of Cocos2d-x-lite (#16380)
* Update js auto binding settings with new ndk version

* Remove unnecessary property from Ref

* Merge part of Cocos2d-x-lite :
1. Improve network bindings
2. Use nullptr instead of NULL
3. Remove usage of some deprecated APIs
4. Add some defensive code and cleanup

* Fix spine track entry circle referencing issue

* cocos2d/cocos2d-x#16327: Fix global object leak issue in JSB

* Improve ScriptingCore::evalString, old implementation have been deprecated in Spidermonkey

* Update JS versions

* Add docs for web v3.13

* Improve ScriptingCore

* Manual merge cocos2d/cocos2d-x#16383 by DavidDeSimone

* Fix auto bindings configurations

* Update web ref
2016-08-19 16:28:47 +08:00
Ricardo Quesada 016e7b0dfc fix: release texture in RenderState (#16396)
memory leak fixed in RenderState

fixes github issue #16155
2016-08-19 00:22:57 -07:00
minggo 92ed162cbe replace replace __system_property_get() since it is deprecated in 64 bit android NDK (#16398) 2016-08-19 11:49:33 +08:00
minggo e9a5a4e2bd Revert luajit (#16397)
* revert to use lua

* comment lua bytecode test

* update release note
2016-08-19 11:49:19 +08:00
CocosRobot d09ee83c5a [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16395) 2016-08-19 09:36:50 +08:00
Ricardo Quesada 3ecaa71944 fix: validates director before layout in iOS (#16394)
Adds Director::isValid()
removes DisplayLinkDirector()
removes virtual functions from Director()
Director is no longer an abstract class

github issue #14276
2016-08-18 18:13:15 -07:00
Ricardo Quesada 604312ac35 Revert "fix: uses correct constant for Eye in Director" (#16385) 2016-08-17 17:53:20 -07:00
minggo 2c37be5d86 fix lua tempate error (#16377) 2016-08-17 16:09:48 +08:00
minggo fe3fb42f49 update release note & changelog (#16376) 2016-08-17 15:40:10 +08:00
CocosRobot 9019d7f2c4 [AUTO][ci skip]: updating cocos2dx_files.json (#16374) 2016-08-17 13:59:55 +08:00
minggo 3ce4134ab3 use java reflection to avoid API level dependent, use app-abi 10 (#16371)
* use java reflection to avoid API level dependent, use app-abi 10

* add license header
2016-08-17 13:55:26 +08:00
Furkan Üzümcü fe6c52c1b4 Use the VS 2015 libraries for MSVC 14 (#16359)
* Use the VS 2015 libraries for MSVC 14

When compiling with MSVC 14, the linker cannot find `libpng-2015.lib`, `libtiff-2015.lib`, `libjpeg-2015.lib` and `libglfw-2015.lib`. This commit fixes that problem

* Remove the -2015 suffix from the non-MSVC 14 part on libchipmunk

* Fix Linux compiler errors

Check If we are on Windows then check for VS 2015.
2016-08-16 16:57:03 +08:00
CocosRobot 7540a64fd8 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16370) 2016-08-16 16:56:06 +08:00
charlesstlaurent b1a64ae730 new actions ResizeBy and ResizeTo (#16275)
* new actions ResizeBy and ResizeTo

* FDP-5580-ResizeBy and ResizeTo fix and Test cpp : added a scale exemple in the test cpp to compare with our new resize + fix

* FDP-5580: actions ResizeBy and ResizeTo : changed some functions visibility
2016-08-16 16:55:31 +08:00
Ricardo Quesada dcea1b65ae fix: uses correct constant for Eye in Director (#16369)
fixes github issue #8354
2016-08-15 23:27:20 -07:00
minggo 41cb85edd4 update external version 2016-08-16 13:55:18 +08:00
CocosRobot c03f6468fc [AUTO][ci skip]: updating cocos2dx_files.json (#16368) 2016-08-15 17:27:05 +08:00