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
ee8a85fb9b
set version to 1.0.0.0 update GUID
2015-05-20 08:10:24 -07:00
Dale Stammen
209e7c62f4
added libbullet to Windows 8.1 Universal App projects
2015-05-20 08:01:01 -07:00
WenhaiLin
a569d877ba
[ci skip]Remove unnecessary code.
2015-05-20 18:05:46 +08:00
WenhaiLin
df3548673f
Remove unnecessary files.
2015-05-20 10:19:32 +08:00
minggo
e700ef6d30
Merge pull request #11856 from WenhaiLin/v3-support-android-studio
...
Add Android Studio support
2015-05-18 16:17:24 +08:00
WenhaiLin
26f094b1a7
Remove unnecessary files
2015-05-18 16:02:05 +08:00
WenhaiLin
54b6260dfd
Rename module
2015-05-18 15:17:05 +08:00
WenhaiLin
6dd3108e42
Rename module
2015-05-18 15:01:20 +08:00
WenhaiLin
68188f7424
Add native code for AS project.
2015-05-18 13:41:58 +08:00
WenhaiLin
7caa6bb2fc
Update Copyright.
2015-05-18 09:59:50 +08:00
WenhaiLin
dc8492948e
Add Android Studio support
2015-05-15 16:37:43 +08:00
Dale Stammen
40c19b31c8
updates to app.xaml code to correctly support touches on Microsoft AdControls for WP8.1
2015-05-12 19:39:40 -07:00
minggo
5e87bd307b
Merge pull request #11798 from WenhaiLin/v3-support-vs2015
...
Add support for visual studio 2015.
2015-05-13 09:37:12 +08:00
minggo
b51f78aa42
Merge pull request #11797 from super626/physics3d2
...
fix wrong indent and add const
2015-05-13 09:36:51 +08:00
Dale Stammen
f1fe802442
updated winrt keyboard support to support physical keyboard
2015-05-12 09:20:10 -07:00
songchengjiang
4756647016
add libbullet for template project
2015-05-12 16:34:10 +08:00
WenhaiLin
c70bac7bb4
Add support for visual studio 2015.
2015-05-12 16:26:28 +08:00
samuele3hu
037c17fe5d
Remove vs2012 support in v3
2015-05-05 16:11:26 +08:00
minggo
254a4b0b0c
Merge pull request #11660 from natural-law/v3
...
Rename the target name of Xcode project in templates.
2015-04-30 18:13:41 +08:00
zhangbin
fc9e5609c8
Rename the target name of Xcode project in templates.
2015-04-30 15:20:47 +08:00
minggo
4acd231f89
merge v3.6
2015-04-30 13:46:08 +08:00
Dale Stammen
dfee3ae3cb
added CC_WINDOWS_PHONE_8_1 to preprocessor defines
2015-04-29 10:23:22 -07:00
zhangbin
61cf0ad28b
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb
2015-04-23 15:46:19 +08:00
zhangbin
dcca32bd82
Update the CMakeLists & the remote url of submodule js-bindings.
2015-04-23 14:23:19 +08:00
Dale Stammen
102726784e
update windows 8.1 univeral app cpp-template files
2015-04-22 19:13:57 -07:00
Dale Stammen
662f8374ae
removed CC_PLATFORM_WINRT code. It is now allowed to exit a WinRT app
2015-04-22 17:58:10 -07:00
Dale Stammen
0c47df5df2
fixed typo. Changed KEY_BACKSPACE to KEY_ESCAPE in comments
2015-04-21 06:21:32 -07:00
Dale Stammen
83b68ef693
added comment on how back button event is handled
2015-04-20 18:36:58 -07:00
Dale Stammen
4169ebf5c8
Windows Phone 8.1 back button and terminate app support
2015-04-20 10:43:34 -07:00
Dale Stammen
a97d5c5370
added support for hardware back button on Windows Phone 8.1
2015-04-19 16:31:30 -07:00
Dale Stammen
178c241cdd
added back buttom function
2015-04-19 11:36:14 -07:00
Dale Stammen
731d7faf07
remove wp8 from cpp templates
2015-04-15 10:01:41 -07:00
Dale Stammen
b700798287
removed WP8 project files
2015-04-15 07:13:54 -07:00
Dale Stammen
272bb35246
Merge branch 'v3' into v3-wp8-fix
2015-04-08 07:29:45 -07:00
Wenhai Lin
b87b46a3d2
Disable the CDT builder of cpp-template-defualt
2015-04-08 16:29:10 +08:00
Dale Stammen
d8b6a0aaf9
removed unused method
2015-04-02 09:11:19 -07:00
Dale Stammen
344b44bdcb
fire foreground and background events
2015-04-02 09:08:16 -07:00
Dale Stammen
e2a5eb2f9f
updated to Angle ddbf057c52
2015-03-16 08:18:26 -07:00
Mazyad Alabduljaleel
52524ae453
add security framework to Mac template project
2015-03-10 14:57:21 +04:00
minggo
90db974c67
Merge pull request #10784 from vovkasm/fix-templates
...
Fix templates after change default resource search path on win32
2015-03-10 10:47:41 +08:00
Vladimir Timofeev
8e9ce48bab
Fix cpp-template-default win32 project.
...
Modify project to copy resource files to folder where exe files located.
This should fix cpp template to follow https://github.com/cocos2d/cocos2d-x/pull/10431 change.
The change was "Fix win32 resource search path to be relative to the executable."
2015-03-09 23:44:14 +03:00
Dale Stammen
35222a8193
Merge branch 'v3' into v3-wp8-fix
2015-03-09 09:20:25 -07:00
Dale Stammen
a828f73ccb
updated expiration date of project certificates
2015-03-09 08:31:06 -07:00
minggo
b8b1c9d018
Merge pull request #9708 from minggo/use-console
...
use cocos console in build_native.py and android-build.py
2015-03-09 16:41:56 +08:00
Dale Stammen
f68a966485
disabled Check SDL to allow CC_DEPRECATED to work as warning and not error
2015-02-27 11:07:51 -08:00
Dale Stammen
2eb919bb7a
disabled Check SDL to allow CC_DEPRECATED to work as warning and not error
2015-02-27 10:36:48 -08:00
SunLightJuly
4dd4e7d703
call function "register_all_packages()" in default template of cpp
2015-02-25 00:25:40 +08:00
minggo
058668711b
fix conflict
2015-02-13 16:44:14 +08:00
kompjoefriek
c0c55f885e
Removed trailing spaces
2015-02-12 22:38:07 +01:00
kompjoefriek
c6ab07ea02
fixed indentation of Python files
...
- Changed tabs to spaces
- Changed 2 spaces to 4 spaces
2015-02-12 21:22:19 +01:00
Jacky
da76cfdc79
add multiple touches toggle to iOS.
2015-01-23 15:09:46 +08:00
Dale Stammen
56d8e62409
added support for device orienation change. Fixed gravity for winrt landscape flipped
2015-01-19 09:38:49 -08:00
Dale Stammen
f53a493ac7
fixed automatic adding of resources
2015-01-12 11:56:58 -08:00
Dale Stammen
f466f4e986
added missing arial font that is required by WP8
2015-01-12 11:32:51 -08:00
WenhaiLin
2c728fa341
Fixed can't run new CPP project on android by Eclipse
2015-01-09 15:01:08 +08:00
dualface
c041787f01
update proj.android for template
2015-01-09 04:14:31 +08:00
dualface
156e9eb4f2
update templates
2015-01-06 08:31:43 +08:00
dualface
efada94e18
update proj.ios_mac
2015-01-05 17:56:34 +08:00
minggo
50914665e6
Merge pull request #9742 from huangshiwu/iosnetwork_template
...
ios template add security.framework
2014-12-31 15:15:08 +08:00
huangshiwu
ac2ff38624
ios template add security.framework
2014-12-31 14:46:34 +08:00
andyque
5d9274acf5
fix conflicts
2014-12-31 14:22:18 +08:00
minggo
a1e8dec384
use cocos console in build_native.py and android-build.py
2014-12-30 16:24:16 +08:00
andyque
9c974eebd0
fix libpng warning
2014-12-27 20:47:59 +08:00
andyque
79918d789e
fix cocos2d root
2014-11-28 08:24:48 -08:00
andyque
bdd46f7e55
fix linux cpp and lua template
2014-11-28 08:20:02 -08:00
Dhilan007
3025e937f6
Fixed compiling and linking error of new lua projects when using NDK r10 above.
2014-11-27 21:56:06 +08:00
Filipe Lemos
b722df671b
Fix CPU check on android template
2014-11-26 11:02:22 +00:00
Dale Stammen
6ad3a23ed3
added support for lost directx device
2014-11-25 08:25:34 -08:00
Dale Stammen
a607d41454
implemented lostDevice support when app loses the directx device
2014-11-21 16:24:51 -08:00
Dale Stammen
2a86c77066
added foreground, background, lostdevice support
2014-11-21 10:31:57 -08:00
Dale Stammen
5d2857b3c4
updated angle to commit 4a980d2612
2014-11-19 15:55:18 -08:00
zhangbin
365e09e5db
Merge branch 'v3' into support-wp8
2014-11-17 16:01:12 +08:00
zhangbin
4ef7c9f948
Modify the cpp template & tests to support compiling wp8-xaml & win8.1-universal project by console.
2014-11-14 16:48:14 +08:00
Ricardo Quesada
2e3b2d9f28
Merge pull request #9080 from vovkasm/cmake-refactoring
...
Cmake refactorings and fixes
2014-11-13 15:42:47 -08:00
Vladimir Timofeev
77ab866090
Move BuildHelpers.CMakeLists.txt to Modules/CocosBuildHelpers.cmake, this name is more standard for cmake include files, and in future this file can be installed to use by external applications.
2014-11-11 10:30:48 +03:00
Christopher O'Connell
5d26bc045c
Fixed failure in call to make when the android app folder contains spaces in the path.
2014-11-10 00:38:32 -07:00
Dale Stammen
af14b40ba0
must call DisplayInformation::GetForCurrentView() from main UI thread
2014-10-27 13:40:19 -07:00
Dale Stammen
510c8caed7
added DPI support for universal app
2014-10-27 11:12:54 -07:00
minggo
b99f0bf321
Merge pull request #8926 from MSOpenTech/wp8.1-universal
...
WP8.1 universal app
2014-10-25 15:45:50 +08:00
Dhilan007
788c793147
Fix CPP template on Window
2014-10-24 23:18:35 +08:00
Dale Stammen
3b8537b7e4
updated template files
2014-10-24 06:08:38 -07:00
Dale Stammen
f42afaa6bb
updated project files with new pch files
2014-10-23 19:40:57 -07:00
Dale Stammen
c38a37837a
added cpp template for windows 8.1 universal apps
2014-10-23 07:40:42 -07:00
Dale Stammen
f359c7285e
remove PhoneDirect3DXamlAppComponent namespace refactor
2014-10-23 07:21:48 -07:00
Dale Stammen
4596417a0b
remove PhoneDirect3DXamlAppComponent namespace. Updated edit text code
2014-10-23 07:19:05 -07:00
Dale Stammen
b7fd0dd722
remove PhoneDirect3DXamlAppComponent namesapce refactor
2014-10-23 07:17:58 -07:00
huanghsiwu
f549aa3747
fix wp8 template crash bug by modefy font resource's properties
2014-10-18 11:20:12 +08:00
minggo
b4ffad06eb
Merge pull request #8822 from huangshiwu/v3_fixtemplate
...
change ios and mac template's resource struct
2014-10-17 23:00:42 +08:00
huangshiwu
4802821efd
change ios and mac template's resource struct
2014-10-17 18:22:25 +08:00
Dhilan007
4bede5067e
Fix CPP template project crash
2014-10-17 17:02:22 +08:00
minggo
aa303e975f
Merge pull request #8776 from huangshiwu/v3_iphone6hires
...
add launch images to templates to support iPhone6 and iPhone6+'s native ...
2014-10-17 12:03:56 +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
ledenis
33d01965be
Changed deprecated LabelTTF::create() to Label::createWithTTF() in the HelloWorld
2014-10-16 16:58:24 +02: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
1692ee715f
Merge pull request #8728 from Dhilan007/v3-templatefix
...
Make resources output by Cocos Studio automatically packed into ipa
2014-10-16 14:00:48 +08:00
Dhilan007
fcee230cab
Make resources output by Cocos Studio automatically packed into ipa
2014-10-16 13:56:03 +08:00
Dale Stammen
5d479a30aa
updated wp8 cpp template
2014-10-15 09:49:24 -07:00
Anton Sokolchenko
60f4f71a83
small comment fix
2014-10-15 16:51:49 +03:00