Ricardo Quesada
|
3df4c1fc6c
|
Merge pull request #12371 from CocosRobot/update_cocosfiles_1434486389
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-16 13:30:11 -07:00 |
CocosRobot
|
0b73b53d3a
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-16 20:26:30 +00:00 |
Ricardo Quesada
|
6785369d9a
|
Merge pull request #12357 from MSOpenTech/v3-winrt-librecast
V3: Added Windows 10 UWP librecast. Fix Windows 8.1 librecast
|
2015-06-16 13:05:50 -07:00 |
Dale Stammen
|
eb2bc78970
|
Merge branch 'v3' into v3-winrt-librecast
|
2015-06-16 07:13:53 -07:00 |
pandamicro
|
3f8923648b
|
Merge pull request #12359 from super626/opt_navigation
remove unused code, and use nullptr for pointer
|
2015-06-16 14:58:58 +08:00 |
pandamicro
|
0866180918
|
Merge pull request #12162 from namezero111111/patch-4
JumpTo::clone() results in incorrect end position
|
2015-06-16 13:37:04 +08:00 |
yangxiao
|
4d1aa56193
|
remove unused code, and use nullptr for pointer
|
2015-06-16 11:15:39 +08:00 |
Dale Stammen
|
511fe6a773
|
added missing lib references
|
2015-06-15 20:10:38 -07:00 |
Dale Stammen
|
74f4d29fa9
|
added missing librecast
|
2015-06-15 20:06:54 -07:00 |
Dale Stammen
|
f1c9a592c5
|
updated version to v3-deps-66
|
2015-06-15 19:32:00 -07:00 |
子龙山人
|
76baa96e97
|
Merge pull request #12233 from Furkanzmc/cmake_file_windows_fix
Fix C++ template CMakeLists.txt file to prevent include related errors on Windows
|
2015-06-16 10:30:32 +08:00 |
Dale Stammen
|
8d8e7d6cb9
|
Merge branch 'v3' into v3-winrt-librecast
|
2015-06-15 19:27:40 -07:00 |
子龙山人
|
0b5c7d74b7
|
Merge pull request #12160 from namezero111111/patch-3
Blink::stop() access violation
|
2015-06-16 10:27:38 +08:00 |
Dale Stammen
|
e5dc64f819
|
ignore .vs dir of VS2015
|
2015-06-15 19:26:38 -07:00 |
子龙山人
|
f6af1713dd
|
Merge pull request #12358 from CocosRobot/update_cocosfiles_1434420355
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-16 10:06:48 +08:00 |
CocosRobot
|
22ce7e6ee7
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-16 02:05:57 +00:00 |
子龙山人
|
b182f66329
|
Merge pull request #12346 from natural-law/v3
Add scripts for framework compiling.
|
2015-06-16 10:04:09 +08:00 |
子龙山人
|
271e3295eb
|
Merge pull request #12349 from WenhaiLin/v3-37-NotificationNode-crashfix
Fixed NotificationNode might crash program when the program exits.
|
2015-06-16 09:53:39 +08:00 |
Dale Stammen
|
0781978788
|
added librecast. Updated build properties
|
2015-06-15 18:44:14 -07:00 |
Ricardo Quesada
|
42ad7e24a8
|
Merge pull request #12356 from ricardoquesada/gl_error_check
StateBlock() is public
|
2015-06-15 18:29:06 -07:00 |
Dale Stammen
|
e14fdedf67
|
added missing NavMeshTest files
|
2015-06-15 18:19:51 -07:00 |
Dale Stammen
|
03fc2eca5e
|
added missing navmesh files
|
2015-06-15 18:19:28 -07:00 |
Dale Stammen
|
a73d82990d
|
added librecast
|
2015-06-15 18:18:54 -07:00 |
Ricardo Quesada
|
b167ab3e78
|
StateBlock() is public
|
2015-06-15 17:43:37 -07:00 |
Ricardo Quesada
|
695c2a7137
|
Merge pull request #12355 from ricardoquesada/minor_fixes_renderstate
StateBlock::restore() is public
|
2015-06-15 15:21:41 -07:00 |
Dale Stammen
|
8e4f6afaa1
|
added missing librecast projects
|
2015-06-15 14:32:27 -07:00 |
Ricardo Quesada
|
ca3da86da7
|
StateBlock::restore() is public
It is possible to restore to default state
|
2015-06-15 14:12:44 -07:00 |
Ricardo Quesada
|
aeb9642150
|
Merge pull request #12354 from ricardoquesada/minor_fixes_renderstate
Removes not-needed draws
|
2015-06-15 12:21:20 -07:00 |
Dale Stammen
|
9262cc95bf
|
fixed project filters broken by recent additions of files
|
2015-06-15 11:38:52 -07:00 |
Ricardo Quesada
|
c17da7e90d
|
Removes not-needed draws
|
2015-06-15 10:40:47 -07:00 |
WenhaiLin
|
3c8d15f6f8
|
Fixed NotificationNode might crash program when the program exits.
|
2015-06-15 17:55:00 +08:00 |
Bin Zhang
|
fb920acccf
|
Add scripts for framework compiling.
|
2015-06-15 16:33:24 +08:00 |
子龙山人
|
86b6ea702a
|
Merge pull request #12342 from WenhaiLin/v3-37-android-studio-fix
[ci skip]Android Studio projects:Fixed compile error.
|
2015-06-15 14:48:42 +08:00 |
WenhaiLin
|
518de1ff57
|
[ci skip]Android Studio projects:Fixed compile error.
|
2015-06-15 14:42:45 +08:00 |
pandamicro
|
bef7e7863e
|
Merge pull request #12339 from pandamicro/v3
[ci skip] Update html5 engine
|
2015-06-15 13:47:56 +08:00 |
pandamicro
|
b63973ffb8
|
Merge pull request #12338 from CocosRobot/update_lua_bindings_1434346950
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-15 13:47:22 +08:00 |
CocosRobot
|
8ec924c206
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-06-15 05:46:51 +00:00 |
pandamicro
|
8b21d5b219
|
Update html5 engine
|
2015-06-15 13:45:09 +08:00 |
pandamicro
|
ce6b3d7e76
|
Merge pull request #12337 from CocosRobot/update_cocosfiles_1434346866
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-15 13:42:56 +08:00 |
CocosRobot
|
f7ec4b2db5
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-06-15 05:41:07 +00:00 |
pandamicro
|
0216d05eee
|
Merge pull request #12102 from super626/navigation2
3D Navigation
|
2015-06-15 13:39:05 +08:00 |
pandamicro
|
c9c05ff982
|
Merge pull request #12314 from xiaofeng11/v3_xiaofeng
Fix when button reader bug
|
2015-06-15 13:13:39 +08:00 |
pandamicro
|
0c1347a6cf
|
Merge pull request #12336 from jianglong0156/addResjs
modify js special resource path
|
2015-06-15 13:12:57 +08:00 |
yangxiao
|
16a0ddc74e
|
rename CCNavMeshTool to CCNavMeshUtils
|
2015-06-15 12:52:55 +08:00 |
pandamicro
|
d0db40c4a6
|
Merge pull request #12080 from linshun/v3
issue #12078 added audio, network, physics, platform and storage group.
|
2015-06-15 12:45:11 +08:00 |
yangxiao
|
97ef7974bb
|
create agent in the onEnter
|
2015-06-15 11:57:05 +08:00 |
linshun
|
c54d4bab31
|
issue #12078: renamed platform to platform specific.
|
2015-06-15 10:46:09 +08:00 |
linshun
|
efed0da8bc
|
issue #12078: added subgroup of physics 2d.
|
2015-06-15 10:28:37 +08:00 |
jianglong0156
|
10ed5e0b78
|
modify ios project
|
2015-06-15 10:03:58 +08:00 |
jianglong0156
|
5ff0825468
|
modify android res copy
|
2015-06-15 09:55:10 +08:00 |