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
Anton Sokolchenko
41b51168d0
CMake fix for template projects
2014-10-15 16:33:58 +03:00
Dale Stammen
420a19f222
run app after setting delegates
2014-10-14 18:12:24 -07:00
Dale Stammen
4313ff8cc9
updated wp8 include file
2014-10-14 16:53:56 -07:00
Huabing.Xu
fcc892d90e
add missed external module for cocos console on linux
2014-10-13 16:52:14 +08:00
NeoLeeee
a5a16eecbf
the android library path is wrong
...
if you run the following command in your game forder
cocos run -p android
it will give you the following error since the path is wrong
BUILD FAILED
/Users/lifeng/dev/adt_bundle_mac/sdk/tools/ant/build.xml:459: ../../../cocos/platform/android/java resolve to a path with no project.properties file for project /Users/lifeng/study/cosco2dx/MyFirstGame/proj.android
2014-10-10 01:33:41 +08:00
minggo
3873bbc5f7
Merge pull request #8060 from giuslape/v3
...
Update Reference plugin-x
2014-10-08 09:39:45 +08:00
minggo
8a5829631d
Merge pull request #8171 from huangshiwu/v3_Teivaz
...
Enable screen orientation change handling - by Teivaz
2014-09-29 18:02:03 +08:00
minggo
6583bf6b1f
Merge pull request #8179 from MSOpenTech/wp8-v3-fix
...
WP8 fixes for v3.3 app certification tests
2014-09-29 13:42:40 +08:00
Krzysztof Jusiak
bb01201fa6
fix for wrong directory in linux cpp-template
2014-09-27 10:38:10 +01:00
Dale Stammen
1f9d260207
added updated template files
2014-09-26 11:03:10 -07:00
huanghsiwu
7a2a44ad88
Enable screen orientation change handling - by Teivaz
2014-09-26 16:16:34 +08:00
minggo
ebf0562b84
remove armv7s support on iOS
2014-09-26 10:35:50 +08:00
minggo
2620592d62
Merge pull request #7975 from newnon/v3_openUrl
...
openUrl function for all platform but on windows RT empty function
2014-09-25 13:41:08 +08:00
minggo
6a437d79b1
Merge pull request #8138 from MSOpenTech/wp8-v3.3
...
WP8 v3.3 bug fixes
2014-09-25 10:39:37 +08:00
minggo
04aa44aeea
Merge pull request #8141 from huangshiwu/v3_wp8test
...
fix Class TextFieldTTF's keyboard input bug on WP8 platform
2014-09-25 09:40:10 +08:00
huanghsiwu
49f1927d5d
fix Class TextFieldTTF's keyboard input bug on WP8 platform
2014-09-25 07:41:51 +08:00
Dale Stammen
1146f1a8db
use CCGLViewImpl.h
2014-09-24 08:38:48 -07:00
Sergey Perepelitsa
d8216149de
precompiled headers improvements for iOS & Mac
2014-09-23 23:19:25 +04:00
Guy Kogus
6e91c65e74
Windows Phone 8 can now open URLs.
2014-09-22 17:47:38 +04:00
minggo
3f7fc6ead1
Merge pull request #8111 from joewan/v3
...
fix compile on ubuntu.
2014-09-22 09:38:52 +08:00
joewanchen
3f2895beab
fix compile on ubuntu.
2014-09-21 23:49:43 +08:00
minggo
45d311bb34
remove dependence of CoreGraphics for on mac
2014-09-19 14:02:13 +08:00
samuele3hu
0c2268d85e
Update release configure setting for cpp template
2014-09-16 09:57:10 +08:00
Giuseppe Lapenta
3c76e6fecd
Update Reference for template
2014-09-15 17:55:39 +02:00
andyque
d6bacea506
fix resource path
2014-09-15 16:40:32 +08:00
andyque
8b4a7902ec
fix cpp template compile
2014-09-15 14:43:41 +08:00
zhangbin
0f62ac19c0
Modify the config file in template for the folder rename.
2014-09-15 13:56:15 +08:00
huangshiwu
42c193c424
change-template-folder-name --win32 and wp8
2014-09-15 11:04:07 +08:00
minggo
a9232a14ea
res->Resources src->Classes for cpp template
2014-09-13 17:50:02 +08:00
minggo
11f9eaa4a0
fix template compiling error
2014-09-12 15:02:18 +08:00
huangshiwu
7372604f7f
fix wp8 compile error and modify default resource path
2014-09-05 11:21:08 +08:00
minggo
b37ef4e1c3
remove unneeded files
2014-09-03 11:52:19 +08:00
zhangbin
e24a903c88
Solve the problem: gdbserver is not copied to directory proj.android/libs when ndk-build with NDK_DEBUG=1.
2014-08-28 16:13:11 +08:00
samuele3hu
33fd605a16
Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.
2014-08-27 10:18:44 +08:00
samuele3hu
74624f5ba1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
2014-08-25 11:52:52 +08:00
samuele3hu
893e0b0a08
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-08-25 11:45:29 +08:00
minggo
e5ac6e204b
Merge pull request #7864 from minggo/module-devide
...
Module devide
2014-08-25 11:01:19 +08:00
minggo
030f80a257
one static library for c++ and another one for lua-binding
2014-08-24 03:52:51 -07:00
huangshiwu
07af58c0c2
OpenGL context attributions setting revise -2
2014-08-22 16:22:16 +08:00
samuele3hu
a3e4402c5f
Adjust cpp-template-default template
2014-08-22 13:50:28 +08:00
teivaz
312f57d7a6
- [WP8] Now replacing application display name with project name
2014-08-21 18:49:52 +03:00
teivaz
ebb0876d29
* [WP8] Fixed resource search path in template
2014-08-19 21:44:46 +03:00
teivaz
5cdbf4c04c
* [WP8] Fixed paths in template
2014-08-19 19:57:06 +03:00
samuele3hu
22a48fb760
Update cpp and lua template to support cocos3d lib
2014-08-18 19:23:03 +08:00
samuele3hu
76a9382a91
Rename folder names of cpp-template: ‘Classes’—>’src’ ,’Resource’—>’res’ and adjust the template project except wp8
2014-08-15 00:08:15 +08:00
samuele3hu
d9fdfb2659
Modify cpp-template-default project configure
2014-08-12 17:05:39 +08:00
huangshiwu
24d68305e1
WP8 compile fix
2014-08-07 11:56:28 +08:00
Mircea Rila
119ca86e3f
additional fixes for win32 project
2014-08-05 11:29:04 +03:00
Mircea Rila
d808581d2b
fix win32 template project
2014-08-05 10:43:29 +03:00
Mircea Rila
5720df4336
add VS 2013 support for C++ template
2014-08-05 10:11:04 +03:00
huangshiwu
ef69faf3ba
GLView Hook
2014-07-31 00:53:04 +08:00
陈广歧
5063ec465b
Fixed error for importing project
...
fixed error for importing android project to Eclipse
```
The import org.cocos2dx.lib cannot be resolved ...
```
2014-07-19 19:35:30 +08:00
Dale Stammen
d0c15bc1d8
updated cpp template to support EVENT_RENDERER_RECREATED
2014-07-15 07:23:40 -07:00
Ricardo Quesada
cc0a27e83e
default OS Target for OS X is 10.7
2014-07-14 18:39:36 -07:00
minggo
62b9c72609
Merge pull request #7281 from aslmaswd/v3-cmake
...
CMake Fix:GLFW header
2014-07-14 11:18:51 +08:00
zhangbin
af5cf0a33f
Add configuration in templates to set the bundle identity of Mac & iOS project.
2014-07-08 10:22:08 +08:00
minggo
d8c9f6a0a6
add regular support in Node::enumerateChildren()
2014-07-02 17:07:36 +08:00
GS
8a4fab2b1f
add another possible GLFW header location
2014-07-02 10:11:51 +08:00
Dale Stammen
33e39b5786
added source files for component to be consistent with other platforms templates
2014-06-25 09:51:32 -07:00
Dale Stammen
97d126d300
added source files for component to be consistent with other platforms templates
2014-06-25 09:50:40 -07:00
minggo
7553060ba7
Merge pull request #7146 from gin0606/addNewLineAtTheEndOfFileCpp
...
[ci skip]Add new line at the end of a file to *.[cpp|h]
2014-06-19 20:47:17 +08:00
gin0606
3ae8e29ce5
Add new line at the end of a file to *.h
2014-06-19 20:45:49 +09:00
gin0606
2c837b0960
add new line at the end of a file to *.mk
2014-06-19 20:43:27 +09:00
minggo
a2a6a4e70a
Merge pull request #7087 from MSOpenTech/wp8-v3-template
...
Wp8 v3 template and missing texture after app switch fixes
2014-06-17 13:49:24 +08:00
Dhilan007
648e7767d4
fixed can't move app to SD card after installed on android.
2014-06-17 12:03:20 +08:00
Dale Stammen
1a5d148d8e
updated template code
2014-06-16 10:29:40 -07:00
Dale Stammen
753167b5f2
updated xaml resources
2014-06-16 09:25:35 -07:00
Dale Stammen
2d913470a0
updated fast resume code for app
2014-06-12 16:36:53 -07:00
Dhilan007
5cd7ab97d9
fixed wrong WP8 project name when create project by console.
2014-06-09 16:17:19 +08:00
Dhilan007
fd4e233432
fixed WP8 project:compile error,missing files,wrong file path.
2014-06-06 15:41:17 +08:00
Dhilan007
3fcb75c82f
Fixed black screen may arise when using third SDK.
2014-06-04 13:54:44 +08:00
Dhilan007
52ad2063bd
Support Fast App Resume.
2014-06-04 11:19:53 +08:00
minggo
05df2a4db1
Merge pull request #6657 from asmodehn/asmo_newv3_cmake_win32
...
Fixing cmake project for win32
2014-05-29 15:25:58 +08:00
minggo
866a1cb9aa
Merge pull request #6820 from newnon/v3_android_improvements
...
Android project improvements
2014-05-27 10:17:03 +08:00
Dale Stammen
f3eb0d7722
updated cpp template file
2014-05-22 06:58:05 -07:00
Sergey
1ff2a03d16
debug mode by default
...
configuration switched to -b debug/release
2014-05-20 13:00:21 +04:00
Sergey
a489c19535
Android project improvements
...
(release/debug builds)
native debug support
2014-05-19 17:47:17 +04:00
Huabing.Xu
b69efe00a7
fix cpp template linux
2014-05-18 18:34:53 -07:00
Huabing.Xu
94228df977
fix cpp_template
2014-05-18 18:04:12 -07:00
cw
8db2882431
fixed head search path
2014-05-17 14:41:03 +08:00
Ricardo Quesada
0f67247325
Squashed commit of the following:
...
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 08:24:41 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into files
commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 15 19:36:23 2014 -0700
files in the correct directory
2014-05-16 14:36:00 -07:00
Jon Segador
64fa90ff0f
Vector2 replaced by Vec2
2014-05-16 16:21:36 +02:00
Jason Xu
67a558c83d
for 93562d6aa6
...
update Cocos2dxHelper and AndroidManifest.xml template.
2014-05-16 15:55:00 +08:00
AlexV
0bec438be8
Merge branch 'v3' of github.com:asmodehn/cocos2d-x into asmo_newv3_cmake_win32
2014-05-15 22:24:33 +09:00
minggo
354566d782
use RGBA8 as default pixel format
2014-05-15 09:56:26 +08:00
minggo
4356727465
Merge pull request #6619 from myourys/v3
...
update cpp-default-template for android *Eclipse*
2014-05-13 13:52:28 +08:00
AlexV
722a4d264e
basic fixes for win32 builds
2014-05-10 10:07:29 +09:00
minggo
8dba4e3b13
Merge pull request #6570 from gin0606/buildNativeVariableArguments
...
Upgrade build_native.py to take variable number of arguments
2014-05-08 13:59:16 +08:00
Hector
420439cdea
update cpp-default-template for android *Eclipse*
2014-05-08 11:20:25 +08:00
minggo
21aa7058e3
:= -> +=
2014-05-07 14:35:43 +08:00
minggo
976ef3e2a4
add some comment for dependences module in Android.mk to make it simple to use other module
2014-05-07 14:31:05 +08:00
Dale Stammen
12daf49900
added missing Assets folder
2014-05-05 13:48:31 -07:00
gin0606
dd8d932c0a
Upgrade build_native.py to take variable number of arguments
2014-05-05 12:48:51 +09:00
James Chen
8cbcf17163
issue #4674 : Re-added deleted source files.
2014-05-04 14:37:55 +08:00
James Chen
3b3c1c4dbb
issue #4674 : Removed large files and updated .gitignore
2014-05-04 14:36:16 +08:00
Ricardo Quesada
db68b9ca31
Lua and C++ compiles for linux
2014-05-01 15:23:20 -07:00
Ricardo Quesada
32f3fedb37
Moves cocos/2d/Android.mk to cocos/Android.mk
...
Easier to find Android.mk
2014-05-01 14:09:26 -07:00
James Chen
9b3f456f80
Merge pull request #6393 from Dhilan007/v3
...
template work on wp8 now
2014-04-28 14:08:06 +08:00
Dhilan007
698657a6ab
template work on wp8 now
2014-04-28 14:04:52 +08:00
Huabing.Xu
e6f7854225
clean for kazmath in project file
2014-04-28 13:14:22 +08:00
Huabing.Xu
62fbf3ff7c
template for linux cpp
2014-04-28 11:24:58 +08:00
Huabing.Xu
aa3859eddb
template work on IOS/Mac now
2014-04-28 11:10:55 +08:00
Huabing.Xu
feec24e3ef
Merge branch 'v3' into develop_migrate_math_lib_merge
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/CCNode.cpp
cocos/2d/CCRenderTexture.cpp
cocos/2d/platform/wp8/CCGLView.h
cocos/physics/CCPhysicsBody.cpp
extensions/physics-nodes/CCPhysicsSprite.cpp
extensions/physics-nodes/CCPhysicsSprite.h
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
2014-04-25 16:20:24 +08:00
James Chen
7beb8b78fe
Merge pull request #6325 from MSOpenTech/wp8-3.0-update
...
Wp8 3.0 update:
Background texture is now correctly oriented in Transition Effects
Accelerometer now works for WP8. Refactor of InputEvents was required to support adding Accelerometer event to rendering queue.
Console support for WP8.
Fixed cpp template for WP8. Added missing projects. Fixed property sheets.
Updates precompiled shaders
2014-04-25 10:41:58 +08:00
Huabing.Xu
f65973d9f0
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/2d/CCActionInterval.cpp
cocos/2d/CCLabelAtlas.cpp
cocos/2d/CCLabelBMFont.cpp
tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
2014-04-23 14:46:14 +08:00
袁全伟
56f9def298
Update AppDelegate.cpp
...
use getInstance replace :)
2014-04-22 13:20:07 +08:00
Dale Stammen
617982cbe5
added missing projects. Fixed property sheets
2014-04-19 10:09:53 -07:00
Huabing.Xu
95cb7721f6
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/2d/CCSprite.cpp
tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp
2014-04-15 22:21:04 +08:00
Huabing.Xu
7f61639541
replace Point with Vector2 in tests, extension folder
2014-04-15 18:23:40 +08:00
James Chen
cb807e61c2
closed #4607 : Fixed project created by template crashes on iOS5.1 device.
2014-04-15 11:56:50 +08:00
James Chen
43d6e1176a
issue #4729 : Compilation error fixes for linux
2014-04-10 00:36:42 +08:00
James Chen
96e7bad7e3
Updates templates for linux platform
2014-04-01 01:49:24 -07:00
Dale Stammen
101818ac62
added wp8 support files and projects
2014-03-28 15:44:15 -07:00
Dale Stammen
210f95c2d3
can't close app on WP8
2014-03-28 11:27:43 -07:00
Dhilan007
c642d4d4c4
update templates for remove native activity
2014-03-25 15:43:42 +08:00
James Chen
da0c15c982
Merge pull request #5847 from newnon/develop_small_improvements
...
Adds getCurrentLanguageCode() which returns iso 639-1 language code
2014-03-21 16:33:43 +08:00
James Chen
e89b203b13
Remove AccelerometerSimulation.h for cpp template.
2014-03-21 15:08:53 +08:00
Sergey
f65ef462e5
getCurrentLanguageCode() for all platforms return iso 639-1 language code
...
iPhone template improvements(for game center support)
2014-03-17 22:34:21 +04:00
minggo
656211a72f
add description for how to load .so
2014-03-12 21:28:38 +08:00
andyque
2c2a5ee38e
rename gui to ui
2014-03-12 10:46:49 +08:00
andyque
448b101578
fix linux compile error
2014-03-11 20:46:11 +08:00
Ricardo Quesada
aa4248ae10
kazmath updates for templates
2014-03-04 17:29:48 -08:00
Ricardo Quesada
4b57d41fd2
updates templates for Linux
2014-03-04 17:27:37 -08:00
James Chen
33a5be526c
Removes unused templates.
2014-03-04 09:46:32 +08:00