yinjimmy
|
4280ffcf58
|
add new lua runtime
|
2014-12-27 02:21:55 +08:00 |
honghui
|
118569c972
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-11-30 15:37:30 +08:00 |
honghui
|
047c36a270
|
update runtime template
|
2014-11-29 16:05:18 +08:00 |
honghui
|
84a8c75ad5
|
Split Runtime.cpp to individual class files
|
2014-11-24 11:14:35 +08:00 |
dualface
|
cee999ebbb
|
update lua-template-default, lua-template-runtime, fix same proj problems.
|
2014-10-14 16:55:38 +08:00 |
honghui
|
b513dbafb5
|
read config.json may failed caused by syntax error
|
2014-09-24 11:43:21 +08:00 |
honghui
|
86416e73ca
|
sync code from default template
|
2014-09-16 16:19:05 +08:00 |
honghui
|
d5a8904fbb
|
open WIFI is not necessary for runtime
|
2014-09-11 17:04:26 +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
|
471820568f
|
Update android.mk of cocos and lua-templates
|
2014-08-27 10:28:04 +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
|
22a48fb760
|
Update cpp and lua template to support cocos3d lib
|
2014-08-18 19:23:03 +08:00 |
samuele3hu
|
97d8d27eec
|
Add LOCAL_WHOLE_STATIC_LIBRARIES for lua-template-runtime on android
|
2014-08-14 21:58:40 +08:00 |
samuele3hu
|
1976b66ab8
|
Make lua-template-default support all modules
|
2014-08-14 21:27:02 +08:00 |
samuele3hu
|
032f5ea781
|
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
|
2014-08-14 00:06:28 +08:00 |
zhangbin
|
e766a22bda
|
Adjust the lua templates for the lua modules.
|
2014-08-13 14:29:14 +08:00 |
samuele3hu
|
3c3c05204f
|
Split files in lua-bindings/script into different module and adjust related project
|
2014-08-11 12:54:30 +08:00 |
samuele3hu
|
00865c8abb
|
Modify the mechanism that files copy to lua-empty-test and lua-template
|
2014-08-08 15:22:12 +08:00 |
samuele3hu
|
0421c24d16
|
Modify lua-template-default and lua-template-runtime project
|
2014-08-07 13:54:54 +08:00 |
chuanweizhang2013
|
53fde9d7c6
|
add support x86 atomicops_internals_x86_gcc
|
2014-07-15 17:40:43 +08:00 |
chuanweizhang2013
|
b8767420db
|
Add support keep screen on when is debug
|
2014-07-12 16:29:39 +08:00 |
chuanweizhang2013
|
39b03de8a9
|
revert Android.mk
|
2014-07-04 15:39:07 +08:00 |
chuanweizhang2013
|
e32eadc364
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
|
2014-07-04 13:36:51 +08:00 |
minggo
|
d8c9f6a0a6
|
add regular support in Node::enumerateChildren()
|
2014-07-02 17:07:36 +08:00 |
chuanweizhang2013
|
b80d825421
|
commit
|
2014-06-26 04:41:54 -07:00 |
chuanweizhang2013
|
7f75b58acf
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
Conflicts:
templates/lua-template-runtime/cocos-project-template.json
|
2014-06-23 17:30:33 +08: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
|
bf4f30d14b
|
Add new line at the end of a file to *.cpp
|
2014-06-19 20:45:24 +09:00 |
gin0606
|
2c837b0960
|
add new line at the end of a file to *.mk
|
2014-06-19 20:43:27 +09:00 |
chuanweizhang2013
|
be8775e314
|
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime
|
2014-06-19 17:23:36 +08:00 |
chuanweizhang2013
|
e1d7871089
|
add mac android support
|
2014-06-19 11:27:31 +08:00 |
Dhilan007
|
648e7767d4
|
fixed can't move app to SD card after installed on android.
|
2014-06-17 12:03:20 +08:00 |
cocoscodeide
|
2d4297d14e
|
Merge pull request #34 from cocos2d/v3
merge from cocos2d-x
|
2014-06-13 14:14:25 +08:00 |
cw
|
3807c7cffc
|
resource to binary
|
2014-05-30 13:53:49 +08:00 |
chuanweizhang2013
|
4b812f8b80
|
modify runtime folder
|
2014-05-30 11:00:26 +08:00 |
minggo
|
866a1cb9aa
|
Merge pull request #6820 from newnon/v3_android_improvements
Android project improvements
|
2014-05-27 10:17:03 +08:00 |
chuanweizhang2013
|
1b3af4be19
|
move runtime res path
|
2014-05-22 22:08:04 +08:00 |
Sergey
|
49f26f3fbf
|
lua template & android-build.py updated
|
2014-05-20 13:49:02 +04:00 |
cw
|
1aa92bdef0
|
add java nativeIsDebug
|
2014-05-20 13:53:52 +08:00 |
cw
|
84d66219c8
|
fixed android degbug
|
2014-05-20 11:44:46 +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 |
minggo
|
bf2250a67a
|
Merge pull request #6738 from cocoscodeide/v3
update template project lua
|
2014-05-16 18:10:10 +08:00 |
Jason Xu
|
67a558c83d
|
for 93562d6aa6
update Cocos2dxHelper and AndroidManifest.xml template.
|
2014-05-16 15:55:00 +08:00 |
bofeng-song
|
c0297c6e5f
|
add support for reverse orientation for android
|
2014-05-15 17:58:23 +08:00 |
bofeng-song
|
d0d20e7272
|
fix build err
|
2014-05-14 15:52:58 +08:00 |
bofeng-song
|
668ed34512
|
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
|
2014-05-14 15:03:07 +08:00 |
bofeng-song
|
20346d8ef6
|
lua runtime, support custom orientation
|
2014-05-14 15:02:24 +08:00 |
cw
|
cc5ba9b2b1
|
modify android orientation
|
2014-05-14 14:40:27 +08:00 |
chuanweizhang2013
|
c8d871a60b
|
modify read config time
|
2014-05-13 15:56:39 +08:00 |
chuanweizhang2013
|
48566b70e0
|
add ignore .gz
|
2014-05-08 20:59:24 +08:00 |