SunLightJuly
f321f725b0
fixed Java_org_cocos2dx_lua_AppActivity_nativeIsDebug(): return false only, because runtime have been removed
2015-03-13 16:12:08 +08:00
CocosRobot
5203d1e7be
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-13 07:20:18 +00:00
SunLightJuly
8c196847cb
add security framework to Mac template project of Lua
2015-03-12 19:18:06 +08:00
CocosRobot
54ac9ef67f
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-11 07:32:59 +00:00
minggo
44b1f77fa3
Merge pull request #10799 from SunLightJuly/v3_remove_simu
...
V3 remove simulator
2015-03-11 15:31:17 +08:00
SunLightJuly
608ed24180
Synchronization with V3
2015-03-11 00:02:50 +08:00
SunLightJuly
6c2eb01213
cleanup proj.android
2015-03-10 23:33:09 +08:00
SunLightJuly
b77801a99b
cleanup proj.win32
2015-03-10 22:56:03 +08:00
Mazyad Alabduljaleel
52524ae453
add security framework to Mac template project
2015-03-10 14:57:21 +04:00
Mazyad Alabduljaleel
983ffd96c7
Now, mac uses ObjC HTTP client
2015-03-10 14:48:57 +04:00
SunLightJuly
ba55f14fbf
removed runtime in libsimulator
2015-03-10 18:28:59 +08:00
SunLightJuly
aac4d6f846
removed CodeIDESupport.h
2015-03-10 11:12:42 +08:00
SunLightJuly
ff8c0dac2b
removed framework of simulator
2015-03-10 10:51:16 +08: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
0dc7da3e6d
Fix lua-template-default win32 project
...
Modify project to copy resource files to folder where exe file located.
This commit should fix lua-template-default after https://github.com/cocos2d/cocos2d-x/pull/10431 was commited.
2015-03-10 00:19:23 +03: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
SunLightJuly
18914a764e
removed template of runtime
2015-03-10 01:00:23 +08: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
CocosRobot
3f7e2eb1ff
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-09 09:45:58 +00: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
CocosRobot
f46817eac7
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-09 02:59:36 +00:00
CocosRobot
d7d85625fa
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-09 02:23:45 +00:00
CocosRobot
1498c18d1b
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-06 08:12:23 +00:00
samuele3hu
1844fdd806
Fix the error that Android.mk for lua template re-assign the value of LOCAL_C_INCLUDES
2015-03-06 15:41:48 +08:00
CocosRobot
721804a30e
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-04 08:13:38 +00:00
Dale Stammen
44b951a51a
Merge branch 'v3' into v3-wp8-fix
2015-03-02 16:42:05 -08:00
minggo
1608e26a43
Merge pull request #10642 from CocosRobot/update_cocosfiles_1425031927
...
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-28 09:36:32 +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
minggo
0365b5dd4c
Merge pull request #10645 from yinjimmy/orig-v3
...
update runtime to 2.0
2015-02-27 18:31:07 +08:00
CocosRobot
a5a1bd3994
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-27 10:12:08 +00:00
minggo
503c46a9e8
Merge pull request #10286 from flamefox/v3_fix_dos2unix
...
fix dos2unix not in run path, on new lua project
2015-02-27 16:35:02 +08:00
yinjimmy
2042633294
update runtime to 2.0
2015-02-27 14:49:04 +08:00
CocosRobot
9cecd68064
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-26 04:26:17 +00:00
Ray
bfb5c1ca23
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-02-26 10:44:20 +08:00
CocosRobot
0072400fc9
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-26 01:40:45 +00:00
SunLightJuly
4dd4e7d703
call function "register_all_packages()" in default template of cpp
2015-02-25 00:25:40 +08:00
SunLightJuly
ec22923aa9
modifed AppDelegate.cpp: add function "register_all_packages()" to support packages manager
2015-02-24 20:50:58 +08:00
CocosRobot
92806f7919
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-24 01:27:05 +00:00
CocosRobot
2947fd95d6
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-20 01:14:18 +00:00
CocosRobot
83fed82923
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-15 12:00:05 +00:00
CocosRobot
33be077835
[AUTO][ci skip]: updating cocos2dx_files.json
2015-02-15 11:50:10 +00: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
flamefox
deb5fd46ff
add dos2unix.exe to templates\cocos2dx_files.json
2015-01-30 11:14:51 +08:00
CocosRobot
ebf6f2728f
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-29 02:57:47 +00:00
Jacky
da76cfdc79
add multiple touches toggle to iOS.
2015-01-23 15:09:46 +08:00
CocosRobot
c1e586ebab
[AUTO][ci skip]: updating cocos2dx_files.json
2015-01-21 08:07:36 +00:00