minggo
|
c69707bce4
|
Merge pull request #7964 from CocosRobot/update_lua_bindings_1410229858
[AUTO]: updating luabinding automatically
|
2014-09-09 10:33:38 +08:00 |
Dhilan007
|
1b96b2ac87
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909
|
2014-09-09 10:32:56 +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 |
sunzhuoshi
|
66070868f7
|
Added Math SSE implementation on x86
|
2014-09-08 20:58:59 +08:00 |
Jeff Wang
|
2804e572d2
|
Merge pull request #3 from cocos2d/v3
update
|
2014-09-08 18:29:59 +08:00 |
Chuanren Wu
|
0b58ff7fce
|
introduce substeps for accurate physics
|
2014-09-08 00:14:40 +02:00 |
andyque
|
d6b96d1e46
|
add chipmunk to wp project
|
2014-09-06 13:28:00 +08: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 |
andyque
|
59dc56bfcb
|
remove chipmunk dependency
|
2014-09-05 21:59:30 +08:00 |
DENPEN
|
0cfb8c6469
|
fix ScrollView bug
I Fixed a bug that scroll view hidden picks up the touch events.
|
2014-09-05 20:49:15 +09: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 |
andyque
|
2a8601ee1f
|
Merge branch 'addChipmunkStaticLib' of github.com:andyque/cocos2d-x into addChipmunkStaticLib
|
2014-09-05 15:43:59 +08:00 |
huangshiwu
|
01358f0b62
|
fix wp8 compile error and modify default resource path
|
2014-09-05 15:43:08 +08:00 |
samuele3hu
|
f100dac9b8
|
Fix the error that number of params was judged wrong for lua bindings of EventListenerMouse::create
|
2014-09-05 15:43:07 +08:00 |
andyque
|
08c7f32627
|
add chipmunk static library for win32
|
2014-09-05 15:38:12 +08:00 |
yangxiao
|
730ab846c3
|
code adjustment
|
2014-09-05 14:59:14 +08:00 |
Dhilan007
|
1d900940ab
|
Refactoring API:
1.Remove Singleton Pattern
2.Make AudioProfile clear.
|
2014-09-05 14:34:30 +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 |
Dhilan007
|
6b4b5ed943
|
Refactoring API:
1.Remove Singleton Pattern
2.Make AudioProfile clear.
|
2014-09-05 11:13:51 +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 |
yangxiao
|
8da7a4b2de
|
merge cocos reslove conflict
|
2014-09-04 17:40:14 +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
|
88ec0392a0
|
remove unused method
|
2014-09-04 17:15:28 +08:00 |
yangxiao
|
31dc3301b3
|
add space line
|
2014-09-04 17:03:46 +08:00 |
yangxiao
|
a5e1e692e8
|
Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard
|
2014-09-04 17:00:49 +08:00 |
XiaoYang
|
ec98779974
|
Merge pull request #127 from liuliang2004/billboard
Add a bulletin board test example
|
2014-09-04 17:00:29 +08:00 |
liuliang
|
c42bef1f02
|
Add a bulletin board test example
|
2014-09-04 16:58:00 +08:00 |
yangxiao
|
d183e64c83
|
add to template
|
2014-09-04 16:52:45 +08:00 |
yangxiao
|
d114e11a0b
|
android, linux and lua
|
2014-09-04 16:45:42 +08:00 |
yangxiao
|
ed63f01c7e
|
seperate billboard test from Sprite3D test
|
2014-09-04 16:27:18 +08:00 |
yangxiao
|
226e60a3ee
|
rename billboard
|
2014-09-04 16:26:36 +08:00 |
yangxiao
|
86d9ce381b
|
rename billboard
|
2014-09-04 16:26:11 +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 |
CocosRobot
|
6bd05770e7
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-09-04 06:00:43 +00:00 |
minggo
|
43e2b39bc0
|
Merge pull request #7921 from dabingnn/v3_trianglesCommand
V3 triangles command
|
2014-09-04 13:58:50 +08:00 |