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 |
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 |
Sergey
|
49f26f3fbf
|
lua template & android-build.py updated
|
2014-05-20 13:49:02 +04: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 |
bofeng-song
|
20346d8ef6
|
lua runtime, support custom orientation
|
2014-05-14 15:02:24 +08:00 |
chuanweizhang2013
|
ee4b6ba2bc
|
add visibleRect
|
2014-05-08 13:57:34 +08:00 |
cw
|
c9a7c44537
|
rename mac simulator app's file simulatorconfig class
|
2014-05-07 11:10:46 +08: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 |
chuanweizhang2013
|
eb6ef4d067
|
tab to 4 space
|
2014-04-10 15:51:25 +08:00 |
cw
|
d34fddb06e
|
rename lua folder
|
2014-04-09 17:03:38 +08:00 |
Dhilan007
|
c642d4d4c4
|
update templates for remove native activity
|
2014-03-25 15:43:42 +08:00 |
chuanweizhang2013
|
0dc85e42a7
|
modify module_path
|
2014-03-13 09:51:43 +08:00 |
cw
|
133a68f614
|
add runtime template
|
2014-03-11 16:52:06 +08:00 |