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 |
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 |
yinjimmy
|
2042633294
|
update runtime to 2.0
|
2015-02-27 14:49:04 +08:00 |
SunLightJuly
|
ec22923aa9
|
modifed AppDelegate.cpp: add function "register_all_packages()" to support packages manager
|
2015-02-24 20:50:58 +08:00 |
htl
|
12010ce3da
|
fixed run lua samples 360 will popup access wifi note!
|
2015-01-21 15:30:05 +08:00 |
htl
|
52b03039fa
|
fixed show open wifi dialog on android without runtime
|
2015-01-20 19:15:44 +08:00 |
dualface
|
bc75849ac7
|
update template/runtime version
|
2015-01-16 23:22:03 +08:00 |
zhangbin
|
b1f9fb4b8e
|
Rename the Xcode target of libsimulator.
|
2015-01-16 14:29:48 +08:00 |
yinjimmy
|
6e8188d4ff
|
Fix lang file path for vs project
|
2015-01-15 14:04:15 +08:00 |
yinjimmy
|
9f60e82cc7
|
Fix compile error with lua-tempate-default / lua-template-runtime
|
2015-01-15 13:34:23 +08:00 |
yinjimmy
|
f652e1359a
|
1. Compatible vs2012 for libsimulator
2. Adjust output directory for simulator
|
2015-01-15 11:10:32 +08:00 |
yinjimmy
|
49869847cc
|
add default `-workdir` for vs project
|
2015-01-14 18:45:18 +08:00 |
yinjimmy
|
a80e26f680
|
cleanup
|
2015-01-14 16:27:29 +08:00 |
yinjimmy
|
bd3c250a6d
|
add proj.linux support
|
2015-01-14 14:44:48 +08:00 |
yinjimmy
|
bdf4393be0
|
Fix runtime output directory for Windows release mode
|
2015-01-14 10:18:00 +08:00 |
yinjimmy
|
49b265d147
|
cleanup
|
2015-01-13 19:44:46 +08:00 |
yinjimmy
|
c3a536bcf0
|
add lua-template-runtime
|
2015-01-13 18:28:33 +08:00 |
yinjimmy
|
cf331c3abd
|
update lua-template-default
|
2015-01-12 23:42:37 +08:00 |
yinjimmy
|
0978a88b7f
|
Merge branch 'v3' into combine
Conflicts:
templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk
templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
tools/simulator/frameworks/runtime-src/proj.android/jni/Android.mk
tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj
|
2015-01-12 17:54:58 +08:00 |
yinjimmy
|
d1821fb1ef
|
update template for iOS
|
2015-01-12 12:46:43 +08:00 |
yinjimmy
|
db80ab0028
|
update lua default template
|
2015-01-09 13:21:19 +08:00 |
yinjimmy
|
349f5d1a87
|
add config.json
|
2015-01-09 11:43:41 +08:00 |
dualface
|
c041787f01
|
update proj.android for template
|
2015-01-09 04:14:31 +08:00 |
yinjimmy
|
d2a3a6a8c0
|
merge lua-template-default with lua-template-runtime
|
2015-01-09 04:08:41 +08:00 |
dualface
|
7046f508da
|
update proj.win32 for templates
|
2015-01-09 03:10:54 +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 |
dualface
|
82c40ca5e8
|
add Cocos Studio support
|
2014-12-29 13:41:21 +08:00 |
dualface
|
653b15b4b8
|
add UIWidget support, fix typo
|
2014-12-29 13:37:20 +08:00 |
dualface
|
40acc98f14
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into update_lua_templates
|
2014-12-29 10:58:42 +08:00 |
dualface
|
2ba25a473f
|
update lua-default-template
|
2014-12-29 05:51:49 +08:00 |
andyque
|
9c974eebd0
|
fix libpng warning
|
2014-12-27 20:47:59 +08:00 |
samuele3hu
|
3e0852eb7a
|
Remove useless copy about luasocket on the android platform
|
2014-12-05 15:28:45 +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 |
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 |
samuele3hu
|
c9daa8244e
|
Add include directories to fix compile error on the window and remove useless `PreBuildEvent`
|
2014-10-29 16:09:35 +08:00 |
Dhilan007
|
81a8e80496
|
[LUA]Add New AudioEngine on window
|
2014-10-17 17:53:33 +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 |
minggo
|
abd2687cf5
|
Merge pull request #8683 from dualface/update_lua_template_runtime
update lua-template
|
2014-10-14 17:01:19 +08:00 |
dualface
|
cee999ebbb
|
update lua-template-default, lua-template-runtime, fix same proj problems.
|
2014-10-14 16:55:38 +08:00 |
Huabing.Xu
|
b3be90bc5e
|
Fix lua cocos console on linux
|
2014-10-13 17:42:59 +08:00 |
dualface
|
74ec90f90f
|
remove unused codes
|
2014-10-11 03:14:06 +08:00 |
dualface
|
b49d2351ff
|
update lua-template-default
|
2014-10-11 02:55:04 +08:00 |
minggo
|
ebf0562b84
|
remove armv7s support on iOS
|
2014-09-26 10:35:50 +08:00 |
minggo
|
3f7fc6ead1
|
Merge pull request #8111 from joewan/v3
fix compile on ubuntu.
|
2014-09-22 09:38:52 +08:00 |
joewanchen
|
f22c15bf1c
|
fix.
|
2014-09-22 00:08:44 +08:00 |
minggo
|
45d311bb34
|
remove dependence of CoreGraphics for on mac
|
2014-09-19 14:02:13 +08:00 |
honghui
|
86416e73ca
|
sync code from default template
|
2014-09-16 16:19:05 +08:00 |
minggo
|
d96050e1ce
|
Merge pull request #8048 from Dhilan007/v3-audio903
update LUA templates for AudioEngine.
|
2014-09-15 16:00:11 +08:00 |
andyque
|
36feb8e47b
|
fix lua win32 template compile error
|
2014-09-15 15:10:55 +08:00 |
Dhilan007
|
1639d759af
|
update LUA templates for AudioEngine.
|
2014-09-15 13:51:18 +08:00 |
andyque
|
2cfff1813b
|
modify comments
|
2014-09-15 12:06:34 +08:00 |
andyque
|
2f85310348
|
adjust registering ui module before extension module
|
2014-09-15 09:46:07 +08:00 |
minggo
|
11f9eaa4a0
|
fix template compiling error
|
2014-09-12 15:02:18 +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 |
minggo
|
ba4825a5fa
|
Merge pull request #7869 from huangshiwu/v3_glviewattrs
OpenGL context attributions setting revise -modify lua template
|
2014-08-25 11:18:15 +08:00 |
huangshiwu
|
9eda72f54a
|
OpenGL context attributions setting revise -modify lua template
|
2014-08-25 10:57:58 +08:00 |
minggo
|
030f80a257
|
one static library for c++ and another one for lua-binding
|
2014-08-24 03:52:51 -07:00 |
samuele3hu
|
f36e7c6617
|
Add register_cocos3d_module for lua template
|
2014-08-18 19:46:11 +08:00 |
samuele3hu
|
22a48fb760
|
Update cpp and lua template to support cocos3d lib
|
2014-08-18 19:23:03 +08:00 |
samuele3hu
|
1976b66ab8
|
Make lua-template-default support all modules
|
2014-08-14 21:27:02 +08:00 |
samuele3hu
|
02da839798
|
Make lua-template-default support all modules
|
2014-08-14 16:54:33 +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
|
2ffc0e2e53
|
Modify the mechanism that files copy to lua-empty-test and lua-template
|
2014-08-08 16:56:22 +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
|
cf0aa36c15
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
Conflicts:
cocos/network/CMakeLists.txt
cocos/storage/CMakeLists.txt
|
2014-08-07 14:02:50 +08:00 |
samuele3hu
|
0421c24d16
|
Modify lua-template-default and lua-template-runtime project
|
2014-08-07 13:54:54 +08:00 |
samuele3hu
|
aa4f407851
|
extract ui,network and storage from cocos2d module and adjust relate CMakeLists.txt
|
2014-08-07 13:53:13 +08:00 |
minggo
|
7a833d66d1
|
Merge pull request #7676 from samuele3hu/v3_module
Split luabindings into serval modules and adjust project settings of test cases
|
2014-08-06 17:09:12 +08:00 |
xiangxw
|
78587254a5
|
show error after a win32 lua program crashes
|
2014-08-05 21:10:30 +08:00 |
samuele3hu
|
da18657f4f
|
Add module Android.mk config and adjust related test cases
|
2014-08-05 13:29:54 +08:00 |
samuele3hu
|
cd0c82f8b7
|
Split deprecated class, functions and enums to related module and adjust iOS/Mac test case and templates
|
2014-08-04 17:11:57 +08:00 |
samuele3hu
|
c5c394846c
|
Adjust iOS and Mac tempts for Lua
|
2014-08-04 10:25:17 +08:00 |
shinriyo
|
3da15a7f92
|
typo function
however it is not the dog.
squirrel....
|
2014-07-29 00:37:55 +09:00 |
samuele3hu
|
175ff37302
|
Remove glView setting form cpp to lua script and remove lua bindings for Bone3D
|
2014-07-11 16:00:02 +08:00 |
samuele3hu
|
521f805219
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
Conflicts:
tests/lua-tests/src/mainMenu.lua
tools/bindings-generator
tools/tolua/cocos2dx_physics.ini
|
2014-07-08 14:57:19 +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 |
chuanweizhang2013
|
e32eadc364
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
|
2014-07-04 13:36:51 +08:00 |
chuanweizhang2013
|
10595394e3
|
copy res when update resource
|
2014-07-03 01:00:24 -07:00 |
minggo
|
d8c9f6a0a6
|
add regular support in Node::enumerateChildren()
|
2014-07-02 17:07:36 +08:00 |
samuele3hu
|
cfb992e7cf
|
Upate templates project setting
|
2014-06-27 14:52:32 +08:00 |
gin0606
|
2c837b0960
|
add new line at the end of a file to *.mk
|
2014-06-19 20:43:27 +09:00 |
Dhilan007
|
648e7767d4
|
fixed can't move app to SD card after installed on android.
|
2014-06-17 12:03:20 +08:00 |
samuele3hu
|
c785d64ba1
|
Adjust the xxtea directory structure and modify configs files for platforms
|
2014-06-04 11:50:04 +08:00 |
samuele3hu
|
90cac02de6
|
Update lua-template and lua-empty-test for replacing bgMusicPath
|
2014-05-28 10:27:03 +08:00 |
samuele3hu
|
04d2d4a22e
|
Update lua-template and lua-empty-test for replacing bgMusicPath
|
2014-05-28 10:04:29 +08:00 |
Sergey
|
49f26f3fbf
|
lua template & android-build.py updated
|
2014-05-20 13:49:02 +04:00 |
samuele3hu
|
6dc7f5a2b5
|
fix compile error for lua template
|
2014-05-19 10:38:59 +08: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 |