Commit Graph

523 Commits

Author SHA1 Message Date
minggo f63fad3e27 Merge branch 'v3.14' into merge-v314 2017-01-04 09:49:22 +08:00
pandamicro e16828647c Fix web engine canvas mode issues (#17095)
* Update web ref

* Fix custom event being discard during event emission

* Fix web engine canvas mode issues

* Revert "Fix custom event being discard during event emission"

This reverts commit 3f42273e1e86bc3c977abc61a45d30169d5c35ff.

* Update web ref
2017-01-03 09:40:38 +08:00
子龙山人 163e730849 Fix label disableeffect (#17075)
* add toggle rendering type test

* fix label additional kerning

* only substract additionalKerning when bold is enabled
2016-12-29 13:59:24 +08:00
minggo c15da89c5e use projection 2d (#17078) 2016-12-28 18:20:14 +08:00
minggo 279ae9819c Merge pull request #17071 from VisualSJ/v3.14
Fixed a bug about LoaderTest
2016-12-27 11:36:04 +08:00
VisualSJ bdf161a99e Fixed a bug about LoaderTest 2016-12-27 10:53:07 +08:00
pandamicro 41abefd082 Merge branch 'v3.14' of github.com:cocos2d/cocos2d-x into v3.14
# Conflicts:
#	CHANGELOG
#	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
#	cocos/scripting/js-bindings/manual/spine/jsb_cocos2dx_spine_manual.cpp
2016-12-26 18:53:42 +08:00
pandamicro 8c71531338 Fix test case issues and add change log 2016-12-26 18:36:19 +08:00
子龙山人 6fa331b065 fix js tests description (#17065) 2016-12-26 18:15:05 +08:00
pandamicro 0496857283 Fix chipmunk test issue 2016-12-26 00:07:17 +08:00
pandamicro a3d6705b02 Improve cc.formatStr 2016-12-21 11:05:49 +08:00
minggo bd0789e22c sync codes from cpp to js (#17042) 2016-12-19 16:00:27 +08:00
pandamicro 24be2acde0 Merge branch 'v3.14' of github.com:cocos2d/cocos2d-x into v3.14
# Conflicts:
#	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
#	cocos/scripting/js-bindings/manual/js_manual_conversions.cpp
#	cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp
#	tests/js-tests/src/SpineTest/SpineTest.js
2016-12-19 12:39:55 +08:00
minggo 3adbc2a116 change button background picture (#17040) 2016-12-19 10:44:56 +08:00
minggo 691a0ce8a5 fix the bug that sprite is not hide after trees (#17028) 2016-12-16 15:45:34 +08:00
minggo 291307b698 should retain object to be used later (#17027) 2016-12-16 15:16:00 +08:00
minggo 7c2bd27d71 unschedule all before exit (#17026) 2016-12-16 14:53:15 +08:00
minggo 332ef17d51 use correct spine api (#17023) 2016-12-16 11:24:11 +08:00
pandamicro 5823f5792b Synchronize creator engine bug fixes and upgrade web engine (#17003)
* Add EventDispatcher#hasEventListener (sync from creator)

* Fix function wrapper using js object during its gc

* Support more system languages

* Direct log/error for better understanding problems & add sys.now

* Synchronize Editbox APIs

* Synchronize Scheduler.PRIORITY_NON_SYSTEM const

* Upgrade web engine

* Upgrade test cases

* Manually bind EventDispatcher::addCustomEventListener to avoid memory issue

* Manual bind EventListeners’ create to avoid memory issue

* Fix compilation issue when COCOS_DEBUG = 2

* Unify function name of Texture2D::releaseTexture

* Fix compilation issues and update web & bindings-generator

* Fix lua compilation issue

* Use %ld instead of %zd
2016-12-14 09:27:47 +08:00
pandamicro e469f4f710 Upgrade test cases 2016-12-13 14:29:24 +08:00
James Chen f26cc15373 Avoids function name conflict, and uses `http://httpbin.org/gzip` to test gzip functionality since only httpbin.org was added to exception list in Info.plist. (#16933) 2016-12-13 11:44:42 +08:00
James Chen cef013dcc6 Fixes broken of JS AssetsManagerTest. And updates https configuration of cpp-tests, js-tests for macOS. (#16970)
fixed http://punchbox.info:3000/issues/26031
2016-12-08 10:40:22 +08:00
James Chen 46fd7e3d59 Sync JS TerrainTest.js from cpp test. (#16967) 2016-12-07 14:17:45 +08:00
子龙山人 f51234c549 fix jsb test inconsistance (#16963) 2016-12-06 17:50:26 +08:00
Dale Stammen 8791794f39 updated for v3.14 (#16942) 2016-12-01 10:37:04 +08:00
James Chen 51efcb9365 Fixes setScale & setAnchorPoint could not work in js-tests -> webview test . (#16935) 2016-11-30 15:32:02 +08:00
James Chen df13bc8856 Allows Arbitrary Loads for cpp-tests, js-tests, lua-tests project. removes exception dictionary. (#16934) 2016-11-30 15:29:48 +08:00
David DeSimone 9204c87cfc Adding performance.now() to cocos2d-js. (#16766)
* Adding performance.now() to cocos2d-js. See https://developer.mozilla.org/en-US/docs/Web/API/Performance/now

* Fixing improper logic for converting from microseconds, to milliseconds with micro-precision

* Adding performance.now tests
2016-11-04 11:58:48 +08:00
Ricardo Quesada 90db0eb6bf Android pixel fixes (#16694)
* android pixel fixes

- pragma pack for NavMesh! (how this was working)
- no no-const global variables in shaders

* spine: js bindings work again
2016-10-17 15:44:41 +08:00
Paul Gardiner 6b27f014fc Correct the Skybox fov (#16655)
* Remove undrawn quads from the skybox mesh

CCSkybox had been implemented using a combination of two
inconsistent techniques. The rendering was being achieved via use of
the vertex shader's inherent support for cubemaps. That technique requires
only a single screen-covering quad, but the implemtation defined a cube.
Defining a cube mesh would be appropriate if one were simply mapping the
cubemap's 6 textures to faces, but is unnecessary if using the shader's
cubemap feature.

Not only was the use of a cube mesh unnecessary, but the particular way
the cube was defined and used meant that only one face would ever
contribute to the rendering. One of the other faces would always be culled
and the other four would be viewed edge on, mapping the the infinitesimally
thin lines defining the edges of the screen.

This commit simply removes the never-rendered faces, and adds comments
explaining the technique.

* Within test code, remove setScale calls applied to skyboxes.

A Skybox is defined in such a way that it's position, rotation and
scaling has no effect on it's rendering, so setScale has no effect.
The calls are removed from test code to avoid confusing anyone using
it as a template for their own programs.

* Make the Skybox correctly account for the camera's fov

The Skybox does not use the model/view and projection matricies. Instead
a single quad that maps exactly to the screen is rendered and the camera's
world matrix is passed into a shader that renders using cubemap lookups.
The way that works hardwires the fov to 90deg in both the horizontal and
vertical. That shows up particularly badly when the camera is pointed
directly downwards and rotated: the image deforms as it rotates.

This commit corrects the problem by using scaling factors from the
camera's projection matrix to prescale the matrix passed into the shader.
2016-10-17 13:46:26 +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
minggo 84a102edf8 merge v3.13.1 back to v3 2016-09-15 10:08:28 +08:00
minggo 937525a4de prevent restarting activity on some events (#16525) 2016-09-06 16:12:49 +08:00
minggo 04fd2b16b2 merge v3.13 back to v3 2016-08-29 11:57:13 +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
Greg Rynkowski 14b8fc0a71 Remove AppDelegate memory leak in Android projects (#16333)
* Remove AppDelegate memory leak from Android projects

AppDelegate object and all its members are never released.
As a solution I propose to use static unique_ptr that could destroy it
at the end of the application.

Issue:
https://github.com/cocos2d/cocos2d-x/issues/14110

* Correct code style in Android main.cpp files

- removed redundant headers (reduced dependencies)
- removed redundant code
- corrected code style
2016-08-08 10:53:04 +08:00
James Chen b135d512d2 Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
minggo 7131451f1b change to use api 19 (#16248)
* change to use api 19

* update deps version
2016-07-29 13:57:01 +08:00
Ricardo Quesada 2945968614 Upgrades to Spine v3.4 (#16242)
* Upgrades to Spine v3.4

Github issue #16115

* compiles and works on windows

tested on:

* win32
* win10
* win8.1

* include-linter: don't test spine files

we need them unmodified

* spine bindings fixes

also, doesn't use goblins-ffd. instead it uses goblins.
goblins-ffd is no longer present in spine v3.4
2016-07-28 07:25:50 -07:00
minggo 5f2c1df448 use android 21 to fix compiling error 2016-07-22 10:53:56 +08:00
Ricardo Quesada 05a772115e fixes issue #15566
lua and javascript for arm64 is not compiled

version 103

uses JPEG 9b for android

using armeabi

uses Lua, and not LuaJIT for Android ARM64
2016-07-12 19:03:53 -07:00
minggo c267167d07 Merge pull request #16069 from minggo/ndkr12b-issue
fix compiling and linking error with ndk r12b
2016-07-08 17:01:09 +08:00
minggo 4e125d84a4 fix compiling and linking error with ndk r12b 2016-07-08 15:29:35 +08:00
minggo 734d857ced Merge branch 'v3.12' into merge-v312 2016-07-07 15:13:21 +08:00
pandamicro 96155a670f Improve web template and update web ref 2016-07-06 13:54:55 +08:00
Ricardo Quesada afe36e4a00 feat: upgrades to GLFW v3.2
Inclues Mac and Win32 binaries
Includes udpated downlaod+compile Linux script

fixes github issue #11748

uses WINAPI instead of APIENTRY

it seems that it is being redefined somewhere... but I couldn't find
exactly where
2016-06-29 16:11:30 -07:00
pandamicro 91341c151a Fix js test issues 2016-06-29 11:08:34 +08:00
pandamicro 6e54080e83 Fix style issue in html page 2016-06-28 21:59:37 +08:00
pandamicro 417ddcc9e7 [Web] Fix TransitionsTest issue on render type detection 2016-06-28 15:10:42 +08:00
pandamicro 6b2a96a2b9 Fix LoaderTest 2016-06-28 14:08:30 +08:00