James Chen
|
2c0cc603d1
|
Merge branch 'master' into develop
Conflicts:
extensions/cocos-ext.h
|
2013-06-18 10:46:25 +08:00 |
James Chen
|
a828d5f1a6
|
[Windows] multi-platform-lua fix.
|
2013-06-17 15:55:37 +08:00 |
James Chen
|
ccb67cbcb4
|
Template fix for iOS Template.
|
2013-06-17 15:54:12 +08:00 |
James Chen
|
c0d44cb2e4
|
fixed #2129: Rename m_iVar to _var, remove CC prefixes.
|
2013-06-15 14:03:30 +08:00 |
minggo
|
cd5bcb87af
|
issue #2284: merge master and fixed some conflicts
|
2013-06-13 17:54:05 +08:00 |
minggo
|
e8fb1f4da0
|
copy lua script when creating a project by create-android-project.sh
|
2013-06-10 22:35:05 +08:00 |
James Chen
|
be0efac2d7
|
[Mac] Updating multi-platform-cpp/proj.mac/HelloCpp.xcodeproj.
|
2013-06-10 14:57:18 +08:00 |
James Chen
|
b9e0be8d10
|
[Template] Updating multi-platform-lua/proj.marmalade/HelloLua.mkb.
|
2013-06-10 14:55:26 +08:00 |
James Chen
|
1e527c1d52
|
[Template] Updating iOS template project of multi-platform-lua. Using AudioEngine module.
|
2013-06-10 14:20:53 +08:00 |
James Chen
|
47b2a65faf
|
[Template] Updating iOS template project of multi-platform-cpp.
|
2013-06-10 14:18:24 +08:00 |
James Chen
|
cd40b42761
|
[Android] Updating multi-platform-lua/proj.android/.project
|
2013-06-10 13:19:16 +08:00 |
James Chen
|
6986acf8a4
|
[Win32] Deleting vs template, please use 'tools/project-creator' to create multi-platform project instead.
|
2013-06-10 12:26:54 +08:00 |
James Chen
|
328282f88f
|
CCScriptEngineManager::sharedManager()->purgeSharedManager(); --> CCScriptEngineManager::purgeSharedManager();
|
2013-06-10 11:54:23 +08:00 |
minggo
|
bd660e708d
|
issue #2103: copy lua script in lua multi-platform project
|
2013-06-09 11:39:18 +08:00 |
minggo
|
0e66dc8712
|
issue #2103: add lua files for lua multi-template project
|
2013-06-09 11:06:30 +08:00 |
James Chen
|
7c650d7f28
|
[BB] Updating project configuration.
|
2013-06-07 18:45:58 +08:00 |
James Chen
|
3fc675a6df
|
[BB] Updating project configuration. especially for multi-platform-cpp/lua template.
|
2013-06-07 18:38:00 +08:00 |
James Chen
|
ec8ab8bd8b
|
Updating multi-platform-xxx template for win32.
|
2013-06-07 12:57:28 +08:00 |
James Chen
|
d72e9d10b5
|
Updating multi-platform-xxx template for win32.
|
2013-06-07 12:50:02 +08:00 |
James Chen
|
d5bbcce165
|
[iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp.
|
2013-06-06 18:09:44 +08:00 |
James Chen
|
6f52d72b82
|
[iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp.
|
2013-06-06 18:07:11 +08:00 |
James Chen
|
d32eaedd59
|
Removing CODE_SIGN_IDETITY section in prom.pbxproj.
Conflicts:
samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj
samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj
|
2013-06-06 15:05:54 +08:00 |
James Chen
|
f22d320797
|
Removing CODE_SIGN_IDETITY section in prom.pbxproj.
|
2013-06-06 14:24:58 +08:00 |
minggo
|
d71e07db4e
|
fixed conflict
|
2013-06-05 13:48:31 +08:00 |
minggo
|
b0937a5a2d
|
issue #2257:change copyright of template
|
2013-06-05 11:25:39 +08:00 |
minggo
|
6491ff75cf
|
issue #2257: make ios template work
|
2013-06-05 11:21:04 +08:00 |
James Chen
|
bb635c280c
|
Updating multi-platform-xxx template for iOS and Android after enabling c++ 11.
|
2013-06-04 20:52:29 +08:00 |
James Chen
|
b88a222fc5
|
Updating multi-platform-xxx template for iOS and Mac.
|
2013-06-04 20:37:24 +08:00 |
James Chen
|
3b673547cc
|
Updating multi-platform-xxx template for iOS and Mac.
|
2013-06-04 19:49:03 +08:00 |
Jaroslaw Lewandowski
|
3f7c506638
|
Ability to save/retrieve CCData into/from CCUserDefault
|
2013-05-29 01:06:41 +01:00 |
James Chen
|
d402b349e2
|
issue #2092: Updating win32 project configuration.
|
2013-05-20 21:12:25 +08:00 |
James Chen
|
f6297aeb33
|
Updating iOS template.
|
2013-05-20 21:06:37 +08:00 |
James Chen
|
78000c70fc
|
[iOS] Template fix.
|
2013-05-19 18:12:14 +08:00 |
James Chen
|
3ce8de8904
|
[BB]Adding COCOS2D_DEBUG=1 .
|
2013-04-27 15:17:18 +08:00 |
James Chen
|
7f128cfd11
|
[BB] Updating project configuration of multi-platform-lua.
|
2013-04-27 15:16:29 +08:00 |
James Chen
|
02afbaaa53
|
Fixing errors in multi-platform-lua for BB.
|
2013-04-27 15:08:28 +08:00 |
James Chen
|
cf53d264f9
|
[Blackberry] Adding .gitkeep, updating bb project for multi-platform-lua
|
2013-04-27 15:04:55 +08:00 |
James Chen
|
edc8444ca4
|
Updating blackberry project configurations.
|
2013-04-27 14:07:54 +08:00 |
James Chen
|
ec3d870231
|
[Linux]Updating template of multi-platform-cpp
|
2013-04-27 11:18:09 +08:00 |
minggo
|
89591fdccc
|
fixed #2084:add lua loader for all platforms
|
2013-04-26 12:12:19 +08:00 |
James Chen
|
5337234e22
|
Android also uses executeScript to load lua source file or byte code file. So unused codes need to be deleted.
|
2013-04-25 21:31:52 +08:00 |
James Chen
|
2c69ce8d80
|
fixed #2075: Updating multi-platform template project settings.
|
2013-04-24 15:56:37 +08:00 |
James Chen
|
f129b94e2d
|
Removing unused file(uthash.h) in JSB projects.
|
2013-04-19 11:09:02 +08:00 |
minggo
|
78d3c7f048
|
fixed #1613:not reload resources on Android platform after return from background
|
2013-04-17 15:34:57 +08:00 |
James Chen
|
c311085dea
|
issue #1847: Updating multi-platform-lua/proj.ios/HelloLua.xcodeproj.
|
2013-04-17 10:00:56 +08:00 |
James Chen
|
79d58bcdb9
|
issue #1847: Adding sources of Luajit2.0.1-hotfix, and adding android support.
|
2013-04-16 17:34:58 +08:00 |
James Chen
|
854944c272
|
Updating iOS template.
|
2013-04-09 15:30:37 +08:00 |
billy1380
|
cdfe693583
|
- changed cocos2d mac project to support universal build and x86
- fixed issues associated with that
|
2013-03-23 16:04:51 +00:00 |
fape
|
9c6a65d898
|
Update template android projects README files
|
2013-03-21 19:06:58 +01:00 |
minggo
|
ae9675c3bd
|
fix some bugs when creating android project with multi-platform tool
|
2013-03-21 06:20:19 +08:00 |