Ricardo Quesada
6f3ca63f00
Moved base/CCPlatform* -> platform/CCPlatform*
2014-09-09 17:17:07 -07:00
Ricardo Quesada
73450be715
compiles and runs in Linux
2014-09-09 17:11:06 -07:00
Ricardo Quesada
f5e54f8e69
Fixes for linux compilation
2014-09-09 17:01:07 -07:00
Ricardo Quesada
9082ca18c3
Platform fixed
2014-09-09 16:50:02 -07:00
Ricardo Quesada
81fa462f3d
Merge pull request #7981 from ricardoquesada/cmakefile_for_mac
...
Squashed commit of the following:
2014-09-09 12:21:41 -07:00
Ricardo Quesada
0ead7b6307
Squashed commit of the following:
...
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:34:40 2014 -0700
Compiles luasocket on Mac
commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:12:30 2014 -0700
disables luasockets
commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
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 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:21:03 2014 -0700
compiles on Linux
commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:16:46 2014 -0700
all projecs compiles with CMake
commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:47:27 2014 -0700
CCUserDefualt.mm better includes
commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:26:36 2014 -0700
cpp-tests compiles and works on Mac using CMake
commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 20:12:09 2014 -0700
Adds missing files to CMakeLists.txt
commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:52:34 2014 -0700
Adds more box2d missing files
commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:39:54 2014 -0700
Adds missing box2d files
commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 18:44:15 2014 -0700
Initial CMake support for Mac
2014-09-09 12:18:31 -07:00
minggo
0abe4cbbb6
Merge pull request #7974 from andyque/fixWin32CompileError
...
change toolset from 12.0 to 4.0
2014-09-09 16:41:24 +08:00
andyque
6a4397a3eb
change toolset from 12.0 to 4.0
2014-09-09 15:57:21 +08:00
minggo
c4fe5728ee
Merge pull request #7973 from CocosRobot/update_lua_bindings_1410244922
...
[AUTO]: updating luabinding automatically
2014-09-09 15:23:39 +08:00
CocosRobot
ed8835d262
[AUTO]: updating luabinding automatically
2014-09-09 06:43:49 +00:00
minggo
1ee9cebebd
Merge pull request #7925 from super626/transition
...
Animation3D
2014-09-09 14:39:15 +08:00
minggo
2ba6e73212
Merge pull request #7966 from CocosRobot/update_lua_bindings_1410231097
...
[AUTO]: updating luabinding automatically
2014-09-09 14:20:16 +08:00
minggo
162fb3ec18
Merge pull request #7967 from minggo/remove-_setLocalZOrder
...
deprecated Node::_setZOrder()
2014-09-09 14:20:00 +08:00
minggo
9373d096e8
Merge pull request #7969 from andyque/fixUI
...
deprecated ui::TextField getStringValue and setText, use getString and
2014-09-09 14:18:07 +08:00
XiaoYang
336b545f4f
Merge pull request #128 from liuliang2004/transition
...
Modify the environment configuration
2014-09-09 14:05:08 +08:00
liuliang
be72d5730c
Modify the environment configuration
2014-09-09 14:03:27 +08:00
andyque
83e14259ad
deprecated ui::TextField getStringValue and setText, use getString and
...
setString instead
2014-09-09 13:59:35 +08:00
yangxiao
a6337a3c56
remove sequence3d
2014-09-09 13:20:33 +08:00
yangxiao
b88c462c8f
remove Sequence3D
2014-09-09 11:34:17 +08:00
minggo
905c429ff5
remove unneeded code
2014-09-09 10:58:07 +08:00
minggo
31c508ef6d
deprecated Node::_setZOrder()
2014-09-09 10:55:27 +08:00
CocosRobot
a2dcb71a24
[AUTO]: updating luabinding automatically
2014-09-09 02:53:20 +00:00
minggo
6b99ce6ec0
Merge pull request #7939 from minggo/remove-_setLocalZOrder
...
remove Node::_setLocalZOrder()
2014-09-09 10:49:09 +08:00
minggo
3771438ae0
Merge pull request #7965 from oleg-akatsuki/patch-2
...
Move constructor from private to public
2014-09-09 10:42:02 +08:00
yangxiao
a295159a3a
Merge branch 'newcode' into transition
2014-09-09 10:37:08 +08:00
oleg-akatsuki
511ee30b6e
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.
2014-09-09 11:34:48 +09:00
minggo
c69707bce4
Merge pull request #7964 from CocosRobot/update_lua_bindings_1410229858
...
[AUTO]: updating luabinding automatically
2014-09-09 10:33:38 +08:00
CocosRobot
af6b6bb7b9
[AUTO]: updating luabinding automatically
2014-09-09 02:32:49 +00:00
minggo
fd7bb349bb
[ci skip]
2014-09-09 10:29:59 +08:00
minggo
f2788c234f
[ci skip]
2014-09-09 10:29:32 +08:00
minggo
8c595e9d24
Merge pull request #7962 from jagd/v3
...
introduce substeps for an accurate simulation of physics
2014-09-09 10:27:59 +08:00
Chuanren Wu
0b58ff7fce
introduce substeps for accurate physics
2014-09-08 00:14:40 +02:00
Ricardo Quesada
56a412dc34
Merge pull request #7959 from ricardoquesada/xcshared_data_for_missing_projects
...
Adds missing xcshared data for missing projects
2014-09-05 14:32:54 -07:00
Ricardo Quesada
33a4cd396d
Adds missing xcshared data for missing projects
2014-09-05 14:32:14 -07:00
minggo
78d4e9797c
Merge pull request #7955 from dabingnn/v3_reverse_VBOSIZE
...
roll back, VBO_SIZE to 65536, INDEX_VBO_SIZE to 65536 * 1.5
2014-09-05 18:22:46 +08:00
Huabing.Xu
73b201b702
roll back, VBO_SIZE to 65536, INDEX_VBO_SIZE to 65536 * 1.5
2014-09-05 16:01:17 +08:00
minggo
1bf6c79329
Merge pull request #7953 from samuele3hu/v3_check_newnon
...
Fix the error that number of params was judged wrong for lua bindings of EventListenerMouse::create
2014-09-05 11:37:57 +08:00
minggo
0fc1baee65
Merge pull request #7954 from huangshiwu/v3_wp8fix_pr
...
fix wp8 compile error and modify default resource path
2014-09-05 11:36:32 +08:00
huangshiwu
7372604f7f
fix wp8 compile error and modify default resource path
2014-09-05 11:21:08 +08:00
samuele3hu
750bc4783d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_check_newnon
2014-09-05 09:40:28 +08:00
samuele3hu
6209530e66
Fix the error that number of params was judged wrong for lua bindings of EventListenerMouse::create
2014-09-05 09:39:43 +08:00
minggo
a2ee559244
[ci skip]
2014-09-04 22:38:26 +08:00
minggo
9aefbeaed5
[ci skip]
2014-09-04 22:37:15 +08:00
minggo
5e505fbc12
Merge pull request #7951 from samuele3hu/v3_check_newnon
...
getAllTouches() in GLViewProtocol
2014-09-04 22:35:15 +08:00
samuele3hu
8c2ab3a4e7
Add manual lua bindings for GLView::getAllTouches
2014-09-04 22:12:59 +08:00
samuele3hu
61d1b67116
Merge branch 'v3_getAllTouches' of https://github.com/newnon/cocos2d-x into v3_check_newnon
2014-09-04 18:17:05 +08:00
minggo
060dfd94f3
Merge pull request #7948 from super626/v3
...
Bugs on creating user custom mesh
2014-09-04 17:39:40 +08:00
yangxiao
08a1405bdc
fix bug on custom mesh
2014-09-04 14:26:23 +08:00
minggo
d26446c73f
[ci skip]
2014-09-04 14:02:20 +08:00
minggo
137ce4d3da
Merge pull request #7946 from CocosRobot/update_cocosfiles_1409810442
...
[AUTO][ci skip]: updating cocos2dx_files.json
2014-09-04 14:01:19 +08:00