minggo
|
3810854c45
|
use std::isnan instead of isnan to fix compiling errors
|
2016-05-30 18:19:10 +08:00 |
BQ
|
93ed59bfb3
|
English grammar corrections.
|
2016-05-25 15:25:38 +01:00 |
BQ
|
6097c3abd1
|
English grammar corrections.
Make brackets consistent.
|
2016-05-25 15:18:57 +01:00 |
minggo
|
9c0acf1e5d
|
Merge pull request #15619 from VisualSJ/v3_audio
audio search path (android)
|
2016-05-19 18:06:58 +08:00 |
zilongshanren
|
b154f274a5
|
Merge pull request #15410 from 1scaR1/up_v3
Make PageView indicator more tunable
|
2016-05-19 16:19:18 +08:00 |
Wilson E. Alvarez
|
f0343bf219
|
Fixed APP_NAME for cpp, cpp-empty, js, and lua tests.
|
2016-05-13 22:13:05 -04:00 |
minggo
|
74af3b5232
|
merge v3.11 back to v3
|
2016-05-12 09:50:03 +08:00 |
ViusualSJ
|
ada1d1dfe8
|
audio search path (android)
|
2016-05-11 17:24:14 +08:00 |
minggo
|
2ad6f10bb6
|
Merge pull request #15609 from pandamicro/v3.11
Fix web engine issues and SocketIO connection fail issue
|
2016-05-11 09:28:24 +08:00 |
pandamicro
|
05dd3bb608
|
Fix web engine issues in test cases
|
2016-05-10 20:34:35 +08:00 |
minggo
|
2a712a0c3b
|
set correct package name
|
2016-05-09 18:14:53 +08:00 |
minggo
|
5d7cbe622a
|
Merge pull request #15589 from pandamicro/v3.11
Add cc.game.end to close game window
|
2016-05-07 22:11:46 +08:00 |
minggo
|
c4b2f6ff35
|
Merge pull request #15584 from VisualSJ/v3.11_bugs
loader test bug
|
2016-05-07 22:07:49 +08:00 |
pandamicro
|
1980311204
|
Fix OpenGL test issue on web
|
2016-05-07 17:31:58 +08:00 |
pandamicro
|
d0fc3ec4c4
|
Add cc.game.end to close game window
|
2016-05-07 14:37:36 +08:00 |
ViusualSJ
|
cb8cde63b1
|
loader test bug
|
2016-05-06 17:19:33 +08:00 |
minggo
|
44063b8e85
|
Merge pull request #15568 from zilongshanren/fix-jsb-related-issues
fix jsb 3.11 related issues
|
2016-05-05 11:01:44 +08:00 |
zilongshanren
|
8c046fea92
|
fix jsb 3.11 related issues
|
2016-05-05 10:20:00 +08:00 |
minggo
|
a5602cc732
|
merge v3.11 back to v3
|
2016-05-04 16:02:23 +08:00 |
pandamicro
|
1886ac1349
|
Fix http arraybuffer test can not load issue
|
2016-05-04 15:48:16 +08:00 |
minggo
|
788dae5a2e
|
Merge pull request #15531 from pandamicro/v3.11
Fix clipping node memory management issue and update web engine
|
2016-04-28 16:15:59 +08:00 |
pandamicro
|
27b9510f2c
|
Upgrade web engine to v3.11 beta and fix issues with js-tests
|
2016-04-28 16:12:29 +08:00 |
mogemimi
|
85646b8d80
|
Fix warning C4305 while compiling AppDelegate with MSVC
|
2016-04-20 04:01:06 +09:00 |
Dale Stammen
|
4d7bf1f827
|
updated expiration dates of all winrt test app and template certificates
|
2016-04-19 09:07:30 -07:00 |
zilongshanren
|
001a0ee812
|
remove useless warning log of stencil buffer. (#15396)
1. disable GC for Native object
2. improve js tests of label
|
2016-04-18 15:43:54 +08:00 |
xpol
|
1e70fb5eb5
|
Remove include of cocos2d.h (#15435)
|
2016-04-18 15:09:21 +08:00 |
Бесшапошников Никита
|
32e9f9eb15
|
Add js-tests for page view indicator tune.
|
2016-04-11 13:44:25 +03:00 |
Бесшапошников Никита
|
32b64831da
|
Fixed ccui.ListView Test
|
2016-04-11 11:28:46 +08:00 |
Бесшапошников Никита
|
cf32f8a2f0
|
Add PageView js tests
|
2016-04-11 11:27:50 +08:00 |
Бесшапошников Никита
|
273281ecce
|
Add ListView js tests
|
2016-04-11 11:27:38 +08:00 |
Бесшапошников Никита
|
8ae6d68640
|
Add scroll view bar js test
|
2016-04-11 11:27:25 +08:00 |
Ricardo Quesada
|
fea84b8af3
|
fix: use chipmunk v6.2 API whenever possible
fix: make it more compatible with chipmunk v6.2 code
fix: make it more compatible with chipmunk v6.2.2
|
2016-04-11 11:12:34 +08:00 |
Бесшапошников Никита
|
9459d2b67e
|
Fixed ccui.ListView Test
|
2016-04-08 15:31:51 +03:00 |
Бесшапошников Никита
|
c7bea705af
|
Add PageView js tests
|
2016-04-08 14:01:20 +03:00 |
Бесшапошников Никита
|
dbd2b5fd03
|
Add ListView js tests
|
2016-04-08 13:40:21 +03:00 |
Бесшапошников Никита
|
c0dc8b0637
|
Add scroll view bar js test
|
2016-04-08 11:14:45 +03:00 |
Ricardo Quesada
|
f243cc4ce3
|
fix: use chipmunk v6.2 API whenever possible
fix: make it more compatible with chipmunk v6.2 code
fix: make it more compatible with chipmunk v6.2.2
|
2016-04-07 16:22:49 -07:00 |
Ricardo Quesada
|
88ff4da348
|
buoyancy fix.
first commit
|
2016-04-05 17:52:19 -07:00 |
pandamicro
|
3d7d5de95d
|
Merge pull request #15317 from pandamicro/v3
Fix Socket IO handshake issue with latest version libwebsocket
|
2016-04-01 22:27:57 +08:00 |
pandamicro
|
d93fbea0f6
|
Fix Socket IO connection issue on iOS
|
2016-03-31 21:21:20 +08:00 |
minggo
|
b4ee6e8971
|
don't set wrong string for atlas label
|
2016-03-30 14:32:11 +08:00 |
Dale Stammen
|
ee05081f3a
|
fixed include paths
|
2016-03-23 12:14:12 -07:00 |
zilongshanren
|
8f30d01156
|
Merge pull request #15286 from xpol/remove-uncessary-search-paths
Removed unnecessary search paths.
|
2016-03-22 19:51:59 +08:00 |
minggo
|
4b47750e1f
|
Merge pull request #15171 from xiaofeng11/v3_jsFix
[ci skip] js-test bug fix
|
2016-03-22 16:24:31 +08:00 |
Xpol Wan
|
e7864cdb89
|
Removed unnecessary search paths.
|
2016-03-22 16:04:12 +08:00 |
zilongshanren
|
7993ad93d2
|
fix jsb API inconsistency.
Ticket id: https://github.com/cocos2d/cocos2d-x/issues/15275
|
2016-03-18 16:18:40 +08:00 |
zilongshanren
|
589d7e47bf
|
fix polygon api typo
|
2016-03-17 17:16:56 +08:00 |
zilongshanren
|
a1b4cd845f
|
Revert "Fix incorrect function name of getTrianglesCount"
|
2016-03-17 16:38:17 +08:00 |
mogemimi
|
23a05ddab2
|
Fix incorrect function name of getTrianglesCount
|
2016-03-15 07:39:42 +09:00 |
XiaoFeng
|
ce555f68de
|
Fix CocosDenshionTest playMusic won't work under android system
Fix click setNotificationNode button in SceneTest then return to main menu the animation is still play on screen
|
2016-03-03 16:47:05 +08:00 |