joshuastray
|
eba3642aef
|
add missing CC_DLL for localstorage
|
2014-10-17 11:52:59 +08:00 |
yangxiao
|
9e1656e5b0
|
simplify compute global z when it is transparent
|
2014-10-17 11:52:39 +08:00 |
minggo
|
623f707499
|
Merge pull request #8773 from Dhilan007/v3-win-release
fixed miss sqlite3 for release build on window.
|
2014-10-17 11:41:46 +08:00 |
huangshiwu
|
d05aa84699
|
add launch images to templates to support iphone6 and iphone6+'s native resolution mode
|
2014-10-17 11:40:22 +08:00 |
Dhilan007
|
4586954e0a
|
fixed miss sqlite3 for release build on window.
|
2014-10-17 11:39:06 +08:00 |
andyque
|
8161d2ad34
|
fix scrollView rotate issue
|
2014-10-17 11:31:00 +08:00 |
yangxiao
|
87850d0378
|
rename Animate::createWithFrames
|
2014-10-17 11:16:07 +08:00 |
XiaoYang
|
ed5f5d7229
|
Merge pull request #143 from tangziwen/v3
fix Zorder for transparent mesh
|
2014-10-17 11:14:01 +08:00 |
tangziwen
|
d14b30ecac
|
fix tab style
|
2014-10-17 10:59:53 +08:00 |
minggo
|
f537877116
|
Merge pull request #8767 from andyque/fixIOSIssue
fix winRT macro
|
2014-10-17 10:26:14 +08:00 |
minggo
|
9c53b72962
|
[ci skip]update config.json
|
2014-10-17 10:21:45 +08:00 |
samuele3hu
|
71f7520732
|
Fix win32 compile error
|
2014-10-17 10:19:41 +08:00 |
Dhilan007
|
ccbc668427
|
Improve Android.mk
|
2014-10-17 10:13:33 +08:00 |
andyque
|
812c2ecd0c
|
fix winRT macro
|
2014-10-17 10:09:05 +08:00 |
minggo
|
4544ecff4e
|
Merge pull request #8763 from ledenis/label-in-samples
Changed deprecated LabelTTF::create() to Label::createWithTTF() in the H...
|
2014-10-17 09:37:23 +08:00 |
minggo
|
ec4d83b646
|
Merge pull request #8738 from pipu/v3_Modify_Reader
Modify Reader:
|
2014-10-17 09:35:07 +08:00 |
minggo
|
8b1fe93269
|
Merge pull request #8762 from Dhilan007/v3-33rc
disable warn on zero-sized structure[android].
|
2014-10-17 09:34:41 +08:00 |
minggo
|
e672367d19
|
Merge pull request #8765 from MSOpenTech/wp8-v3.3-fix
WP8 v3.3 fix
|
2014-10-17 09:34:21 +08:00 |
tangziwen
|
69cda9ccae
|
fix duplicate function in create dummy texture
|
2014-10-17 08:58:05 +08:00 |
Dale Stammen
|
41fe4a3e17
|
dpi for wp8 only
|
2014-10-16 11:16:26 -07:00 |
Dale Stammen
|
53302789a0
|
added missing files
|
2014-10-16 11:16:02 -07:00 |
Dale Stammen
|
d5b0830c3b
|
added missing files
|
2014-10-16 11:15:39 -07:00 |
Dale Stammen
|
dc2f40fb8f
|
added missing tests
|
2014-10-16 11:14:56 -07:00 |
Dale Stammen
|
7ccc380e3f
|
enabled networking tests for winrt
|
2014-10-16 11:14:18 -07:00 |
Dale Stammen
|
a931f8c192
|
enabled console for winrt
|
2014-10-16 11:13:32 -07:00 |
Dale Stammen
|
ae7008fdd9
|
enabled console for winrt
|
2014-10-16 11:13:08 -07:00 |
Dale Stammen
|
3ab8292b5a
|
enabled console for WinRT
|
2014-10-16 11:12:37 -07:00 |
Dale Stammen
|
bcfd605361
|
added universal app cpp-test project files
|
2014-10-16 11:11:41 -07:00 |
ledenis
|
33d01965be
|
Changed deprecated LabelTTF::create() to Label::createWithTTF() in the HelloWorld
|
2014-10-16 16:58:24 +02:00 |
Dhilan007
|
5595947dc3
|
disable warn on zero-sized structure[android].
|
2014-10-16 21:41:52 +08:00 |
minggo
|
b4867bf6e5
|
Merge pull request #8715 from iSevenDays/v3
CMakes support for Mac Os X & iOS
|
2014-10-16 21:16:02 +08:00 |
minggo
|
d26a8112b8
|
Merge pull request #8761 from CocosRobot/update_cocosfiles_1413465152
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-10-16 21:13:53 +08:00 |
CocosRobot
|
39d3cb20b5
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-10-16 13:12:34 +00:00 |
minggo
|
a52d75f15d
|
[ci skip] Update CHANGELOG
|
2014-10-16 21:08:16 +08:00 |
minggo
|
07253cfb60
|
Merge pull request #8743 from andyque/removeWebView
remove UIWebView.cpp in win32
|
2014-10-16 21:06:53 +08:00 |
minggo
|
2d6bfc74ea
|
Merge pull request #8757 from 2youyouo2/v3
set tag for ActionTimeline
|
2014-10-16 21:05:38 +08:00 |
minggo
|
7caac8f276
|
[ci skip] Update CHANGELOG
|
2014-10-16 21:03:04 +08:00 |
samuele3hu
|
4d75c977ca
|
Remove useless binding code for SkeletonAnimation
|
2014-10-16 20:53:40 +08:00 |
samuele3hu
|
7198ae509c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-10-16 20:35:43 +08:00 |
samuele3hu
|
c5f19c20ca
|
Add SpineConstants.lua
|
2014-10-16 20:24:47 +08:00 |
samuele3hu
|
079df20541
|
Update lua bindings for Spine and related test case
|
2014-10-16 20:23:58 +08:00 |
minggo
|
c1d8db842f
|
Merge pull request #8759 from dabingnn/v3_updateLicense
update license for spine
|
2014-10-16 19:59:03 +08:00 |
Huabing.Xu
|
71b0a707d1
|
update license for spine
|
2014-10-16 19:56:45 +08:00 |
minggo
|
cbfe2b586f
|
[ci skip] Update CHANGELOG
|
2014-10-16 19:38:43 +08:00 |
minggo
|
883230d9d8
|
Merge pull request #8758 from dabingnn/v3_fixVBOFullTest
change vbo full test
|
2014-10-16 19:36:01 +08:00 |
minggo
|
34cfcb0b54
|
Merge pull request #8690 from dabingnn/v3_spriteLamp
sprite lamp
|
2014-10-16 19:33:57 +08:00 |
minggo
|
8bf00bd4e6
|
Merge pull request #8748 from super626/cameraoperation
Modify camera operation
|
2014-10-16 19:29:55 +08:00 |
minggo
|
a92f485d71
|
Merge pull request #8754 from zawasp/decrease-logging-verbosity
decrease logging verbosity - CCFileUtils-android
|
2014-10-16 19:28:20 +08:00 |
pipu
|
20cb663746
|
Delete the blank block
|
2014-10-16 19:02:39 +08:00 |
minggo
|
10d1c8a2c4
|
Merge pull request #8756 from CocosRobot/update_cocosfiles_1413454610
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-10-16 18:38:03 +08:00 |