cocos2d/cocos2d-x — pull request #7980 by ricardoquesada (2014-09-09 19:16:52+00:00)
Title: Squashed commit of the following:

commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada
Date: Tue Sep 9 09:34:40 2014 -0700

Compiles luasocket on Mac

commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada
Date: Tue Sep 9 09:12:30 2014 -0700

disables luasockets

commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada
Date: Tue Sep 9 08:10:48 2014 -0700

Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx

Conflicts:
cocos/3d/cocos3d.h

commit 0abe4cbbb6c124de99183b8ce23c121c3c406096
Merge: c4fe572 6a4397a
Author: minggo
Date: Tue Sep 9 16:41:24 2014 +0800

Merge pull request #7974 from andyque/fixWin32CompileError

change toolset from 12.0 to 4.0

commit 6a4397a3eb38e4177c503eaa076a5230c0526e60
Author: andyque
Date: Tue Sep 9 15:57:21 2014 +0800

change toolset from 12.0 to 4.0

commit c4fe5728eefdcd1820051f09f68ad4853588305b
Merge: 1ee9ceb ed8835d
Author: minggo
Date: Tue Sep 9 15:23:39 2014 +0800

Merge pull request #7973 from CocosRobot/update_lua_bindings_1410244922

[AUTO]: updating luabinding automatically

commit ed8835d2625a0a9c35497cf931c554006cff2e33
Author: CocosRobot
Date: Tue Sep 9 06:43:49 2014 +0000

[AUTO]: updating luabinding automatically

commit 1ee9cebebd082123b2f908165e7ddcf7d0cc3d28
Merge: 2ba6e73 336b545
Author: minggo
Date: Tue Sep 9 14:39:15 2014 +0800

Merge pull request #7925 from super626/transition

Animation3D

commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada
Date: Mon Sep 8 23:21:03 2014 -0700

compiles on Linux

commit 2ba6e732122d46164dfd5c24991ddd66b34f3296
Merge: 162fb3e a2dcb71
Author: minggo
Date: Tue Sep 9 14:20:16 2014 +0800

Merge pull request #7966 from CocosRobot/update_lua_bindings_1410231097

[AUTO]: updating luabinding automatically

commit 162fb3ec18facf60eeb1fa891ddcb5d40329882d
Merge: 9373d09 905c429
Author: minggo
Date: Tue Sep 9 14:20:00 2014 +0800

Merge pull request #7967 from minggo/remove-_setLocalZOrder

deprecated Node::_setZOrder()

commit 9373d096e8afd0db82cb86a286f5279364379eb8
Merge: 6b99ce6 83e1425
Author: minggo
Date: Tue Sep 9 14:18:07 2014 +0800

Merge pull request #7969 from andyque/fixUI

deprecated ui::TextField getStringValue and setText, use getString and

commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada
Date: Mon Sep 8 23:16:46 2014 -0700

all projecs compiles with CMake

commit 336b545f4f27ed346f6d50886a2bcf0ef10fd600
Merge: a6337a3 be72d57
Author: XiaoYang
Date: Tue Sep 9 14:05:08 2014 +0800

Merge pull request #128 from liuliang2004/transition

Modify the environment configuration

commit be72d5730ce4fd2b4d82f492b06e7522f13be29b
Author: liuliang
Date: Tue Sep 9 14:03:27 2014 +0800

Modify the environment configuration

commit 83e14259adabefa8b7fb01e2e4e3036e64571ef8
Author: andyque
Date: Tue Sep 9 13:59:35 2014 +0800

deprecated ui::TextField getStringValue and setText, use getString and
setString instead

commit a6337a3c56cde21f4fa070f287ab08b13d8548d4
Author: yangxiao
Date: Tue Sep 9 13:20:33 2014 +0800

remove sequence3d

commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada
Date: Mon Sep 8 21:47:27 2014 -0700

CCUserDefualt.mm better includes

commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada
Date: Mon Sep 8 21:26:36 2014 -0700

cpp-tests compiles and works on Mac using CMake

commit b88c462c8fdc4e0b9405efd462627802dabff944
Author: yangxiao
Date: Tue Sep 9 11:34:17 2014 +0800

remove Sequence3D

commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada
Date: Mon Sep 8 20:12:09 2014 -0700

Adds missing files to CMakeLists.txt

commit 905c429ff54a228f2856d71c4159351fa5176539
Author: minggo
Date: Tue Sep 9 10:58:07 2014 +0800

remove unneeded code

commit 31c508ef6de537a55ae73cffc52077f5436dc584
Author: minggo
Date: Tue Sep 9 10:55:27 2014 +0800

deprecated Node::_setZOrder()

commit a2dcb71a24150673fe9e34e500ea17fce417d355
Author: CocosRobot
Date: Tue Sep 9 02:53:20 2014 +0000

[AUTO]: updating luabinding automatically

commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada
Date: Mon Sep 8 19:52:34 2014 -0700

Adds more box2d missing files

commit 6b99ce6ec0062e92d6e6fc43cc51ee5793741a18
Merge: 3771438 5cca8cc
Author: minggo
Date: Tue Sep 9 10:49:09 2014 +0800

Merge pull request #7939 from minggo/remove-_setLocalZOrder

remove Node::_setLocalZOrder()

commit 3771438ae0bd45f6f380a81252d74516be07e67c
Merge: c69707b 511ee30
Author: minggo
Date: Tue Sep 9 10:42:02 2014 +0800

Merge pull request #7965 from oleg-akatsuki/patch-2

Move constructor from private to public

commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada
Date: Mon Sep 8 19:39:54 2014 -0700

Adds missing box2d files

commit a295159a3aa64b4cdc1c99797540c7bb41ec99cd
Merge: 1bd09f2 c69707b
Author: yangxiao
Date: Tue Sep 9 10:37:08 2014 +0800

Merge branch 'newcode' into transition

commit 511ee30b6e4f9f73ea5a614fd3e484a6c4f46196
Author: oleg-akatsuki
Date: Tue Sep 9 11:34:48 2014 +0900

Move constructor from private to public

In my project I want to add extra functionality to FileUtils. For security reasons I make FileUtils function that can extract encoded data directly to memory without storing it on disk. So I am trying to use FileUtilsAndroid as base class, but it is impossible as constructor is hidden as private member. I offer to move constructor to either public or protected to make it possible to use FileUtilsAndroid as base class.

Another way to solve the problem is to remove constructor as FileUtilsApple does not have a constructor.

commit c69707bce4a001d620ec483403da3e6120adace7
Merge: fd7bb34 af6b6bb
Author: minggo
Date: Tue Sep 9 10:33:38 2014 +0800

Merge pull request #7964 from CocosRobot/update_lua_bindings_1410229858

[AUTO]: updating luabinding automatically

commit af6b6bb7b99de503117bece98fe6ef54d606bfd7
Author: CocosRobot
Date: Tue Sep 9 02:32:49 2014 +0000

[AUTO]: updating luabinding automatically

commit fd7bb349bb20d157acdabe89cacfb90f91887cd6
Author: minggo
Date: Tue Sep 9 10:29:59 2014 +0800

[ci skip]

commit f2788c234f402305e70baf036cd4f51c847679ef
Author: minggo
Date: Tue Sep 9 10:29:32 2014 +0800

[ci skip]

commit 8c595e9d24330e3997707e79f67b111380e9fad6
Merge: 56a412d 0b58ff7
Author: minggo
Date: Tue Sep 9 10:27:59 2014 +0800

Merge pull request #7962 from jagd/v3

introduce substeps for an accurate simulation of physics

commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada
Date: Mon Sep 8 18:44:15 2014 -0700

Initial CMake support for Mac

commit 0b58ff7fce06fd826c892a798820734e21e683e4
Author: Chuanren Wu
Date: Mon Sep 8 00:14:40 2014 +0200

introduce substeps for accurate physics

commit 5cca8cc87d25a747fc90489f27461d2667c50c3a
Author: minggo
Date: Wed Sep 3 17:26:50 2014 +0800

remove Node::_setLocalZOrder()

commit 1bd09f21d01e0369522a9a9775db8dd472804d68
Merge: 5fc5741 5fa3e11
Author: yangxiao
Date: Wed Sep 3 15:42:58 2014 +0800

merge cocos

