samuele3
|
ba6cf00d9b
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
|
2013-11-04 14:47:10 +08:00 |
samuele3
|
790be0decc
|
issue #3037:Modify vs2012 config
|
2013-11-04 14:43:22 +08:00 |
minggo
|
f6d82d21d2
|
closed #3108: add -fsigned-char to make char to signed as default
|
2013-11-04 10:48:45 +08:00 |
samuele3
|
463ed08ffe
|
issue #3037:Modify AssetsManagerTest.lua
|
2013-11-01 17:29:09 +08:00 |
samuele3
|
80f3a7d57a
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h
cocos/scripting/lua/script/Cocos2dConstants.lua
|
2013-11-01 17:17:21 +08:00 |
samuelhu
|
5010779e39
|
issue #3049:Reset .project file in pro.android.
|
2013-11-01 11:36:06 +08:00 |
samuelhu
|
f3ff7955a8
|
issue #3037:Modify platform build config
|
2013-11-01 11:18:02 +08:00 |
samuelhu
|
de4aaeda2d
|
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
|
2013-10-31 22:06:34 +08:00 |
samuelhu
|
4031556398
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
samples/Lua/TestLua/Resources/luaScript/mainMenu.lua
|
2013-10-31 21:57:24 +08:00 |
samuelhu
|
5891f00967
|
issue #3037:Add assetsmananger lua binding and a releated test sample
|
2013-10-31 21:52:28 +08:00 |
samuelhu
|
7c45ddafe2
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2013-10-31 17:22:14 +08:00 |
samuelhu
|
705da20ee7
|
issue #2794:Add LuaObjectCBridge and related test sample
|
2013-10-31 15:26:38 +08:00 |
samuelhu
|
faf3b30e9b
|
issue #3069:Add LuaObjectCBridge and related test sample
|
2013-10-31 15:20:53 +08:00 |
minggo
|
9e5420c954
|
Merge pull request #4029 from minggo/iss2905-adjust_folder
use build/android-build to build android samples, and update readme
|
2013-10-30 03:30:03 -07:00 |
minggo
|
da9f7c912b
|
use build/android-build to build android samples, and update readme
|
2013-10-30 18:27:56 +08:00 |
samuelhu
|
c08a09a7e0
|
#3049:Add LICENSE_JSON4LUA and some constant values.
|
2013-10-30 10:52:04 +08:00 |
samuelhu
|
471bbb8af9
|
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
|
2013-10-29 18:21:15 +08:00 |
samuelhu
|
70082ddc29
|
issue #3409:Add XMLHttpRequest lua binding and corresponding test sample
|
2013-10-29 17:54:35 +08:00 |
samuelhu
|
3508213615
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2013-10-29 11:45:19 +08:00 |
samuelhu
|
a4d028e905
|
issue #3409:Add XMLHttpRequest lua binding and corresponding test sample
|
2013-10-29 11:40:41 +08:00 |
Michael Contento
|
fe180078f0
|
Android: add xlargeScreens="true" to supports-screens
|
2013-10-28 23:12:51 +01:00 |
samuelhu
|
a5e479d2bb
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
|
2013-10-24 11:14:20 +08:00 |
minggo
|
e81efb24c9
|
issue #2905: android samples run ok
|
2013-10-23 16:49:50 +08:00 |
samuelhu
|
26caaa0a36
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
|
2013-10-23 09:57:21 +08:00 |
minggo
|
abcf8f268d
|
fix conflicts
|
2013-10-22 18:36:13 +08:00 |
minggo
|
6a664d480a
|
issue #2905:samples build ok on linux
|
2013-10-22 18:01:56 +08:00 |
samuelhu
|
5f769b2313
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
|
2013-10-22 16:52:44 +08:00 |
samuelhu
|
be1f17ca0f
|
issue #3037:Add assetsmananger lua binding and a releated test sample
|
2013-10-22 16:14:49 +08:00 |
Dhilan007
|
f11dba586a
|
issue #2905:modification vs-project for folder structure change
|
2013-10-21 22:09:21 +08:00 |
minggo
|
e50f9fc43b
|
issue #2905: jsbinding samples and lua binding samples build ok on android
|
2013-10-17 15:04:30 +08:00 |
Ricardo Quesada
|
3cbeabc777
|
Icons for test projects
|
2013-10-16 11:55:14 -07:00 |
minggo
|
8f7a489a4d
|
issue #2905:make cocostudio and gui flat
|
2013-10-16 16:48:39 +08:00 |
James Chen
|
f6275667bf
|
Removing unused ios projects.
|
2013-10-12 15:02:28 +08:00 |
minggo
|
ad6325b0dd
|
fix conflicts
|
2013-10-12 11:31:32 +08:00 |
minggo
|
4313c46e93
|
issue #2905:adjust folder structure
|
2013-10-12 11:22:05 +08:00 |
James Chen
|
edcf9fecb4
|
[Win32] Fixing compilation errors after renaming CocosDenshion to 'audio'.
|
2013-10-11 21:52:28 +08:00 |
minggo
|
6e62be5443
|
issue #2905: modify makefile to include correct header files
|
2013-10-10 17:39:53 +08:00 |
minggo
|
866906fd58
|
issue #2905:modify project settings to include correct audio path
|
2013-10-10 15:40:06 +08:00 |
samuele3hu
|
b5ee16399c
|
issue #2768:Modify the linux make files of the liblua 、the testlua and hellolua projects
|
2013-10-10 11:09:09 +08:00 |
samuele3hu
|
508654738a
|
issue #2768:Modify armature test sample and skip some functions to lua
|
2013-10-08 15:45:13 +08:00 |
samuele3hu
|
4c1bd825af
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature
|
2013-10-08 10:17:58 +08:00 |
Dhilan007
|
9727436a5d
|
issues #2834:Use Android standalone toolchain on windows to remove the dependence of cygwin
|
2013-09-27 21:54:48 +08:00 |
minggo
|
bcb171e3c9
|
fix line end in windows
|
2013-09-20 22:23:13 +08:00 |
samuele3hu
|
54e0fd9a63
|
Modify Accelerometer Test sample
|
2013-09-20 22:05:37 +08:00 |
minggo
|
1878fa6041
|
Merge pull request #3694 from dabingnn/release30_bug_hot_fix
rename test case to correct name
|
2013-09-18 03:33:46 -07:00 |
Huabing.Xu
|
19e37d284e
|
rename test case to correct name
|
2013-09-18 18:26:03 +08:00 |
minggo
|
ff3fcf5eb7
|
Merge pull request #3690 from dabingnn/release30_bug_hot_fix
glfw EGLView alloc on the stack to prevent memory leak
|
2013-09-18 02:44:34 -07:00 |
samuele3hu
|
d4669f3ad4
|
replace tabs with spaces
|
2013-09-18 17:19:34 +08:00 |
Huabing.Xu
|
a2dee37b0e
|
glfw EGLView set alloc on the stack to prevent memory leak
|
2013-09-18 17:00:21 +08:00 |
samuele3hu
|
567dd00710
|
Modify Accelerometer lua test sample
|
2013-09-18 16:44:05 +08:00 |