Skip to content

Release Cocos2d-JS v3.5 #1639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 902 commits into from
Apr 1, 2015
Merged

Release Cocos2d-JS v3.5 #1639

merged 902 commits into from
Apr 1, 2015

Conversation

pandamicro
Copy link
Contributor

No description provided.

pandamicro and others added 30 commits March 18, 2015 00:56
@pandamicro
Upgrade bindings code to SpiderMonkey v34
c23e391
@stammen
added samples solution for Windows 8.1 Universal Apps
4cf24b1
@stammen
updated release build properties
67f4787
@stammen
added project files for Windows 8.1 Universal Apps
f2473e0
@stammen
Ignore zip file created by download-deps.py if saved by user
d45d3e9
@stammen
added SpiderMonkey for Windows 8.1 Universal App
53d7ee2
@stammen
updated include paths
a3cb96b
@stammen
use wav file for WP8 and WINRT
8184f73
@stammen
added Generated Files dir
90c59e2
@stammen
added check for OS_WINRT
ede0934
@stammen
Merge branch 'develop' into develop-winrt
d7e5dfe
@stammen
added /Gy option for ARM error
95118ef
@stammen
added Windows 8.1 Universal App project files
4cf34e1
@stammen
added CC_PLATFORM_WINRT
9f5fffc
@stammen
added js-tests for Windows 8.1 Universal App
c043a71
@pandamicro
Fix issue of enableDebugger
f3e0c3f
@dingpinglv
Closed #1554: added a testcase to test the blendFunc of Sprite
bb11860
@dingpinglv
Fixed a bug of template that it doesn't work when it doesn't add load…
92995c5 
…ing.js
@dingpinglv
Merge pull request #1557 from dingpinglv/develop
b8ea3d6 
Fixed a bug of template that it doesn't work when it doesn't add loading.js
@dingpinglv
Moved loading.js to res folder for Cocos console release mode.
79547bb
@dingpinglv
Update the reference of cocos2d-html5
7a570a5
@dingpinglv
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
9392114 
…develop
@dingpinglv
Merge pull request #1558 from dingpinglv/develop
56e55c9 
Moved loading.js to res folder for Cocos console release mode.
@dingpinglv
Fixed a bug of Cocostudio parser that widget doesn't set layoutComponent
d940196
@dingpinglv
Merge pull request #1559 from dingpinglv/develop
e584dbb 
Fixed a bug of Cocostudio parser that widget doesn't set layoutComponent
@pandamicro
Refactor create_js_root_obj -> get_or_create_js_obj
45b0646
@pandamicro
Upgrade SpiderMonkey v34 and fix 32bit 64bit conflict
d3e98e0
@pandamicro
Update submodules
afee3c1
@pandamicro
Ensure v33 v34 compatibility
927f979
@pandamicro
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
c4626e1 
…ImproveBindings

Conflicts:
	frameworks/js-bindings/bindings/manual/cocos2d_specifics.cpp
stammen and others added 28 commits March 30, 2015 18:40
@stammen
added new universal app files to fix home button crash
d6d5d4d
@stammen
added new universal app files to fix home button crash
3f3d72c
@pandamicro
Merge pull request #1630 from MSOpenTech/wp8-fix
cc7ca26 
WP8 updated SpiderMonkey DLL to pass Windows App Certification tests
@pandamicro
Merge branches 'develop' and 'develop' of https://github.com/cocos2d/…
d8fb242 
…cocos2d-js into develop
@VisualSJ
Add scheduler tests
0b3f468
@VisualSJ
Add scheduler tests
42cea73
@dingpinglv
Merge pull request #1631 from VisualSJ/develop-3.4final
f97e752 
Add scheduler tests
@pandamicro
Fix runtime bindings issue
ca4fb40
@pandamicro
Merge branches 'develop' and 'develop' of https://github.com/cocos2d/…
e2e1298 
…cocos2d-js into develop
make camera.unproject accept one argument
3e35188
@pandamicro
Merge pull request #1632 from pandamicro/develop
08d5b98 
Fix issues
fix winrt chinese label test
5820cd1
remove unwanted code
236f309
@pandamicro
Update runtime
de4fb85
@pandamicro
Remove Framework search path in js-tests iOS proj to avoid potential …
7147391 
…linker issue
@pandamicro
Merge pull request #1633 from joshuastray/unproject
a95612b 
make camera.unproject accept one argument
@pandamicro
Merge pull request #1634 from joshuastray/winrtfont
06d3e26 
fix winrt chinese label test
@pandamicro
Update Engine version
d28f5fa
@pandamicro
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
7252910 
…develop
@pandamicro
Merge pull request #1635 from pandamicro/develop
a474d6a 
Update runtime
@stammen
added back button support. Check if rendering thread has been cancelled
3732bc2
@pandamicro
Merge pull request #1636 from MSOpenTech/winrt-fix
cf54fde 
WINRT added back button support. Check if rendering thread has been cancelled
change moveTo to moveBy
2fc54d0
@pandamicro
Merge pull request #1637 from joshuastray/move
18e197b 
change moveTo to moveBy
@pandamicro
[Cocos2d-JS v3.5] Added docs
4c195e5
@pandamicro
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
1dbc700 
…develop
@pandamicro
Update h5 engine
21f6df6
@pandamicro
Merge pull request #1638 from pandamicro/develop
0300f81 
[Cocos2d-JS v3.5] Added docs
pandamicro added a commit that referenced this pull request Apr 1, 2015
@pandamicro
Merge pull request #1639 from cocos2d/develop
2a49d3c 
Release Cocos2d-JS v3.5
@pandamicro pandamicro merged commit 2a49d3c into master Apr 1, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@pandamicro @jptester @stammen @dingpinglv @CocosRobot @VisualSJ @zhaijialong @xiaofeng11