commit 5fc57412859e01b20213c3c2d86e88d43658a39f
Author: yangxiao
Date: Wed Sep 3 12:44:54 2014 +0800

not export Sequence3D

commit 6e55a508de25e188ac807dd569451326144de9c8
Author: yangxiao
Date: Wed Sep 3 12:08:58 2014 +0800

not export Sequence3D::create

commit cb96458878fd03f21fd01de9988173c63e1061f0
Author: yangxiao
Date: Wed Sep 3 11:06:38 2014 +0800

not export Sequence3D

commit f59f43251a6dbc8ed14b230ce5120f7fd32c99a4
Author: yangxiao
Date: Wed Sep 3 10:38:21 2014 +0800

failed to export Sequence3D::create

commit 8dff467b27c43001ee4a641ffc1a26a38ce80cbe
Merge: f84c6a5 4881ca3
Author: yangxiao
Date: Wed Sep 3 09:15:12 2014 +0800

Merge branch 'newcode' into transition

commit f84c6a5d27438b24d10053c41e08a5b65fcd8276
Merge: 49a2122 4749205
Author: yangxiao
Date: Tue Sep 2 17:15:05 2014 +0800

Merge branch 'newcode' into transition

commit 49a2122e17c12c6e6229bf887be3d3535b385ede
Author: yangxiao
Date: Tue Sep 2 14:28:46 2014 +0800

add sequence3d to template

commit 50a7a1703ac0891a28d5ab2380d5eff4155263d8
Author: yangxiao
Date: Tue Sep 2 12:05:37 2014 +0800

add sequence3d to template

commit aab78c898e11b79688fed8487a81c3d87737ba9f
Merge: d542624 88a8049
Author: yangxiao
Date: Tue Sep 2 10:45:46 2014 +0800

Merge branch 'newcode' into transition

commit d542624bfd426fce0a80ea2181043039bb07cf8b
Author: yangxiao
Date: Tue Sep 2 10:40:29 2014 +0800

remove from map when release

commit 2a0743e5a567a653832365e1ddc08973136a463c
Merge: 9ce30bd c4242b4
Author: XiaoYang
Date: Mon Sep 1 17:58:22 2014 +0800

Merge pull request #121 from liuliang2004/transition

Configure project file

commit 9ce30bdabd1d896cdf76f5700ad7618a7cd27c2b
Author: yangxiao
Date: Mon Sep 1 17:52:13 2014 +0800

add to linux

commit c4242b4d0b637df2d297ec73315bf35ee8c5a2ad
Author: liuliang
Date: Mon Sep 1 17:45:45 2014 +0800

Configure project file

commit 57a70b629fa628a905a4a0c2ac134e51da6f5c4b
Author: yangxiao
Date: Mon Sep 1 16:00:50 2014 +0800

add sequence3d

commit 33005bedcbdb407979599e6bb1bbc8c7fdea5df1
Author: yangxiao
Date: Mon Sep 1 15:32:06 2014 +0800

add to cocos3d

commit 97c8764ae728e1f1ee67347ddaa7858cb845804a
Author: yangxiao
Date: Mon Sep 1 15:21:47 2014 +0800

remove unused header

commit 538fe2e543baeab8d6e15b9d6502caaddb79b4be
Merge: b5a3bb1 d2a49d1
Author: yangxiao
Date: Mon Sep 1 15:14:30 2014 +0800

Merge branch 'newcode' into transition

commit b5a3bb1c03c0474d6b60bee5ffe89df7f6529f08
Author: yangxiao
Date: Mon Sep 1 15:07:06 2014 +0800

sequence3d work

commit f3e017e139fef8f525f661a0bf77437dc7f90587
Author: yangxiao
Date: Mon Sep 1 09:34:09 2014 +0800

normalize quat

commit a039d6b0fc3824025bcfce8025ad29934885cef7
Author: yangxiao
Date: Fri Aug 29 18:25:42 2014 +0800

animate3d transition

commit a3dd4e101a5be527114cc26d9440ebbbe6688439
Author: yangxiao
Date: Thu Aug 28 18:53:15 2014 +0800

animation transition

commit 16ab05a8cf3c0adccfeb37cde35b3fbe96fdbd14
Author: yangxiao
Date: Thu Aug 28 13:47:17 2014 +0800

sequence3d