minggo
|
5019dc7878
|
don't strip png text
|
2016-05-24 10:06:28 +08:00 |
minggo
|
ecf181036a
|
remove unneeded files
|
2016-05-18 16:44:06 +08:00 |
minggo
|
2a712a0c3b
|
set correct package name
|
2016-05-09 18:14:53 +08:00 |
minggo
|
a5602cc732
|
merge v3.11 back to v3
|
2016-05-04 16:02:23 +08:00 |
Dale Stammen
|
8f37130569
|
added missing winrt template code for inplace EditBox
|
2016-04-28 08:37:55 -07:00 |
mogemimi
|
85646b8d80
|
Fix warning C4305 while compiling AppDelegate with MSVC
|
2016-04-20 04:01:06 +09:00 |
Dale Stammen
|
4d7bf1f827
|
updated expiration dates of all winrt test app and template certificates
|
2016-04-19 09:07:30 -07:00 |
xpol
|
1e70fb5eb5
|
Remove include of cocos2d.h (#15435)
|
2016-04-18 15:09:21 +08:00 |
pandamicro
|
f9f9551645
|
Fix some issues
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
|
2016-04-11 11:11:34 +08:00 |
pandamicro
|
e6d4beef8a
|
Merge pull request #15388 from pandamicro/v3
Issue fixes and update engine version
|
2016-04-07 23:15:39 +08:00 |
pandamicro
|
1ada222c36
|
Fix some issues
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
|
2016-04-07 22:40:32 +08:00 |
zilongshanren
|
6e3d69dded
|
Merge pull request #15336 from cocos2d/v3.10
V3.10
|
2016-03-29 11:23:11 +08:00 |
zilongshanren
|
b879dce607
|
add audio SimpleAudioEngine.h search path back
|
2016-03-28 14:35:59 +08:00 |
minggo
|
488930119d
|
fix compiling error in new JSB project
|
2016-03-28 10:37:35 +08:00 |
Xpol Wan
|
e7864cdb89
|
Removed unnecessary search paths.
|
2016-03-22 16:04:12 +08:00 |
Xpol Wan
|
d6b2f08b30
|
The CC_TARGET_OS_* in xcodeproj are now not needed.
|
2016-03-16 13:20:53 +08:00 |
zilongshanren
|
af5c5ae1e8
|
Merge pull request #14777 from raksa/v3.10
prevent recompile when run Android app on Android Studio to device or Emulator.
|
2016-03-11 09:34:59 +08:00 |
Vladimir Perminov
|
2a201a5c4e
|
WinRT support key repeat and implement dispatchControlKey
|
2016-03-07 14:43:44 +03:00 |
zilongshanren
|
7467611daf
|
Merge pull request #14810 from GuoLunHao/v3.10_templates
fix compile error in visual studio 2015
|
2015-12-30 11:39:00 +08:00 |
lunhao.guo
|
d3387f5ab2
|
change the resolution size of js template to (960 * 640) ,consistent with other templates
|
2015-12-29 15:24:21 +08:00 |
lunhao.guo
|
d216785f43
|
fix compile error in visual studio 2015
|
2015-12-29 15:02:22 +08:00 |
raksa
|
9b5b87b505
|
reprepare assets on rebuild
|
2015-12-22 13:56:21 +07:00 |
Dale Stammen
|
908d872a0e
|
updated winrt template files with typo fixes
|
2015-12-09 17:33:50 -08:00 |
lunhao.guo
|
ae980c19d2
|
fix the link error and compile error in windows and android platform
|
2015-12-09 20:18:37 +08:00 |
pandamicro
|
e7dca08df9
|
Add js test case for fix, improve template
|
2015-12-03 16:55:15 +08:00 |
pandamicro
|
a6fdd9aa09
|
Improve js template documentation
|
2015-11-24 16:31:14 +08:00 |
yinjimmy
|
7f10d6d894
|
Template: keep compatibility
|
2015-11-04 18:26:59 +08:00 |
yinjimmy
|
517567c56c
|
Template : fix link libraries
1. GameController.framework in JS template
2. CFNetwork.framework in Lua template
|
2015-11-04 12:19:29 +08:00 |
pandamicro
|
0d6bf3263b
|
Improve js templates with noCache and cc.view.setRealPixelResolution docs
|
2015-11-01 18:33:05 +08:00 |
pandamicro
|
65fafef044
|
Merge pull request #14209 from pandamicro/v3
Disable bitcode for all targets
|
2015-10-22 12:55:25 +08:00 |
pandamicro
|
4633a93631
|
Disable bitcode for all targets
|
2015-10-22 12:18:51 +08:00 |
pandamicro
|
316d37ad51
|
Merge pull request #14130 from jimrange/iconSplash
Fixed issues with the iOS icons and splash screens.
|
2015-10-22 12:17:02 +08:00 |
Jim Range
|
5c93c56d80
|
Updated Lua and JavaScript iOS Info.plist, iOS splash screens and iOS icons.
|
2015-10-21 11:11:02 -05:00 |
Dale Stammen
|
b0ba569285
|
updated package guids and app certificate
|
2015-10-20 16:26:17 -07:00 |
Dale Stammen
|
4b8cc00853
|
use correct name for pfx file
|
2015-10-20 10:48:01 -07:00 |
Dale Stammen
|
d8e10981db
|
added check to see if app is already visible
|
2015-10-20 10:38:42 -07:00 |
Dale Stammen
|
f9d8907697
|
updated winrt temporary app certificates expiration dates
|
2015-10-20 07:39:42 -07:00 |
Dale Stammen
|
fdebb373b1
|
updated cocos2d-x/angle template files to version 0edf96a2f54a43d068244a86aaf9133c1bf71fe5
|
2015-10-16 15:36:34 -07:00 |
Vincent Yang
|
fa6e6f8074
|
Fix js-template-default compile error.
|
2015-09-21 19:28:16 +08:00 |
pandamicro
|
07edc1f81d
|
Merge pull request #13948 from pandamicro/v3
[ci skip] Update web reference
|
2015-09-19 00:27:46 +08:00 |
pandamicro
|
6a975fe641
|
Merge pull request #13599 from perminovVS/winrt-mouse-support
WinRT support mouse
|
2015-09-18 17:26:15 +08:00 |
pandamicro
|
fa1e2ce3c4
|
Update web reference
Set js templates mac target to 10.8
|
2015-09-18 15:58:00 +08:00 |
Vladimir Perminov
|
583e780e29
|
Correct all templates
|
2015-09-17 22:09:41 +03:00 |
pandamicro
|
78c07c1c54
|
Set js templates Mac target platform from null to 10.7
|
2015-09-17 23:10:23 +08:00 |
pandamicro
|
737dc5ba8d
|
Fix build_native for js default template
|
2015-09-14 11:18:32 +08:00 |
zhangbin
|
4996fe5c1b
|
Solve the error in templates.
When creating project from template, the app name of android-studio project is not changed.
|
2015-09-09 16:08:15 +08:00 |
WenhaiLin
|
be60f7f65c
|
[ci skip]js-template-default:Fixed the path of link resources.
|
2015-09-02 13:48:57 +08:00 |
Dale Stammen
|
c47de9d04f
|
make new render surface current after device lost
|
2015-08-20 13:26:03 -07:00 |
pandamicro
|
31bc04a301
|
Merge pull request #13455 from MSOpenTech/v3-win10
Windows 10 UWP and WP8.1 app certification fixes
|
2015-08-19 13:36:29 +08:00 |
pandamicro
|
6d0422bcc3
|
Merge pull request #13448 from VisualSJ/v3.8-webIndex
[ci skip] Set the transparency will affect the labelTTF
|
2015-08-19 11:41:58 +08:00 |
Dale Stammen
|
8493365be7
|
updates to pass Windows App Certification tests
|
2015-08-18 11:06:47 -07:00 |
WenhaiLin
|
5cdfdf8497
|
[ci skip][Android Studio Projects]Update Gradle Plugin from 1.2.3 to 1.3.0
|
2015-08-18 22:37:00 +08:00 |
VisualSj
|
4d9a61569a
|
Set the transparency will affect the labelTTF
|
2015-08-18 18:30:03 +08:00 |
pandamicro
|
2d1fcecfa5
|
Add default viewport meta to js templates
|
2015-08-17 18:56:10 +08:00 |
andyque
|
9a83ed9b28
|
remove unneeded protocol in AppController.h.
|
2015-08-12 13:55:36 +08:00 |
pandamicro
|
a89a3c0c56
|
Merge pull request #13184 from pandamicro/v3.7.1
[ci skip]Add remote debugger support in JS templates
|
2015-08-04 11:18:18 +08:00 |
pandamicro
|
06bd3b8868
|
Add remote debugger support in JS templates
|
2015-08-04 11:16:58 +08:00 |
WenhaiLin
|
875d01573a
|
[Android Studio Projects]Update Gradle from 2.2.1 to 2.4
|
2015-07-31 21:20:42 +08:00 |
pandamicro
|
3fa016a280
|
Fix win32 project and add winrt support
|
2015-07-30 23:39:52 +08:00 |
pandamicro
|
f53ba42b3b
|
Fix test issues and Add audio engine to js templates
|
2015-07-29 21:22:44 +08:00 |
Wenhai Lin
|
70628c9dec
|
Fixed link errors on iOS/Mac
|
2015-07-29 13:59:58 +08:00 |
Vincent Yang
|
e4a8aeee45
|
Fixed #12962 : Scene can't have std::vector member.
|
2015-07-24 11:16:45 +08:00 |
pandamicro
|
bd1f5b4a39
|
Merge pull request #12911 from natural-law/portrait-support
Fixed #12252 : Support new portrait projects from templates.
|
2015-07-23 15:38:32 +08:00 |
pandamicro
|
6029ca3edd
|
Merge pull request #12949 from yangws/issue_12906
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
|
2015-07-22 16:17:14 +08:00 |
Vincent Yang
|
3addf38134
|
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
|
2015-07-22 12:01:34 +08:00 |
ZhangMenghe
|
b6c566d87e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into setClearColor
|
2015-07-22 11:40:30 +08:00 |
ZhangMenghe
|
94aa382669
|
Add testCase for setClearColor
|
2015-07-21 15:18:19 +08:00 |
Bin Zhang
|
abd8a563dc
|
Support new portrait project from js templates.
|
2015-07-20 09:58:40 +08:00 |
Wenhai Lin
|
45e0eda81c
|
Fixed compile error
|
2015-07-17 11:34:26 +08:00 |
pandamicro
|
436564f922
|
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
docs/RELEASE_NOTES.md
web
|
2015-07-15 14:39:40 +08:00 |
Bin Zhang
|
55890f6206
|
Update the JS templates to keep the directory structure is same with before.
|
2015-07-14 18:07:17 +08:00 |
andyque
|
fc673ee502
|
Merge branch 'v3.7-release' into v3
|
2015-07-13 22:44:54 +08:00 |
andyque
|
1ea7926083
|
fix js template run error on linux.
|
2015-07-10 10:19:36 +08:00 |
andyque
|
451bedbaad
|
change sign team to none.
|
2015-07-07 22:02:35 +08:00 |
andyque
|
04ade7c16e
|
remove xcode scheme
|
2015-07-07 14:57:25 +08:00 |
andyque
|
302976b603
|
add shared scheme to iOS & Mac project.
|
2015-07-07 14:24:17 +08:00 |
pandamicro
|
613fde6573
|
Fix video player and web view in js template
|
2015-07-02 11:48:13 +08:00 |
pandamicro
|
5b9b130223
|
Add video player and web view to template
|
2015-06-29 18:23:01 +08:00 |
WenhaiLin
|
cbb073e905
|
Fixed Application may be created more than once on Android.
|
2015-06-23 16:58:38 +08:00 |
pandamicro
|
1bf8292e06
|
Merge pull request #12442 from natural-law/update-templates
Update the VS projects of templates.
|
2015-06-19 10:38:02 +08:00 |
江龙
|
61db9ef103
|
modify cocos2d_specifics , add navmesh head file。 modify template。add navmesh head file and register code
|
2015-06-18 23:21:53 +08:00 |
Bin Zhang
|
a4ecfdb7e2
|
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
|
2015-06-18 22:00:57 +08:00 |
Bin Zhang
|
01cb135e77
|
Solve the error in the VS project of templates.
|
2015-06-17 18:06:09 +08:00 |
tangziwen
|
b84531ea04
|
add librecast to js and lua templates
|
2015-06-17 13:39:28 +08:00 |
Dale Stammen
|
511fe6a773
|
added missing lib references
|
2015-06-15 20:10:38 -07:00 |
Dale Stammen
|
74f4d29fa9
|
added missing librecast
|
2015-06-15 20:06:54 -07:00 |
pandamicro
|
f3765a4c5f
|
Fix physics 3d macro include issue
|
2015-06-12 15:58:43 +08:00 |
pandamicro
|
70606caa14
|
Fix template android compilation issue on physics3d
|
2015-06-10 19:37:52 +08:00 |
Dale Stammen
|
af69c5e0e8
|
fixed pch.h file for cocos2d-js
|
2015-06-03 09:54:32 -07:00 |
Dale Stammen
|
e1a5d71ad6
|
removed incorrect pch.h
|
2015-06-03 09:52:25 -07:00 |
Dale Stammen
|
f778b02aa0
|
updated js template files for Windows 8.1 Universal App
|
2015-06-03 09:25:19 -07:00 |
andyque
|
a6649e24fe
|
fix resource not copy issue on windows
|
2015-06-01 18:59:27 +08:00 |
Bin Zhang
|
c491b6a5c1
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2015-05-25 17:01:29 +08:00 |
Bin Zhang
|
3298145eb5
|
Support build & run Android Studio project in console.
|
2015-05-25 16:53:36 +08:00 |
Bin Zhang
|
3d0c716ee9
|
Add script in build.gradle for sign the release apk.
|
2015-05-22 15:52:41 +08:00 |
Bin Zhang
|
94e2e1cb00
|
Modify the configuration for android studio support in console.
|
2015-05-21 18:27:30 +08:00 |
Bin Zhang
|
41792caa6b
|
Add files & configuration for android studio support in console.
|
2015-05-21 16:34:03 +08:00 |
Bin Zhang
|
78d4089215
|
Add the project.properties for the ndk-build of proj.android-studio.
|
2015-05-21 15:43:01 +08:00 |
Bin Zhang
|
37dddf9b15
|
Add execute permission for the gradlew in proj.android-studio.
|
2015-05-21 15:31:18 +08:00 |
Dale Stammen
|
209e7c62f4
|
added libbullet to Windows 8.1 Universal App projects
|
2015-05-20 08:01:01 -07:00 |