83d7bdcae9
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
2014-09-11 17:07:55 +08:00
d5a8904fbb
open WIFI is not necessary for runtime
2014-09-11 17:04:26 +08:00
827679099c
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-11 08:31:19 +00:00
bb0b7a9b8a
Merge pull request #7950 from super626/billboard
...
3D BillBoard
2014-09-11 16:29:05 +08:00
5274b4f958
merge cocos resolve conflict
2014-09-11 16:02:07 +08:00
974e810bb2
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-11 07:48:14 +00:00
11005a6ce9
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-11 06:48:54 +00:00
bb6f5a6be5
Merge branch 'newcode' into billboard
2014-09-10 16:27:59 +08:00
deef5cb3d7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-10 06:07:55 +00:00
15254a5ddb
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-10 01:50:11 +00:00
cf9094207a
merge cocos
2014-09-09 16:00:55 +08:00
7372604f7f
fix wp8 compile error and modify default resource path
2014-09-05 11:21:08 +08:00
8da7a4b2de
merge cocos reslove conflict
2014-09-04 17:40:14 +08:00
d183e64c83
add to template
2014-09-04 16:52:45 +08:00
6bd05770e7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-04 06:00:43 +00:00
43e2b39bc0
Merge pull request #7921 from dabingnn/v3_trianglesCommand
...
V3 triangles command
2014-09-04 13:58:50 +08:00
4b21972d8b
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-04 05:42:22 +00:00
4ae2d6fc90
Merge branch 'v3' into v3_trianglesCommand
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-09-04 11:27:12 +08:00
071aedaa51
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-04 02:56:25 +00:00
da057b5a68
Merge pull request #69 from cocos2d/v3
...
update v3
2014-09-03 15:30:40 +08:00
d681bdce92
Fix the crash of project which was created by the lua-template-runtime
2014-09-03 14:54:58 +08:00
1ec9933045
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-03 05:37:45 +00:00
66943eec98
Merge pull request #7932 from minggo/remove-unneeded-files
...
remove unneeded files
2014-09-03 13:36:31 +08:00
61a3c80cb9
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-03 04:05:23 +00:00
b37ef4e1c3
remove unneeded files
2014-09-03 11:52:19 +08:00
2dea7c3a18
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-03 03:26:30 +00:00
05d0e04073
[ci skip] update template for triangles command
2014-09-02 15:05:21 +08:00
4ada914426
mac writable path
2014-09-01 02:35:08 -07:00
5af89f5d46
fixed error
2014-09-01 01:57:08 -07:00
77a5e35ea8
Merge pull request #31 from cocos2d/v3
...
update v3
2014-09-01 14:08:06 +08:00
dd09c784d1
Merge pull request #65 from cocos2d/v3
...
update v3
2014-08-29 18:12:30 +08:00
303b391657
fixed writablePath
2014-08-29 16:21:34 +08:00
0d8c9eeb19
add link resource support
2014-08-29 15:05:55 +08:00
d0ac64b2e8
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-29 05:43:47 +00:00
37b71ec0cc
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-08-29 09:35:21 +08:00
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
29234a3c58
Fix an issue that the break point stops twice at the same function
2014-08-28 10:54:47 +08:00
688ad1b3b9
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
...
Conflicts:
templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp
templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm
2014-08-28 10:28:31 +08:00
27b8fd02ad
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-28 02:18:38 +00:00
f1914f3fa1
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-27 05:40:25 +00:00
471820568f
Update android.mk of cocos and lua-templates
2014-08-27 10:28:04 +08:00
33fd605a16
Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.
2014-08-27 10:18:44 +08:00
8d88109db7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-25 06:57:10 +00:00
37aeb5b114
Merge pull request #7872 from samuele3hu/v3_3_new_module
...
Integrate all modules into cocos2d and related luacocos2d and adjust the related test cases
2014-08-25 14:55:46 +08:00
74624f5ba1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
2014-08-25 11:52:52 +08:00
893e0b0a08
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-08-25 11:45:29 +08:00
b165137f40
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-25 03:19:31 +00:00
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
e5ac6e204b
Merge pull request #7864 from minggo/module-devide
...
Module devide
2014-08-25 11:01:19 +08:00
9eda72f54a
OpenGL context attributions setting revise -modify lua template
2014-08-25 10:57:58 +08:00
dcea3b6134
Merge pull request #7843 from huangshiwu/v3_glviewattrs
...
V3 glviewattrs
2014-08-25 09:46:19 +08:00
e7050486d3
fix conflict
2014-08-24 18:56:51 +08:00
030f80a257
one static library for c++ and another one for lua-binding
2014-08-24 03:52:51 -07:00
b55c174bba
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-22 15:56:17 +00:00
91eba38eda
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-22 15:40:55 +00:00
07af58c0c2
OpenGL context attributions setting revise -2
2014-08-22 16:22:16 +08:00
a3e4402c5f
Adjust cpp-template-default template
2014-08-22 13:50:28 +08:00
312f57d7a6
- [WP8] Now replacing application display name with project name
2014-08-21 18:49:52 +03:00
9c2cbaf742
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-20 05:37:22 +00:00
9a3c2dc6a4
Merge branch 'ccRandom' of https://github.com/gin0606/cocos2d-x into ccRandom
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-08-20 09:56:16 +08:00
ebb0876d29
* [WP8] Fixed resource search path in template
2014-08-19 21:44:46 +03:00
5cdbf4c04c
* [WP8] Fixed paths in template
2014-08-19 19:57:06 +03:00
218cee5e05
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-18 14:55:40 +00:00
94b45d55ef
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-18 14:43:41 +00:00
f36e7c6617
Add register_cocos3d_module for lua template
2014-08-18 19:46:11 +08:00
22a48fb760
Update cpp and lua template to support cocos3d lib
2014-08-18 19:23:03 +08:00
128d06076a
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-15 07:41:13 +00:00
f2f8035724
Merge pull request #7708 from super626/obb
...
AABB, OBB
2014-08-15 15:32:14 +08:00
965f4f8ef4
Merge pull request #7791 from xiangxw/fix_replaceAll
...
fix replaceAll()
2014-08-15 15:03:06 +08:00
8b83419a32
fix replaceAll()
...
This function will never return if new_value contains old_value.
For example, old_value = "'", new_value = "''".
2014-08-15 11:48:33 +08:00
76a9382a91
Rename folder names of cpp-template: ‘Classes’—>’src’ ,’Resource’—>’res’ and adjust the template project except wp8
2014-08-15 00:08:15 +08:00
55180c63e4
Add modules register functions for lua-template-runtime on android
2014-08-14 23:22:24 +08:00
97d8d27eec
Add LOCAL_WHOLE_STATIC_LIBRARIES for lua-template-runtime on android
2014-08-14 21:58:40 +08:00
1976b66ab8
Make lua-template-default support all modules
2014-08-14 21:27:02 +08:00
2786e63824
Merge branch 'newcode' into obb
2014-08-14 18:58:46 +08:00
2d4f23d9e8
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-14 10:36:05 +00:00
3f2fccb999
Merge pull request #7771 from samuele3hu/v3_3_module
...
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
2014-08-14 18:33:53 +08:00
ab783d2702
merge cocos2d
2014-08-14 17:12:39 +08:00
02da839798
Make lua-template-default support all modules
2014-08-14 16:54:33 +08:00
3ab8bed741
Merge pull request #7745 from samuele3hu/v3_module
...
Modify cpp-template-default project configure
2014-08-14 09:46:37 +08:00
6510d74ff7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-14 01:29:42 +00:00
032f5ea781
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
2014-08-14 00:06:28 +08:00
e766a22bda
Adjust the lua templates for the lua modules.
2014-08-13 14:29:14 +08:00
fc429154a9
add getplatform function
2014-08-13 11:30:43 +08:00
93800c5821
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-13 01:27:24 +00:00
17aa2833db
Fix xcode warning that cause `getEngine` inline expansion
2014-08-12 18:07:17 +09:00
d9fdfb2659
Modify cpp-template-default project configure
2014-08-12 17:05:39 +08:00
f8f15df530
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-11 07:06:46 +00:00
43a3603a8b
Merge pull request #7720 from samuele3hu/v3_module
...
Modify the mechanism that files copy to lua-empty-test and lua-template and fix some bugs
2014-08-11 15:01:28 +08:00
fd314261b7
Merge branch 'newcode' into obb
2014-08-11 13:21:44 +08:00
3c3c05204f
Split files in lua-bindings/script into different module and adjust related project
2014-08-11 12:54:30 +08:00
076a2f9d1a
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-11 01:32:55 +00:00
2dacbf6f26
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
2014-08-08 16:59:33 +08:00
2ffc0e2e53
Modify the mechanism that files copy to lua-empty-test and lua-template
2014-08-08 16:56:22 +08:00
ceb6549ec8
merge cocos2d
2014-08-08 16:25:52 +08:00
4fe1b2e6bc
Fix the target dependencies error of lua-runtime-template
2014-08-08 16:10:31 +08:00
1b4cd7e58e
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-08 07:58:25 +00:00
213f2f5a6c
Merge pull request #7702 from super626/v3_merge
...
Camera and Camera test
2014-08-08 15:56:38 +08:00
00865c8abb
Modify the mechanism that files copy to lua-empty-test and lua-template
2014-08-08 15:22:12 +08:00
97edd303b5
remove DrawNode3D
2014-08-08 15:06:45 +08:00
6722f8d546
Fix typo
2014-08-08 13:27:09 +09:00
75bd97b82e
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-08 03:51:09 +00:00
b9e84370f6
Merge pull request #7699 from huangshiwu/v3_wp8fix
...
V3 wp8fix
2014-08-08 11:49:02 +08:00
813e954f4e
aabb, obb
2014-08-08 00:00:58 +08:00
5349aa7efb
Add ccRandom.h
2014-08-07 21:17:36 +09:00
3c9483899e
camera, cameratest, drawNode3D squash
2014-08-07 15:23:31 +08:00
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
0421c24d16
Modify lua-template-default and lua-template-runtime project
2014-08-07 13:54:54 +08:00
aa4f407851
extract ui,network and storage from cocos2d module and adjust relate CMakeLists.txt
2014-08-07 13:53:13 +08:00
0016c7af70
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_wp8fix
2014-08-07 11:58:01 +08:00
24d68305e1
WP8 compile fix
2014-08-07 11:56:28 +08:00
92bb832d18
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-07 02:54:38 +00:00
075c890ef1
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-06 09:51:57 +00:00
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
35a19dd0ea
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-06 07:24:27 +00:00
fdcf6a0c7c
Merge pull request #7672 from xiangxw/show_lua_error_message
...
show error after a win32 lua program crashes
2014-08-06 14:39:25 +08:00
08cc7982d7
Merge pull request #7666 from zawasp/template_fix
...
Template fix
2014-08-06 10:03:12 +08:00
63b3f838b6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
2014-08-06 09:56:07 +08:00
0daa30419b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
...
Conflicts:
cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp
tools/tolua/cocos2dx.ini
2014-08-06 00:37:19 +08:00
78587254a5
show error after a win32 lua program crashes
2014-08-05 21:10:30 +08:00
eacb8fa120
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-05 10:23:15 +00:00
3a3cf0383d
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-05 08:38:41 +00:00
119ca86e3f
additional fixes for win32 project
2014-08-05 11:29:04 +03:00
d808581d2b
fix win32 template project
2014-08-05 10:43:29 +03:00
5720df4336
add VS 2013 support for C++ template
2014-08-05 10:11:04 +03:00
da18657f4f
Add module Android.mk config and adjust related test cases
2014-08-05 13:29:54 +08:00
1772ab78ac
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-05 02:13:45 +00:00
0f3fbfa07f
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-05 02:00:57 +00:00
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
d6d3ea6b18
fix template
2014-08-04 13:12:59 +08:00
4452d9579a
merge cocos2d, fix lua
2014-08-04 12:07:27 +08:00
c5c394846c
Adjust iOS and Mac tempts for Lua
2014-08-04 10:25:17 +08:00
ea1d9d4657
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-01 07:58:06 +00:00
575c9787c0
Merge branch 'v3' into v3_pr
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-08-01 15:11:34 +08:00
ce8c5ee327
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-01 03:58:50 +00:00
ef69faf3ba
GLView Hook
2014-07-31 00:53:04 +08:00
6dd02ade69
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-30 07:51:17 +00:00
06d43ed2fd
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-30 01:28:27 +00:00
a743590ac5
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-29 08:09:10 +00:00
3d7cced94e
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-29 06:30:39 +00:00
3da15a7f92
typo function
...
however it is not the dog.
squirrel....
2014-07-29 00:37:55 +09:00
2bde043346
add config window top support
2014-07-24 10:30:39 +08:00
ea69a2c72d
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-23 16:38:00 +00:00
5c62a2fea7
template fix
2014-07-22 15:49:38 +04:00
19d01ae17b
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-22 09:06:42 +00:00
eee5934b03
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-21 08:48:07 +00:00
4d78dd60c2
Merge pull request #7527 from chenguangqi/v3
...
Fixed error for importing project
2014-07-21 12:03:40 +08:00
afe3760aa0
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-21 03:54:57 +00:00
5063ec465b
Fixed error for importing project
...
fixed error for importing android project to Eclipse
```
The import org.cocos2dx.lib cannot be resolved ...
```
2014-07-19 19:35:30 +08:00
f6b5f8e6ce
Merge pull request #7509 from chuanweizhang2013/v3luaruntime
...
runtime 1.3.1 fixed log bug
2014-07-18 09:25:41 +08:00
3e6dd0b8d2
1.3.1
2014-07-17 09:30:56 -07:00
7b7d4d6aa0
Merge pull request #7500 from cocoscodeide/v3
...
lua runtime 1.3
2014-07-17 18:01:21 +08:00
f906880c70
modify size
2014-07-17 02:48:32 -07:00
5de1256005
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-17 08:01:08 +00:00
1544081284
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-17 07:42:19 +00:00
5d1de7e9a9
console port android 6010
2014-07-17 15:37:37 +08:00
924b8b23f2
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-17 06:28:22 +00:00
a51332e955
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
2014-07-16 22:37:16 +08:00
c7579c2cd3
rename local variable GameScene to gameScene
2014-07-16 22:36:47 +08:00
211c79eefa
fixed mac ios reload bug
2014-07-16 07:10:46 -07:00
fc420abec6
add GameScene.lua
2014-07-16 21:22:13 +08:00
5a4aa64f48
modify lua name
2014-07-16 21:20:48 +08:00
04b9457ed2
add local for main.lua
2014-07-16 20:49:24 +08:00
897f42c6fd
add consolePort
2014-07-16 20:30:11 +08:00
390dc3781b
support custom console port
2014-07-16 20:19:19 +08:00
67c078197d
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
2014-07-16 19:35:28 +08:00
da74684cf1
fixed android debuginfo
2014-07-16 19:35:04 +08:00
e160474f23
rename menu title
2014-07-16 04:33:45 -07:00
31aa374fe8
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-07-16 18:20:44 +08:00
f55b9422f6
fixed living code bug
2014-07-16 18:19:33 +08:00
d0c15bc1d8
updated cpp template to support EVENT_RENDERER_RECREATED
2014-07-15 07:23:40 -07:00
53fde9d7c6
add support x86 atomicops_internals_x86_gcc
2014-07-15 17:40:43 +08:00
c1bb801dc5
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-15 09:06:46 +00:00
445409c1aa
remove comment
2014-07-15 15:56:31 +08:00
9334863da6
Merge pull request #30 from cocos2d/v3
...
update cocos2d-x
2014-07-15 15:26:01 +08:00
0346fccbc3
fixed bug runtime
2014-07-15 15:07:01 +08:00
d90effbe09
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-15 05:46:51 +00:00
03982a7f6e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-07-15 10:34:00 +08:00
a4c4c14c3c
remove change project fecture
2014-07-14 19:31:32 -07:00
6098531fd4
add set window top
2014-07-14 19:26:24 -07:00
cc0a27e83e
default OS Target for OS X is 10.7
2014-07-14 18:39:36 -07:00
3788df5e53
add support program to top
2014-07-14 16:23:57 +08:00
1db6daa60a
modify lua template source code
2014-07-14 13:58:21 +08:00
62b9c72609
Merge pull request #7281 from aslmaswd/v3-cmake
...
CMake Fix:GLFW header
2014-07-14 11:18:51 +08:00
b8767420db
Add support keep screen on when is debug
2014-07-12 16:29:39 +08:00
d4834202b5
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
2014-07-12 14:55:29 +08:00
f22ae76c58
modify version num
2014-07-12 14:50:23 +08:00
e1d6e5aec3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-07-12 14:39:21 +08:00
11838f20f4
fixed release error
2014-07-11 23:14:32 -07:00
4a63f29f8a
Merge pull request #48 from chuanweizhang2013/v3luaruntime
...
V3luaruntime
2014-07-12 11:48:43 +08:00
56a95a2e52
move setDisplayStats function
2014-07-12 11:42:39 +08:00
4b9ce2e663
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-11 11:11:12 +00:00
47fa341934
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-07-11 16:19:41 +08:00
175ff37302
Remove glView setting form cpp to lua script and remove lua bindings for Bone3D
2014-07-11 16:00:02 +08:00
57827e9465
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-11 06:14:32 +00:00
683ba200f5
move getIPAddress function
2014-07-11 11:34:15 +08:00
0c6383ecfe
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
2014-07-11 10:42:44 +08:00
ca6bff963d
fixed transfor file error which size is 0
2014-07-11 10:38:55 +08:00
463a2ab5ac
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-11 01:43:39 +00:00
e1559c4828
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-10 14:06:29 +00:00
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
af5cf0a33f
Add configuration in templates to set the bundle identity of Mac & iOS project.
2014-07-08 10:22:08 +08:00
142ac9a413
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-04 17:07:04 +00:00
bad371fbf0
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
2014-07-04 02:33:51 -07:00
d7bf9598f1
version1.2
2014-07-04 02:31:13 -07:00
39b03de8a9
revert Android.mk
2014-07-04 15:39:07 +08:00
04a9b5c2c6
add setXXTEAKeyAndSign
2014-07-04 13:40:49 +08:00
e32eadc364
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-07-04 13:36:51 +08:00
eb7523e0c6
version.json
2014-07-03 19:56:21 -07:00
c1e8cc974b
add call encript lua function
2014-07-03 19:53:17 -07:00
d8f01215f0
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
2014-07-03 16:30:51 +08:00
10595394e3
copy res when update resource
2014-07-03 01:00:24 -07:00
9b1771d60e
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
2014-07-03 00:55:26 -07:00
0be6d27271
Merge pull request #7295 from minggo/support-regular-expression
...
Support regular expression
2014-07-03 15:20:06 +08:00
b88b5e4c3d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-07-03 11:13:59 +08:00
d8c9f6a0a6
add regular support in Node::enumerateChildren()
2014-07-02 17:07:36 +08:00
0b0b9ccdf3
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-02 08:21:52 +00:00
7eec8fbb3a
add arm64 bit support
2014-07-02 11:55:20 +08:00
8a4fab2b1f
add another possible GLFW header location
2014-07-02 10:11:51 +08:00
32c88f6189
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-01 10:04:00 +00:00
5ab6d5557b
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-01 07:52:35 +00:00
1bc0397644
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
2014-07-01 09:47:41 +08:00
4481149a30
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-06-30 17:53:46 +08:00
6eb0d3cc86
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-30 09:26:15 +00:00
f06061dfec
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-30 01:42:06 +00:00
c52fe48484
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-29 08:42:40 +00:00
7f28e81d09
Merge pull request #7226 from super626/v3
...
Animation3D
2014-06-29 16:41:13 +08:00
a8f4dcb59f
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-06-28 18:10:17 +08:00
e57ea32e58
1.2 template
2014-06-28 18:08:40 +08:00
618682def4
add ios search path
2014-06-27 18:15:39 +08:00
f38f0b00aa
fix templates
2014-06-27 18:01:39 +08:00
054f8c5d11
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-27 08:38:35 +00:00
cfb992e7cf
Upate templates project setting
2014-06-27 14:52:32 +08:00
09d1ee8fcf
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
2014-06-26 05:02:34 -07:00
b80d825421
commit
2014-06-26 04:41:54 -07:00
a3de7c00c8
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-26 06:40:58 +00:00
33e39b5786
added source files for component to be consistent with other platforms templates
2014-06-25 09:51:32 -07:00
97d126d300
added source files for component to be consistent with other platforms templates
2014-06-25 09:50:40 -07:00
cee5754db4
modify mac out file
2014-06-25 19:33:38 +08:00
486bf9ad12
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-25 09:21:01 +00:00
0c84dc3e6e
modify debug output file to runtime mac folder
2014-06-25 01:11:14 -07:00
90bd722bd2
remove rtres
2014-06-25 13:42:33 +08:00
ac539131e2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-06-25 11:39:17 +08:00
ec0eb7b6d6
modify filetime save formate
2014-06-25 11:36:59 +08:00
7f104f4bf7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-24 02:47:56 +00:00
cb9e5c2d77
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-24 02:31:03 +00:00
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
a170342f01
modify release output
2014-06-23 16:56:23 +08:00
dd49c4ccbc
Solve the error in Xcode project of lua runtime template.
2014-06-23 15:41:58 +08:00
e1333da7e4
add stubs head
2014-06-23 15:07:49 +08:00
f283ec69a1
add head
2014-06-23 15:04:28 +08:00
2c04d00425
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-20 16:25:25 +00:00
a45056dbd7
add protobuf
2014-06-20 11:32:22 +08:00
ffb96092fd
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-19 13:57:10 +00:00
54b2a15886
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-19 13:24:14 +00:00
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
3ae8e29ce5
Add new line at the end of a file to *.h
2014-06-19 20:45:49 +09:00
bf4f30d14b
Add new line at the end of a file to *.cpp
2014-06-19 20:45:24 +09:00
2c837b0960
add new line at the end of a file to *.mk
2014-06-19 20:43:27 +09:00
9e62cc9c31
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime
2014-06-19 17:28:25 +08:00
be8775e314
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime
2014-06-19 17:23:36 +08:00
1153531448
add response error
2014-06-19 16:50:16 +08:00
3b19b07915
Modify the lua runtime template for prebuilt engine.
2014-06-19 11:33:39 +08:00
e1d7871089
add mac android support
2014-06-19 11:27:31 +08:00
1b056b6c49
Remove the debug symbols for release mode in xcode projects.
...
Modify the template of lua runtime.
2014-06-18 17:06:56 +08:00
69a55e2cfa
add protobuf-lite source
2014-06-18 15:43:38 +08:00
9aeb1510ed
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-18 05:36:54 +00:00
a292f7d063
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-17 13:09:25 +00:00
26cca348cb
Merge pull request #7085 from super626/v3
...
Sprite3D animation
2014-06-17 21:05:58 +08:00
d97b28db76
modify copy script & modify release version`s outfile addr
2014-06-17 18:17:35 +08:00
7f9c86ab44
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-17 05:58:26 +00:00
a2a6a4e70a
Merge pull request #7087 from MSOpenTech/wp8-v3-template
...
Wp8 v3 template and missing texture after app switch fixes
2014-06-17 13:49:24 +08:00
0bbce49012
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-17 05:38:36 +00:00
f0fd7897be
update template
2014-06-17 13:25:05 +08:00
648e7767d4
fixed can't move app to SD card after installed on android.
2014-06-17 12:03:20 +08:00
1a5d148d8e
updated template code
2014-06-16 10:29:40 -07:00
753167b5f2
updated xaml resources
2014-06-16 09:25:35 -07:00
64f517a1b8
redirect function: setSearchPaths
2014-06-16 14:47:14 +08:00
b3fe030b90
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
2014-06-16 10:07:24 +08:00
bca578c2f8
fix can`t debug vs project normally
2014-06-13 16:34:39 +08:00
2d4297d14e
Merge pull request #34 from cocos2d/v3
...
merge from cocos2d-x
2014-06-13 14:14:25 +08:00
2eac73cde3
add protobuf win32
2014-06-13 11:19:04 +08:00
2d913470a0
updated fast resume code for app
2014-06-12 16:36:53 -07:00
5cd7ab97d9
fixed wrong WP8 project name when create project by console.
2014-06-09 16:17:19 +08:00
70a4fd173c
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-09 03:12:43 +00:00
24f7c9019a
Merge pull request #7005 from andyque/refactorUITouchEvent
...
refactor UI framework touch handling
2014-06-09 11:11:40 +08:00
b2ca17e00b
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-09 02:53:03 +00:00
1a933807b5
remove UIInterface.h header file
2014-06-09 10:35:54 +08:00
ddaf8f9ec5
modify play action
2014-06-06 16:24:09 +08:00
fd4e233432
fixed WP8 project:compile error,missing files,wrong file path.
2014-06-06 15:41:17 +08:00
f9b747cf1f
modify runtime
2014-06-05 18:03:38 +08:00
b218f8ec13
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-05 03:51:15 +00:00
366beedbb2
Merge pull request #6955 from samuele3hu/v3_fix
...
Add xxtea encrypt support for lua and update the console submodule
2014-06-05 11:49:40 +08:00
bd018ea645
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-04 09:18:03 +00:00
7a4d46dc1b
Merge pull request #6965 from Dhilan007/v3-wp8fix
...
Support Fast App Resume and fixed black screen may arise when using third sdk.
2014-06-04 17:15:13 +08:00
ab8a68f53b
fix template
2014-06-04 15:55:52 +08:00
d089b251db
fix other platform compile error
2014-06-04 14:56:34 +08:00
3fcb75c82f
Fixed black screen may arise when using third SDK.
2014-06-04 13:54:44 +08:00
c785d64ba1
Adjust the xxtea directory structure and modify configs files for platforms
2014-06-04 11:50:04 +08:00
52ad2063bd
Support Fast App Resume.
2014-06-04 11:19:53 +08:00
55bb9a7d09
Update setting for different platform
2014-06-03 17:15:28 +08:00
9d14a179db
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
2014-06-03 11:28:18 +08:00
521fa3118d
config template
2014-06-03 11:25:16 +08:00
72ce393d60
remove rtres floder
2014-05-30 14:25:37 +08:00
3807c7cffc
resource to binary
2014-05-30 13:53:49 +08:00
4b812f8b80
modify runtime folder
2014-05-30 11:00:26 +08:00
29cc2905f4
add tip
2014-05-30 09:43:39 +08:00
188f4ddcca
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime
2014-05-29 18:19:30 +08:00
201900e110
action
2014-05-29 18:19:19 +08:00
672ff4f7b3
Merge pull request #29 from bofeng-song/v3
...
add lock to get file name
2014-05-29 18:17:57 +08:00
05df2a4db1
Merge pull request #6657 from asmodehn/asmo_newv3_cmake_win32
...
Fixing cmake project for win32
2014-05-29 15:25:58 +08:00
c441b869ec
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-29 06:08:40 +00:00
73f3361b0e
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-28 05:49:49 +00:00
3d3fb6ad7e
Merge pull request #6914 from andyque/refactorLayoutExecutant
...
refactor: rename UILayoutExecutant to UILayoutManager
2014-05-28 13:47:54 +08:00
90cac02de6
Update lua-template and lua-empty-test for replacing bgMusicPath
2014-05-28 10:27:03 +08:00
769300d25e
rename UILayout
...
Executant.h to UILayoutManager.h
2014-05-28 10:17:34 +08:00
c52132179a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-28 10:05:41 +08:00
04d2d4a22e
Update lua-template and lua-empty-test for replacing bgMusicPath
2014-05-28 10:04:29 +08:00
c5dd99edd1
Merge pull request #6911 from cocoscodeide/v3
...
fixed win no log
2014-05-27 18:43:10 +08:00
f2b243dff5
fixed win no log
2014-05-27 18:21:54 +08:00
866a1cb9aa
Merge pull request #6820 from newnon/v3_android_improvements
...
Android project improvements
2014-05-27 10:17:03 +08:00
3aa7f7b504
show tips while launch app
2014-05-27 02:26:47 +08:00
ba6348c35d
add lock to get file name
2014-05-27 01:21:57 +08:00
cc41694077
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-26 05:42:20 +00:00
c38f2bf92b
1.1.2
2014-05-23 19:17:43 +08:00
3727c14cb8
runtime 1.1.2
2014-05-23 18:26:36 +08:00
58ed156cec
Merge pull request #27 from chuanweizhang2013/v3luaruntime
...
move runtime res path
2014-05-23 13:38:47 +08:00
5e198aaae2
Merge pull request #26 from cocos2d/v3
...
update cocos2d-x
2014-05-23 12:46:42 +08:00
1b3af4be19
move runtime res path
2014-05-22 22:08:04 +08:00
f3eb0d7722
updated cpp template file
2014-05-22 06:58:05 -07:00
111840f37b
add play ui
2014-05-22 11:52:49 +08:00
a07b2dae75
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-21 07:25:16 +00:00
5fe36c55c7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-20 11:49:30 +00:00
49f26f3fbf
lua template & android-build.py updated
2014-05-20 13:49:02 +04:00
1ff2a03d16
debug mode by default
...
configuration switched to -b debug/release
2014-05-20 13:00:21 +04:00
47482f8a3a
Merge pull request #6825 from cocoscodeide/v3
...
[ci skip] update template project lua
2014-05-20 15:45:03 +08:00
1aa92bdef0
add java nativeIsDebug
2014-05-20 13:53:52 +08:00
84d66219c8
fixed android degbug
2014-05-20 11:44:46 +08:00
2b3f236792
Support generate release apk with prebuilt libs.
2014-05-20 10:47:27 +08:00
a489c19535
Android project improvements
...
(release/debug builds)
native debug support
2014-05-19 17:47:17 +04:00
a2be97380b
Merge pull request #14 from bofeng-song/v3
...
show uploading file in play scene
2014-05-19 13:35:31 +08:00
e2a0029c4e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-19 10:50:15 +08:00
6dc7f5a2b5
fix compile error for lua template
2014-05-19 10:38:59 +08:00
b69efe00a7
fix cpp template linux
2014-05-18 18:34:53 -07:00
94228df977
fix cpp_template
2014-05-18 18:04:12 -07:00
794ba83495
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-18 22:25:49 +00:00
cb67b0533c
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-18 21:51:37 +00:00
6461e26c9f
Squashed commit of the following:
...
commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 14:03:53 2014 -0700
More WP8 fixes
commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c
Merge: c2b1619 fea335f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 12:19:41 2014 -0700
Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d
commit c2b1619005b5a62ef77afe727429584d6a57010e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 12:19:19 2014 -0700
Adds missing resources for Windows Phone 8
commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:54:15 2014 -0700
Updates CHANGELOG
commit b8b93da914de97662c9df55cfc351ad8b74ea779
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:48:59 2014 -0700
Adds Sprite3d files and tests
commit 059c842938e19068427bb2276d52f3e0ea1cc51f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:16:13 2014 -0700
fixes compiler warnings for windows
commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 10:53:34 2014 -0700
fixes for Sprite3D
Adds copyright header
removes compilation warnings
cleans code a bit
commit 1377787a4bcebdf349f9de0a05c329066c6eb626
Merge: f89725f 9a3c2d0
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 20:46:26 2014 -0700
Merge pull request #34 from dumganhar/pull/6731
fix compilation error of missing bind Mesh for luabindings.
commit f89725f65ca604efb9abbcfe336c9d50135016b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:45:12 2014 -0700
use const & and changed typo
commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5
Author: James Chen <jianhua.chen@cocos2d-x.org>
Date: Sat May 17 11:43:10 2014 +0800
fix compilation error of missing bind Mesh for luabindings.
commit 59524b3850b27342f3cb4c390751bdf97362a794
Merge: ee4ec94#33 from dabingnn/mesh3d_work
Mesh3d work
commit ac8cf2571d92b03c9632d0415078d08526322289
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:14:01 2014 -0700
added mesh3d file to template
commit e272583cb8a7f41d8d74dbf7d7db71584187a779
Merge: 6a1b847 5d3a955
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 19:10:45 2014 -0700
Merge pull request #32 from dabingnn/mesh3d_work
Mesh3d work
commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca
Merge: 4feae11 97cae73#31 from Trace0429/mesh3d_work
windows work now
commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3
Author: Trace0429 <yangtuo@chukong-inc.com>
Date: Sat May 17 08:12:46 2014 +0800
windows work now
commit 4feae11577f64c3aff943af51adc37dcb987bdc1
Merge: 510fc0c fdf82d3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 16:32:58 2014 -0700
Merge pull request #30 from dabingnn/mesh3d_work
Mesh3d work
commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:32:00 2014 -0700
fix compile error after merge (MAC can work)
commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe
Merge: 510fc0c d19de29#29 from dabingnn/mesh3d_work
Mesh3d work
commit 7fea34782f30ef0498a7a993016f45fcb786b771
Merge: a8a409a e098ed7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:08:01 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit a8a409a7d5280b1075eb6258ee556611a5cba7b3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:05:37 2014 -0700
bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw
commit e098ed7a5c187256be8313ec5d66294d3554c914
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 16:02:27 2014 -0700
bind buffer to 0 when finish draw
commit d13f637a3777e81085e0285faf00105c58229d7c
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 14:00:38 2014 -0700
fix outline width
commit 8a79c98b163ad862a2e09cbcc19a939f06556358
Merge: e208712 a0cf4ef
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 13:47:17 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit e20871233915f8b6010e59595c38793ec3d6956e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 13:47:12 2014 -0700
make some member protected
commit a0cf4efc48af801636a55d1c330fb6841896d33b
Merge: c0b8902 8b723e8
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 13:06:17 2014 -0700
Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d
commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 13:04:27 2014 -0700
linux work now
commit 8b723e82d81cbffd78e7378cab6d11df30baa044
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:48:34 2014 -0700
inc drawcall
commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c
Merge: 1e7032b e783da9
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:31:44 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit e783da91fe6c14c8594d3da865e965256376dd10
Merge: 5da20fd 8f7a19a
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 12:31:31 2014 -0700
Merge pull request #28 from dabingnn/mesh3d_work
Mesh3d work
commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:30:01 2014 -0700
optimize code
commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 12:29:37 2014 -0700
adjust code style
commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b
Merge: 659fbd6 553acfb
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 12:06:53 2014 -0700
Merge pull request #27 from dabingnn/mesh3d_work
Mesh3d work
commit 553acfb3ee685f5461a6d2a68779200abcca8670
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 12:06:02 2014 -0700
fix visual error for outline
commit 659fbd652aa7f4c2d3629fe446051c3dd0377510
Merge: 056c3e1 c617bb7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 11:54:54 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 11:54:47 2014 -0700
fix shader, add multiple sprite to Sprite3DEffectTest
commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa
Merge: 94d7896 7b19c56
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 11:33:31 2014 -0700
Merge pull request #26 from dabingnn/mesh3d_work
Mesh3d work
commit 7b19c564e4053ad883617873b11043df1fb98a45
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:30:34 2014 -0700
share the same glprogram in effect3DOutline
commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:19:56 2014 -0700
add class static variable for EffectOutline
commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d
Merge: 213bbb0 6837ceahttps://github.com/super626/cocos2d-x into mesh3d
commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 10:41:05 2014 -0700
remove namespace
commit 9af9da50a91804d11537cffe0750e486cf95c8a5
Merge: ff15926 8a38a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 10:30:23 2014 -0700
Merge pull request #25 from dabingnn/mesh3d_work
Mesh3d work
commit 8a38a384742ba130946de8ad1759b61ed2f70495
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 10:27:28 2014 -0700
remove redundant uniform CC_Texture0
commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034
Merge: ff15926 511295e#24 from dabingnn/mesh3d_work
Mesh3d work
commit 25dd07edb7005f593003e90120d6e6439686e5f6
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:52:33 2014 -0700
fix memory leak
commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:49:04 2014 -0700
remove unused member variable
commit a1e23064140328f4c9bbe434383ca6f25fcb7548
Merge: bac54fc 712e816
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 22:37:16 2014 -0700
Merge pull request #23 from dabingnn/mesh3d_work
Mesh3d work
commit 712e81606f2782ac41276c1e8a87d32217ac9d28
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:35:48 2014 -0700
fix memory leak
commit bac54fce097edd4040b0a7cd522d15644e6b482a
Merge: 8ed28c4 54538e8
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 20:01:49 2014 -0700
Merge pull request #22 from dabingnn/mesh3d_work
Mesh3d work
commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 20:01:29 2014 -0700
android work now
commit a6cc0f77875e045d169758adf0cde87360f41475
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:53:39 2014 -0700
remove sprite3dEffect include
commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:50:17 2014 -0700
remove unused Sprite3dEffect
commit c5e2d5579daca64b0e9394a2b07613352847eca8
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:48:12 2014 -0700
remove unused outline shader files
commit 09a100cf388d80aa1389d96994ae189cbb0652b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:43:17 2014 -0700
fix error on IOS
commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5
Merge: d23ffe3 c0e8ea2
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 18:47:37 2014 -0700
Merge pull request #21 from dabingnn/mesh3d_work
Mesh3d work
commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:46:54 2014 -0700
adjust indent, and line to the end of the file
commit 661ceb72831d6eccfa522a09cedf994541af6f88
Merge: 8e764e7 d23ffe3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:35:18 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
Conflicts:
cocos/3d/CCSprite3D.cpp
cocos/3d/CCSprite3D.h
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
commit 8e764e74dd019852a0ef35b257895a7e79cd9a14
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:31:06 2014 -0700
add testCase for outline
commit c2ced288851892299fd7258e51f32303959b374d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:03:34 2014 -0700
extract base class Effect3D
commit d23ffe3167476d10740df321e579bf647a3698d0
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 18:02:45 2014 -0700
RendeMeshData member rename
commit fb8f25553cd317a277c1b924da2c11b9f3188666
Merge: 73cb4b4 819db70
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 17:57:29 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 819db702d5ffa9461fc9d1d232cea7d373536664
Merge: 2676911 b408f43
Author: Trace0429 <yangtuo0429@gmail.com>
Date: Thu May 15 17:54:24 2014 -0700
Merge pull request #20 from Trace0429/mesh3d_work
Mesh3d work
commit 73cb4b444b222d34e135b0d09b426b9c73c1b790
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 17:54:03 2014 -0700
android meshcommand
commit b408f4343e47766416b19a583bc6bb5167439693
Author: Trace0429 <yangtuo@chukong-inc.com>
Date: Fri May 16 08:50:38 2014 +0800
windows work now
commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 17:38:41 2014 -0700
raw EffectSprite
commit 2676911bb71ef92b3d9cf198021169d9e4466525
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 16:37:20 2014 -0700
remove SpriteEffect from Sprite3D
commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 16:34:36 2014 -0700
raw effectSpriteTest
commit 39e372ef2037090317c9c4a2287b06cadf83c9c5
Merge: 734633e 6d27912
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 16:14:57 2014 -0700
use meshcommand
commit 734633ec1ffc66e590b2ad2da94f6477d78146f2
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 15:38:30 2014 -0700
use meshcommand
commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 15:31:43 2014 -0700
comment out effect framework
commit 6d27912f148e03acc07da3e3b4d0c565af8afefa
Merge: d6f6f63 61a9011
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 15:11:25 2014 -0700
Merge pull request #19 from dabingnn/mesh3d_work
Mesh3d work
commit 61a9011d6c78ea6918664bb608dc51344e0236e5
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:55:06 2014 -0700
fix compile error in testcases
commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:52:43 2014 -0700
fix compile error after merge with v3
commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47
Merge: d6f6f63 760ee57#18 from dabingnn/mesh3d_work
Mesh3d work
commit 76d2523ae735384533a1e37f06e370cb3481b0f2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:25:40 2014 -0700
move 3d shaders to shader cache
commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de
Merge: 2c9a573 c6fbd6e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 13:56:00 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 13:55:49 2014 -0700
meshcommand
commit 0631a51c5d9c0aae55447105b962a888e1158cd3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 13:21:36 2014 -0700
add mesh rebuild when come to foreground in android
commit 8695016869ab56f3a046f488485f9fdfb6532417
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 13:13:59 2014 -0700
android work now
commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5
Merge: cd7b235 0466a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 12:21:40 2014 -0700
Merge pull request #17 from dabingnn/mesh3d_work
Mesh3d work
commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8
Merge: e349e4e cd7b235
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:19:24 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:18:49 2014 -0700
commit the changed IOS/MAC project file
commit a7c9a65d5603622b1d40cc009dfceee60c376f50
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:17:57 2014 -0700
remove MeshPart
commit cd7b235b5ec5b3ce21bc856888d383e6224fd047
Merge: e666045 3b7b406
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 11:03:54 2014 -0700
Merge pull request #16 from dabingnn/mesh3d_work
Mesh3d work
commit 3b7b406caff0b6f79fe044612a32e909f778d1e3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 10:59:10 2014 -0700
raw version of single Mesh
commit e666045aa4768199c530f494f0a1fb402f2ce922
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 10:44:04 2014 -0700
fix outline
commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 10:09:45 2014 -0700
without normal no outline effect
commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 22:39:03 2014 -0700
android listenBackToForeground
commit 6bec670319ea154474c32c941c250bc3909a7e2e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:58:09 2014 -0700
add boss1 with normal
commit 35c1b8d5fcec188cbef92457e24721ae53820328
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:54:20 2014 -0700
change cache
commit 076166fba142d5432bbadaf3e75d6c35bcb6905a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:35:59 2014 -0700
depress no .mtl crash
commit 498c9693a7e7009615382c5769b7493c3ff6be68
Merge: 8a63b49 d4fd946
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:58:50 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970
Merge: b4a8fee f395cc5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:58:36 2014 -0700
merge dabingnn
commit d4fd946fc8afdc95741f6a170e489d3dca9e2519
Merge: f395cc5 a17f074
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 15:53:58 2014 -0700
Merge pull request #15 from dabingnn/mesh3d_work
Mesh3d work
commit a17f074302d10ff03881cba7e634e094d31feb0a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:52:58 2014 -0700
android can work now
commit b4a8fee4b9735e16331a5656055572db9e551367
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:33:07 2014 -0700
refactoring render code
commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2
Merge: f129e02 a2c12df
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 15:27:21 2014 -0700
Merge pull request #14 from dabingnn/mesh3d_work
Mesh3d work
commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac
Merge: 1932e22 f129e02
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:26:19 2014 -0700
Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work
commit 1932e22962a79530adf583f24070efcee32251d3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:25:55 2014 -0700
android can compile now(can not work)
commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def
Merge: ae2aa0d c0d9097
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 14:21:09 2014 -0700
Merge pull request #13 from dabingnn/mesh3d_work
Mesh3d work
commit c0d90973c2b87582e99966256c74dcdf23712d6a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 14:15:16 2014 -0700
include Sprite3DEffect in the cocos2d header
commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 12:51:09 2014 -0700
outline sprite
commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a
Merge: 1c76d4c 48e9f39
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 10:48:55 2014 -0700
meshvertexattrib work
commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 10:40:55 2014 -0700
use meshvertexattribute
commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6
Merge: b70bf52 e0d87a9
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 09:41:57 2014 -0700
Merge pull request #12 from dabingnn/mesh3d_work
Mesh3d work
commit e0d87a99f42f808429917c8b586509ca75e8a5e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:40:14 2014 -0700
remove compile error
commit c445e07c895fc2352f1220459d91f41f77690cd8
Merge: b70bf52 86fb75a#11 from dabingnn/mesh3d_work
Mesh3d work
commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93
Merge: 02deb39 d98adb7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 19:05:40 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 02deb399314f01ec1222d78f2383a65614e33a34
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 19:04:15 2014 -0700
fix texcoord y flipped
commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775
Merge: 300eb4e 946283b
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 18:35:08 2014 -0700
Merge pull request #10 from dabingnn/mesh3d_work
Mesh3d work
commit 946283b83218de893c727dc9780291fe1683a4f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 18:22:16 2014 -0700
added blendFunc
commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6
Merge: da7d6a0 ccc0baf
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 16:03:01 2014 -0700
Merge pull request #9 from dabingnn/mesh3d_work
Mesh3d work
commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 16:01:59 2014 -0700
fix compile error after merge
commit 5bfc30b2b930131d23058d99a6862061c2217f38
Merge: da7d6a0 0171e27#8 from dabingnn/mesh3d_work
Mesh3d work
commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0
Merge: f47cfc6 0caad32
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 14:17:01 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit f47cfc67041ed4655a916623a6731876758a5182
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 14:15:06 2014 -0700
add new interface for createSprite3D
commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 13:58:35 2014 -0700
default GLProgram to object
commit 901ccef93593e2c39cca190784b4fc9684dfa9d0
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 13:13:24 2014 -0700
remove compile warning
commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8
Merge: 68bdd0b 3eef54c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 13:01:20 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 12:59:59 2014 -0700
rename init->initWithFile in Sprite3D
commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5
Merge: f719f45 1c8773c
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 12:58:23 2014 -0700
Merge pull request #7 from super626/mesh3d_tmp
Mesh3d
commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e
Merge: 23e8786 f719f45
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 12:56:06 2014 -0700
Merge branch 'mesh3d_tmp' into mesh3d
commit f719f45aba37791ffdfe107569350a1af94cbeb0
Merge: 6bd3f28 1b76467
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:59:46 2014 -0700
Merge pull request #6 from dabingnn/mesh3d_work
Mesh3d work
commit 1b7646759d9efcdf0942a42c0c22964a99309853
Merge: 6bd3f28 87adf9d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:53:17 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:52:41 2014 -0700
adjust line indent and header file define
commit 23e8786892b89e25d1add091a7c3bc618990e579
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 11:44:22 2014 -0700
using vbo
commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5
Merge: 56fc0f4 a239a7e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:42:10 2014 -0700
Merge pull request #5 from dabingnn/mesh3d_work
Mesh3d work
commit a239a7e35a82f497c337d96a025125b92c8daefd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:39:06 2014 -0700
add CCSprite3d include into cocos2d.h
commit 8d580c28a084c1dab2a5ce925871f3361e6b970a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:33:18 2014 -0700
remove cocos2d.h include in Sprite3DTest.h
commit 56fc0f4cbccb07cda972efda302ff6689b958ab2
Merge: ab16a26 8bb75e3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:28:47 2014 -0700
Merge pull request #4 from dabingnn/mesh3d
Mesh3d
commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:26:40 2014 -0700
fix compile error after rename
commit 230a73132c09c66b449efbacbc417974616694c6
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:07:30 2014 -0700
rename FileXXX to CCFileXXX
commit ab16a26376f7deddf1a82f3085668e3fd9f09a12
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 10:52:36 2014 -0700
rename _model to _mesh
commit 92ac7f75d06ad081282bbddcad5920a1f7584264
Merge: 6b911b5 df147d1
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Mon May 12 22:23:59 2014 -0700
Merge pull request #3 from dabingnn/mesh3d
Mesh3d
commit df147d14ddb8e61d907a44c6f03f404c8a68103f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 22:21:22 2014 -0700
fix retain/release in sprite3D
commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 20:04:16 2014 -0700
remove compile warnings
commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 19:16:25 2014 -0700
using glprogramstate work ok
commit 0b4f36a964c28f5f4b3224522f27402e0efbe123
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 18:38:52 2014 -0700
add obj
commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 18:33:23 2014 -0700
use glprogramstate
commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 13:01:56 2014 -0700
sprite3d
commit 2a490c344f2db27d467506cf28c910410bb892e6
Merge: 23a5232 01b015d
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Mon May 12 10:52:17 2014 -0700
Merge pull request #1 from dabingnn/newcode
Newcode
commit 01b015d1238c89b6837ea276a95ce359cf0da5a7
Merge: 23a5232 5d24b3d
2014-05-18 14:49:16 -07:00
defd10da72
modiy size
2014-05-17 22:46:09 +08:00
859242c29b
fixed portrait
2014-05-17 22:24:56 +08:00
231cf5f99a
Merge pull request #20 from chuanweizhang2013/v3luaruntime
...
fixed mac relaunch bug
2014-05-17 19:40:45 +08:00
c7591511f7
fixed version num
2014-05-17 19:38:15 +08:00
150125f411
fixed mac relaunch bug
2014-05-17 19:11:12 +08:00
d38ee1bd0f
Merge pull request #19 from chuanweizhang2013/v3luaruntime
...
fixed head search path
2014-05-17 14:42:36 +08:00
8db2882431
fixed head search path
2014-05-17 14:41:03 +08:00
95149a45e0
Merge pull request #6789 from cocoscodeide/v3
...
update template project vect
2014-05-17 11:44:02 +08:00
84e9cd3a77
modify vec2
2014-05-17 11:35:57 +08:00
6a8712482c
fix build error
2014-05-17 11:30:07 +08:00
45d923e259
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-17 01:18:27 +00:00
b36d503812
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-16 21:39:50 +00:00
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
2014-05-16 14:36:00 -07:00
64fa90ff0f
Vector2 replaced by Vec2
2014-05-16 16:21:36 +02:00
bf2250a67a
Merge pull request #6738 from cocoscodeide/v3
...
update template project lua
2014-05-16 18:10:10 +08:00
6dd7f2d630
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
2014-05-16 17:19:36 +08:00
aa2aa4bcdf
fixed repo
2014-05-16 17:08:33 +08:00
662d8454f7
remove inner function from header file
2014-05-16 16:46:35 +08:00
c2ace4c56e
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-16 08:43:41 +00:00
5cf961912b
fix potential problem
2014-05-16 16:24:26 +08:00
8a407cd0ba
show uploading file in play scene
2014-05-16 15:59:09 +08:00
67a558c83d
for 93562d6aa6
...
update Cocos2dxHelper and AndroidManifest.xml template.
2014-05-16 15:55:00 +08:00
ceeba9a081
mofiy size
2014-05-16 12:02:59 +08:00
48e437801f
add prebuiltruntime
2014-05-16 11:57:03 +08:00
0bec438be8
Merge branch 'v3' of github.com:asmodehn/cocos2d-x into asmo_newv3_cmake_win32
2014-05-15 22:24:33 +09:00
b9562e5dbf
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-15 10:30:59 +00:00
bad30e4b66
Merge pull request #12 from bofeng-song/v3
...
add support for reverse orientation for android
2014-05-15 18:07:14 +08:00
c0297c6e5f
add support for reverse orientation for android
2014-05-15 17:58:23 +08:00
eb00d7816c
Merge pull request #11 from chuanweizhang2013/v3luaruntime
...
set macox deployment target
2014-05-15 17:13:13 +08:00
82f08513b0
set macox deployment target
2014-05-15 17:07:14 +08:00
53a7521c36
Merge pull request #10 from chuanweizhang2013/v3luaruntime
...
fixed warnging
2014-05-15 11:49:28 +08:00
a7c0a44792
fixed warnging
2014-05-15 11:34:17 +08:00
354566d782
use RGBA8 as default pixel format
2014-05-15 09:56:26 +08:00
772d22b6fc
Merge pull request #9 from chuanweizhang2013/v3luaruntime
...
V3luaruntime
2014-05-14 18:06:19 +08:00
b42eb08bad
fixed error
2014-05-14 18:01:38 +08:00
d0d20e7272
fix build err
2014-05-14 15:52:58 +08:00
7c8e237ee2
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime
2014-05-14 15:11:59 +08:00
501762f3b5
remove post-new.py
2014-05-14 15:03:32 +08:00
668ed34512
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
2014-05-14 15:03:07 +08:00
20346d8ef6
lua runtime, support custom orientation
2014-05-14 15:02:24 +08:00
e0fe2cb2e2
modify android orientation
2014-05-14 14:58:36 +08:00
cc5ba9b2b1
modify android orientation
2014-05-14 14:40:27 +08:00
d9543e9371
fixed mistake
2014-05-13 18:15:25 +08:00
3207d841a3
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime
2014-05-13 18:01:38 +08:00
0b301d6602
Merge pull request #5 from cocos2d/v3
...
update cocos2d-x
2014-05-13 17:59:18 +08:00
21483b1a47
add start search config.json
2014-05-13 17:44:35 +08:00
c8d871a60b
modify read config time
2014-05-13 15:56:39 +08:00
b0adc6fe51
Modify the lua runtime template for the implementation of downloading runtime files.
2014-05-13 15:06:56 +08:00
4356727465
Merge pull request #6619 from myourys/v3
...
update cpp-default-template for android *Eclipse*
2014-05-13 13:52:28 +08:00
79b679a3b0
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-12 11:05:12 +00:00
eb9fbea7be
Merge pull request #6686 from dumganhar/download-runtime
...
Updates download-deps.py to support to download several zip files. (external and lua-runtime-bin)
2014-05-12 19:00:15 +08:00
e9cf6060be
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-12 09:59:17 +00:00
8115b09d29
Adds config.json for runtime
2014-05-12 17:55:57 +08:00
5dc69026ac
Updates download-deps.py to support download several files.
2014-05-12 17:53:51 +08:00
18e8f1bdae
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-12 08:11:46 +00:00
64b630912d
Merge pull request #3 from chuanweizhang2013/v3luaruntime
...
fixed project name
2014-05-12 13:44:31 +08:00
4ce297458f
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-10 03:58:12 +00:00
63c7c6a05c
Updates template files
2014-05-09 18:41:12 -07:00
722a4d264e
basic fixes for win32 builds
2014-05-10 10:07:29 +09:00
fec1b82c0a
Shader files use STRINGIFY
2014-05-09 16:45:42 -07:00
808561705a
new files for template
2014-05-09 15:40:48 -07:00
d502e41af4
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into codeidev3
...
Conflicts:
templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
2014-05-09 14:28:14 +08:00
c973dba4f1
add entry file support
2014-05-09 14:06:20 +08:00
224b0910c9
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-09 05:42:30 +00:00
6efaa2fe8f
Merge pull request #2 from chuanweizhang2013/v3luaruntime
...
modify luadebug and adjust code file
2014-05-08 22:09:06 +08:00
48566b70e0
add ignore .gz
2014-05-08 20:59:24 +08:00
7ef529b1c4
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-08 10:35:12 +00:00
56f749f273
Merge pull request #6575 from twhittock/lua-main-error-no-launch
...
Lua template should fail to launch on lua error
2014-05-08 17:58:48 +08:00
8f7cb74dd1
fixed debug
2014-05-08 16:02:55 +08:00
fb0094e0b7
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-08 07:30:48 +00:00
9e45b4be3a
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-08 06:00:35 +00:00
8dba4e3b13
Merge pull request #6570 from gin0606/buildNativeVariableArguments
...
Upgrade build_native.py to take variable number of arguments
2014-05-08 13:59:16 +08:00
ee4b6ba2bc
add visibleRect
2014-05-08 13:57:34 +08:00
b9d5ef5eda
add visible
2014-05-08 13:47:41 +08:00
420439cdea
update cpp-default-template for android *Eclipse*
2014-05-08 11:20:25 +08:00
784761828b
modify post-new.py
2014-05-08 09:26:59 +08:00
919a780e2a
add suport ios screen orientation set
2014-05-07 20:50:29 +08:00
7fb79c2a52
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-07 09:43:30 +00:00
21aa7058e3
:= -> +=
2014-05-07 14:35:43 +08:00
976ef3e2a4
add some comment for dependences module in Android.mk to make it simple to use other module
2014-05-07 14:31:05 +08:00
04600227ae
Merge pull request #1 from chuanweizhang2013/v3luaruntime
...
V3luaruntime
2014-05-07 11:34:35 +08:00
c9a7c44537
rename mac simulator app's file simulatorconfig class
2014-05-07 11:10:46 +08:00
12ba2b178e
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-06 11:20:46 +00:00
c3d7465cc7
move win menu bar to sysmenu
2014-05-06 17:03:40 +08:00
12daf49900
added missing Assets folder
2014-05-05 13:48:31 -07:00
cd7ea468e8
modify lua_debugger.c
2014-05-05 21:18:33 +08:00
5164a66e10
add config parser
2014-05-05 21:04:04 +08:00
a587da13fc
Lua template should fail to launch on lua error
...
Without this change, the app continues to run, attempts to access the
badly-initialised scene and issues more error messages. This causes
further errors every frame, covering up the original error in the output
2014-05-05 13:12:42 +01:00
897b3c61ce
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-05 05:40:36 +00:00
dd8d932c0a
Upgrade build_native.py to take variable number of arguments
2014-05-05 12:48:51 +09:00
e32647ec88
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-04 17:37:16 +00:00
8cbcf17163
issue #4674 : Re-added deleted source files.
2014-05-04 14:37:55 +08:00
3b3c1c4dbb
issue #4674 : Removed large files and updated .gitignore
2014-05-04 14:36:16 +08:00
db68b9ca31
Lua and C++ compiles for linux
2014-05-01 15:23:20 -07:00
74d377eb70
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-01 21:14:53 +00:00
32f3fedb37
Moves cocos/2d/Android.mk to cocos/Android.mk
...
Easier to find Android.mk
2014-05-01 14:09:26 -07:00
2247086111
[AUTO][ci skip]: updating cocos2dx_files.json
2014-05-01 00:55:27 +00:00
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
9b3f456f80
Merge pull request #6393 from Dhilan007/v3
...
template work on wp8 now
2014-04-28 14:08:06 +08:00
698657a6ab
template work on wp8 now
2014-04-28 14:04:52 +08:00
e6f7854225
clean for kazmath in project file
2014-04-28 13:14:22 +08:00
62fbf3ff7c
template for linux cpp
2014-04-28 11:24:58 +08:00
honghui