8f30d01156
Merge pull request #15286 from xpol/remove-uncessary-search-paths
...
Removed unnecessary search paths.
2016-03-22 19:51:59 +08:00
4b47750e1f
Merge pull request #15171 from xiaofeng11/v3_jsFix
...
[ci skip] js-test bug fix
2016-03-22 16:24:31 +08:00
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
7993ad93d2
fix jsb API inconsistency.
...
Ticket id: https://github.com/cocos2d/cocos2d-x/issues/15275
2016-03-18 16:18:40 +08:00
589d7e47bf
fix polygon api typo
2016-03-17 17:16:56 +08:00
a1b4cd845f
Revert "Fix incorrect function name of getTrianglesCount"
2016-03-17 16:38:17 +08:00
23a05ddab2
Fix incorrect function name of getTrianglesCount
2016-03-15 07:39:42 +09:00
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
462f4f4c0a
Merge pull request #15156 from ricardoquesada/cmake_android_squash_2
...
cmake for android
2016-03-02 17:24:35 -08:00
028f8c28e1
Squashed commit of the following:
...
commit 59e43a3c80f4af8998e4a14f6463bd7a91617d5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 15:19:48 2016 -0800
uses new naming convention for projects
uses _ instead of -
commit f97ba56608d48b17909649c8617ba9047b566196
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:49:22 2016 -0800
fooling cmake for real
commit 20c2560f75eab952e5131b484284bf20cb07fe07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:43:05 2016 -0800
fooling cmake
commit a0ada44bc82941830f6c71219a1492d28c28c306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:26:59 2016 -0800
makes CMake for Mac happy
commit 656b4f5e2dd741215a4699db979fe1b0dce60298
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 13:50:15 2016 -0800
linux fix
commit fa98aeac8505c764f4a69f15c8a8ff1123fad2a3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 11:18:18 2016 -0800
links correctly!
commit 9c56ce7143d3a35b44d33f246cec093ca9eaa7d9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Mar 1 17:44:58 2016 -0800
Squashed commit of the following:
commit 2ef52723dae44204c047cb177d5a5670fb659c79
Merge: 8a5c998 25cf1f1
2016-03-02 16:51:54 -08:00
19caf2d276
Merge branch 'v3' into add-listview-cellreuse-tests
2016-03-01 16:40:07 +08:00
7ec4450fc0
add js ListView item reuse tests
2016-03-01 15:22:32 +08:00
248978bac1
force multiple for windowsphone
2016-02-29 15:23:22 -08:00
bc11e24019
Squashed commit of the following:
...
commit 36c2807d07848448c1fed86f4b119205048691bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 13:11:40 2016 -0800
binary file 82
commit 9b7cd003b12faefd0522d12f765c027efb001ab2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:56:39 2016 -0800
fore multiple in windows phone 8.1 too
commit daea8a3ef8d69915e7a9d962fd745a1103011bab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:50:45 2016 -0800
force multiple
commit 0fbabdbf99974e95de083d79c7d6ae7cf735e4b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 10:44:40 2016 -0800
compiles
commit f817766afcd0ffc4ca93f628d55fabc4b5a96ba5
Merge: 7b2cea3 8bf3d339af2f4e
2016-02-29 13:53:00 -08:00
7d43e35741
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into refactor-websocket
2016-02-17 14:56:32 +08:00
72be9a3966
Fix other issues
2016-02-02 23:39:18 +08:00
e2568b3a6f
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory
...
Conflicts:
tests/js-memory-gc-tests/src/tests-main.js
2016-01-28 01:12:49 +08:00
de9b51c0cf
Fix other GC issues
2016-01-28 01:03:50 +08:00
55756cb043
Improve test cases
2016-01-26 19:34:01 +08:00
bc44769b8b
add more deprecated functions
2016-01-25 18:14:48 +08:00
00ad5bd620
fix jsb deprecated constants
2016-01-25 15:40:51 +08:00
0daa846020
Improve gc test case and add cycle reference tests
...
t
Improve gc test case and add action cycle reference test
2016-01-24 19:47:24 +08:00
7735a75651
adds JS tests for RichText
2016-01-20 17:59:13 -08:00
fc19435123
Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory
...
Conflicts:
cocos/base/ccConfig.h
cocos/scripting/js-bindings/manual/ScriptingCore.cpp
cocos/scripting/js-bindings/manual/ScriptingCore.h
cocos/scripting/js-bindings/script/jsb_prepare.js
2016-01-18 16:40:00 +08:00
5d1e98340e
Updates WebSocket::onSocketCallback & WebSocketTest.js
2016-01-13 21:15:48 +08:00
ab0efd933a
Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
CHANGELOG
cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
2016-01-09 18:01:56 +08:00
7cd80cb669
Adds iOS tests, calls GC after replacing scene
...
and some bug fixes
Squashed commit of the following:
commit 36b74ce4e68bf2f4a4c464453e695497716506eb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:07:01 2015 -0800
adds missing file
commit 017d03807122faa38fefaa8f4554db8edc83561d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:02:27 2015 -0800
disables GC by default
commit a2f3767a952e052eb8f0391bb5cbd1a8d0ce1b38
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 18:57:14 2015 -0800
Adds iOS test and calls GC after replacing the scene
commit 7b3b628caeb3366356d9a896aebd9c96887a85ed
Merge: 79e926a e311655
2015-12-29 17:36:02 -08:00
692c0f8a0e
adds tvOS support
...
Ported tests:
- js-tests
- cpp-tsts
- lua-tests
- game-controller tests
all of them working, but most of the tests can't be navigated
since they expect a controller.
2015-12-28 15:59:36 -08:00
169d3fc4b8
Merge pull request #14797 from VisualSJ/v3.10
...
Fixed a bug about should not be used `gl` in canvs mode
2015-12-24 17:51:03 +08:00
79bf3897d7
Fixed a bug about should not be used `gl` in canvs mode
2015-12-24 16:33:46 +08:00
dea1ef1290
Merge pull request #14790 from pandamicro/v3.10
...
Fixed WebSocket JSB crash issue
2015-12-24 01:37:17 +08:00
acf03c06d5
Fixed WebSocket JSB crash issue
2015-12-23 23:28:14 +08:00
519e69813d
Merge pull request #14785 from xiaofeng11/v3.10
...
Fix in js-test, after UITest->UIFocus tests, in all other test scene when button clicked program will crash
2015-12-23 18:43:07 +08:00
c181390881
Fix in js-test, after UITest->UIFocus tests, in all other test scene when button clicked program will crash
2015-12-23 18:39:06 +08:00
1c60ae6ff1
Close webgl dedicated test in canvas mode
2015-12-22 19:07:46 +08:00
843694cea5
Close webgl dedicated test in canvas mode
2015-12-22 18:46:30 +08:00
875a2d83b1
Close webgl dedicated test in canvas mode
2015-12-22 18:36:48 +08:00
fa172b9da9
Merge pull request #14765 from liamcindy/v3_ui_js
...
update for js uiTextAtlasTest
2015-12-21 19:17:41 +08:00
81f9d20158
update for js uiTextAtlasTest
2015-12-21 16:29:16 +08:00
8d8ac60625
Merge pull request #14761 from pandamicro/v3.10
...
Correct return type to adopt GC Rooting API
2015-12-21 11:46:59 +08:00
81918f51ea
Fix event handle function issue with compartment
...
and Fix a crash issue caused by malformed js usage
2015-12-21 00:16:17 +08:00
34c7331b99
Issue fixes for new memory model
2015-12-21 00:16:17 +08:00
8ddaf310ef
Update manual bindings to use the new memory model
2015-12-21 00:16:16 +08:00
80973677ed
Improve UICheckBox issue
2015-12-20 21:13:16 +08:00
ffbac99dc5
fix script samples error with controlButton
2015-12-19 22:22:41 +08:00
7303895866
Improve error message for Downloader and add test case
2015-12-16 15:43:18 +08:00
d33062ac35
Merge pull request #14667 from chengstory/#24347
...
Fix #24347
2015-12-14 15:03:21 +08:00
436db6e932
Fix #24347
...
JSTest(web)-->UI Test-->UIFocus-->UIFocusTestVertical displays focus first.
2015-12-14 11:20:26 +08:00
c5058aa2f9
more conversions
2015-12-11 17:18:20 -08:00
47911e0c24
more js fixes
...
fixes in how ref count is measured
opengl bindings converted to new API
2015-12-11 15:18:09 -08:00
8b2dfb1a4b
Mooooores fixes
...
but GC memory model doesn't work yet... somewhere someone is still
retaining a reference that prevents the whole thing from
releasing
2015-12-10 22:15:44 -08:00
c034303ad8
Adds MemoryModelTest
2015-12-10 18:22:10 -08:00
0e34a864b2
Merge pull request #14528 from xiaofeng11/v3_3dtouch
...
Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device
2015-12-03 22:21:48 -08:00
b6fd2e9449
Permit http access to cocos2d-x.org in test projects
2015-12-03 18:00:48 +08:00
e7dca08df9
Add js test case for fix, improve template
2015-12-03 16:55:15 +08:00
1b4d12ced7
changed to cocos2d-x.org server
2015-12-02 15:16:05 -05:00
ebd5c1cca7
resolve conflict and fix checktexture bug
2015-12-02 11:26:05 +08:00
5dfc8f6a26
Remove default arguments
2015-12-02 11:02:27 +08:00
2e38dcb1a0
add normalmaping test
2015-12-01 18:13:50 +08:00
bb832f8d60
Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device
2015-12-01 13:02:53 +08:00
955ddaafb7
Use rooted object for js_proxy new and get (missed)
2015-11-27 10:20:04 +08:00
d23ffe4fc7
Fix some issue of js_type_class usage
2015-11-27 10:16:11 +08:00
ae2b75c8be
Fix issues causing by temporary RootedObject passed as function parameters
2015-11-27 01:35:06 +08:00
a6fdd9aa09
Improve js template documentation
2015-11-24 16:31:14 +08:00
89798d949b
[js-tests] Test case for Scale9Sprite fade actions with cascade opacity enabled
...
Test case for https://github.com/cocos2d/cocos2d-html5/pull/3181
2015-11-10 15:13:05 +03:00
a74c8ccded
Merge pull request #14292 from xiaofeng11/v3
...
Fix "BillBoard Test->Rotation Test" won't resume after switch back from background.
2015-11-03 17:46:34 +08:00
6a454d3eba
Fix SocketIO test on iOS 9
2015-11-03 17:26:37 +08:00
8e6e46d596
Fix "BillBoard Test->Rotation Test" won't resume after switch back from background.
2015-11-02 14:50:45 +08:00
0d6bf3263b
Improve js templates with noCache and cc.view.setRealPixelResolution docs
2015-11-01 18:33:05 +08:00
53d2874507
Fix "UItest->UicheckBox" display status, make it same as C++ version
2015-10-28 17:38:17 +08:00
c55f030218
Fix "Test change animation intenal" under js test can not change back to 60fps
2015-10-28 11:18:12 +08:00
175f4c02ad
Merge pull request #14197 from xiaofeng11/v3_xf
...
Fix CCDownloader-curl will crash in js-test & Fix broken image link in TextureCacheTest.js
2015-10-22 14:45:20 +08:00
43c19fd1e7
Merge pull request #14205 from pandamicro/v3
...
Fix Scheduler API inconsistency
2015-10-21 22:11:16 +08:00
9eeda122e9
Fix Scheduler API inconsistency
2015-10-21 22:10:48 +08:00
f9d8907697
updated winrt temporary app certificates expiration dates
2015-10-20 07:39:42 -07:00
3d626940af
Roll back debug commented code
2015-10-20 17:23:31 +08:00
7e54a91ee6
Fix CCDownloader-curl will crash in js-test
...
Fix broken image link in TextureCacheTest.js
2015-10-20 16:28:03 +08:00
cde67d1261
Merge pull request #14162 from mogemimi/fix-warnings
...
Fix warnings on Xcode 7
2015-10-18 22:56:12 +08:00
c365fc5883
Merge pull request #14180 from pandamicro/v3
...
Fix issue for web engine upgrade
2015-10-18 22:48:16 +08:00
11890d6c4b
Fix issue for web engine upgrade
2015-10-18 00:19:02 +08:00
4600c41f9b
Add override keywords
2015-10-16 15:01:10 +09:00
8b0a6a6c29
Merge pull request #14099 from pandamicro/v3
...
[ci skip]Sync with CCBoot for web
2015-10-10 10:16:16 +08:00
5ae2812bf8
Sync with CCBoot for web
2015-10-10 10:15:36 +08:00
bc9b59b7f7
Merge pull request #14096 from pandamicro/v3
...
[ci skip]Add opacity/color cascade test case for Scale9Sprite
2015-10-09 21:07:27 +08:00
0ea54868e2
Add opacity/color cascade test case for Scale9Sprite
2015-10-09 21:01:49 +08:00
87677cdbd1
Merge pull request #14088 from chengstory/Fix#23321
...
Fix Bug #23321
2015-10-09 15:27:56 +08:00
77062acfa7
Fix Bug #23321
2015-10-08 14:48:38 +08:00
4bf56e5853
Fix #23337
...
Hide menu "cocostudio 2.1", because cocostudio 1.6 Api can't load json exported from cocostudio 2.x.
2015-10-08 11:35:43 +08:00
91928aa23d
Add ComponentJS test case and fix windows platforms
2015-09-26 19:43:36 +08:00
9eb05707fb
add custom spine skeletonAnimation test
2015-09-25 13:36:48 +08:00
03e5573f79
button Opacity setting
2015-09-24 11:13:41 +08:00
149775ea10
Merge pull request #13962 from ZhangMenghe/v3-scrollView
...
[ci skip] Testcase for multiple items in scrollView
2015-09-24 09:35:05 +08:00
68713d2074
Multiple items testcase
2015-09-21 18:22:58 +08:00
cddd7dfdf6
Merge pull request #13965 from ZhangMenghe/v3-drawLabels
...
[ci skip] DrawLabel Mode testcase
2015-09-21 15:08:47 +08:00
26358c9c2c
DrawLabel Mode testcase
2015-09-21 11:05:21 +08:00
4054686903
Testcase for multiple items in scrollView
2015-09-21 10:24:44 +08:00
bb8d9a4145
add testcase for writeDataToFile to jstests
2015-09-20 16:46:54 +08:00
6b8d400517
Merge pull request #13804 from ZhangMenghe/v3-UItestcase
...
[ci skip] UItestcase modification to be friendly
2015-09-19 00:22:41 +08:00
6e4d39e909
s9sprite action testcase
2015-09-18 09:45:43 +08:00
5f8351ea32
UItestcase modification to be friendly
2015-09-14 15:31:25 +08:00
edb964a673
Remove the performance related config in project.json.
2015-09-11 16:03:07 +08:00
8e9928ad99
Remove performance tests from lua-tests & js-tests.
2015-09-11 10:53:17 +08:00
941cd3c9de
Merge pull request #13717 from jianglong0156/assetsmanagerContinue
...
fix the AssetsManagerEx can not continuous transmission
2015-09-10 11:34:03 +08:00
4509a316cc
add uniform conversion
...
relate issue:https://github.com/cocos2d/cocos2d-x/issues/13747
relate pr:https://github.com/cocos2d/bindings-generator/pull/191
2015-09-09 16:03:57 +08:00
747fab26a8
Merge pull request #13735 from jianglong0156/actionExtendReverse
...
[ci skip]add action reverse issue test case
2015-09-09 11:12:47 +08:00
ac1af6cd91
add action reverse issue test case
2015-09-09 11:09:40 +08:00
dc607a1784
Merge pull request #13726 from jianglong0156/actionExtendSquash
...
support custom action, and rewrite update function
2015-09-09 10:25:56 +08:00
badd80bf3a
support custom action, and rewrite update function
...
support custom action in js, and developer can rewrite the update function in custom action class.
useage:
// custom action sample code
var customMoveBy = cc.MoveBy.extend({
ctor:function (duration, deltaPos, deltaY) {
this._super(duration, deltaPos, deltaY);
},
update:function (dt) {
this._super(dt);
if (this.getTarget()) { // rand color
this.getTarget().setColor(cc.color(cc.rand()%255, cc.rand()%255, cc.rand()%255));
}
}
});
2015-09-09 10:08:07 +08:00
8daf026c6c
fix the AssetsManagerEx can not continuous transmission for large zip file.
...
the testcase is extension/assetsmanager
2015-09-08 16:34:02 +08:00
f3190206e0
Remove clickAndMove testcase
2015-09-01 14:21:08 +08:00
a3b5becb45
Sync v3.8 to v3
2015-08-31 22:05:37 +08:00
9d72d6a924
Merge pull request #13496 from ZhangMenghe/v3-notification
...
[ci rebuild] Notification effect enhancement
2015-08-28 14:10:42 +08:00
2d77609fb7
Update socket@1.3.6 and web index
2015-08-28 11:48:58 +08:00
1bcc2dec37
Notification effect enhancement
2015-08-21 10:20:59 +08:00
d55bc653e0
update c++ debug info settings
2015-08-20 13:25:17 -07:00
08fcf7e35b
Merge pull request #13463 from ZhangMenghe/v3.8-materialSys
...
[ci skip] Delete blur shader in js-resj
2015-08-19 13:49:31 +08:00
e9bd14e1d7
Delete blur shader in js-resj
2015-08-19 13:41:45 +08:00
31bc04a301
Merge pull request #13455 from MSOpenTech/v3-win10
...
Windows 10 UWP and WP8.1 app certification fixes
2015-08-19 13:36:29 +08:00
47b72ba30e
Merge branch 'v3' into v3-win10
2015-08-18 11:07:38 -07:00
8493365be7
updates to pass Windows App Certification tests
2015-08-18 11:06:47 -07:00
5cdfdf8497
[ci skip][Android Studio Projects]Update Gradle Plugin from 1.2.3 to 1.3.0
2015-08-18 22:37:00 +08:00
9fbc45171e
Fix shader position abnormal
2015-08-18 17:07:08 +08:00
22c8163bc8
[js-tests][PageView] Button position error
2015-08-18 16:12:32 +08:00
40581c1c25
Merge pull request #13422 from VisualSJ/v3-pb-21865
...
[ci skip] Change ActionManager test name
2015-08-17 21:47:20 +08:00
be93b6bf2e
Change ActionManager test name
2015-08-17 20:35:38 +08:00
eaa5643c7c
Fix invisiable testcase of effects
2015-08-17 17:26:25 +08:00
3f160ddbb1
Merge pull request #13382 from ZhangMenghe/v3-physics3d
...
[ci skip] Avoid to trigger touch event multiple times
2015-08-17 11:21:51 +08:00
c0eea61109
Merge pull request #13375 from ZhangMenghe/v3-effectAdvance
...
[ci skip] Fix abnormal effects in effectsTest
2015-08-17 11:18:27 +08:00
1700230213
Merge pull request #13379 from ZhangMenghe/v3-rtexture
...
[ci skip] Modify renderTexture stencilDepth test
2015-08-17 10:20:22 +08:00
6d7c05f0b7
Merge pull request #13356 from VisualSJ/v3-updateIndex
...
[ci skip] Update js-test
2015-08-17 10:18:59 +08:00
06864479f3
Avoid to trigger touch event multiple times
2015-08-14 18:34:46 +08:00
61ef51849c
Modify renderTexture stencilDepth test
2015-08-14 17:53:48 +08:00
a4a26ccdbe
Merge pull request #13357 from ZhangMenghe/v3-effectsTestcase
...
[ci skip] Modify effects testcases
2015-08-14 17:02:02 +08:00
45f6c16d72
Fix abnormal effects in effectsTest
2015-08-14 15:58:31 +08:00
d13f4df356
Merge pull request #13372 from fusijie/fix_tiledmap_vertexZ
...
[ci skip]Fixed JS-Tests TiledMap VertexZ bug.
2015-08-14 15:31:11 +08:00
77ef03d696
Fixed JS-Tests TiledMap VertexZ bug.
2015-08-14 15:13:08 +08:00
dfabf8a5a0
Merge pull request #13347 from ZhangMenghe/v3-rtexture
...
[ci skip] Rewrite testcase for stencil depth mask
2015-08-14 12:23:11 +08:00
f9397f39f5
[js-tests] Update Particle test
2015-08-13 15:18:42 +08:00
4f49993fef
Modify effects testcases
2015-08-13 15:15:04 +08:00
d2cf4bfc79
Squashed commit of the following:
...
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf5e21580#6 from minggo/downloader_decouple
fix js binding error
commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98
Author: minggo <ming@cocos2d-x.org>
Date: Thu Aug 13 11:09:58 2015 +0800
fix js binding error
commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40
Merge: 8cdb0b6 bc964e8#5 from minggo/downloader_decouple
fix lua-binding error
commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15
Author: minggo <ming@cocos2d-x.org>
Date: Wed Aug 12 10:34:05 2015 +0800
fix lua-binding error
commit 927276589d57432477f8ffc033e19a21a215b246
Merge: 8252464 6f4ed8a#4 from minggo/downloader_decouple
fix linking error in lua-tests on Android
commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145
Author: minggo <ming@cocos2d-x.org>
Date: Tue Aug 11 16:23:53 2015 +0800
fix link error in lua-tests
commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 23:22:50 2015 -0700
works for real on win32
commit ddadaf82231b60c8e343718561c0d78657afe7c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 22:26:59 2015 -0700
compiles on win32
commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:57:49 2015 -0700
compiles on iOS!!
commit f706f97962eb393bf7dfec79739ff8dfdec103d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:27:03 2015 -0700
compiles and runs Ok on windows.
Tested all downloadertests + assetmanagertest
commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 20:24:28 2015 -0700
updates windows projects
commit e77fd8a278594fefc24ff13cbee038508429294d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 19:56:10 2015 -0700
compiles on Android
commit 5f515e3519a0688d11476ea6ef235007e8378c96
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:34:33 2015 -0700
trying to fix a compile issue on iOS
WIP
commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:25:11 2015 -0700
make bug fixes
adds public `getHeader`
commit a228799ba74eb8642c43d215a802f811a576a4aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 17:42:19 2015 -0700
some linux fixes
commit 2cab23d87acc138823ebe9dcec9d42f827690d99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:58:53 2015 -0700
Squashed commit of the following:
commit 86227e9138c1fb523bd28186d355de65cc64c588
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:55:17 2015 -0700
works %100
and uses less memory than before
commit a9cafa6f2fe7847e279934d2c162287680760dda
Merge: 0bbc62e 0cbd71f7f215e90d778386831e24a06421b8d836daf744383253d9c4642ccac
2015-08-13 00:14:10 -07:00
5e21580cdd
Merge pull request #13345 from VisualSJ/v3-updateIndex
...
[ci skip] update js-tests
2015-08-13 11:18:19 +08:00
dd7e00403f
[js-tests] that is undefined - script test
2015-08-13 10:56:41 +08:00
7ffde1cdf8
Rewrite testcase for stencil depth mask
2015-08-13 10:45:45 +08:00
a4a1a62886
Merge pull request #13328 from zilongshanren/fix-ios-Appcontroller
...
remove unneeded protocol in AppController.h.
2015-08-13 10:35:00 +08:00
1458e06492
[js-tests] Optimization Cocosbuilder test
2015-08-13 10:03:10 +08:00
38b1da2c06
Merge pull request #13315 from ZhangMenghe/v3-touchInter
...
[ci skip]Add testcase to issue3053
2015-08-12 18:20:23 +08:00
986cce2872
Merge pull request #13316 from ZhangMenghe/v3-cameraOrbit
...
[ci skip] Fix camera orbit testcase
2015-08-12 18:19:09 +08:00
82f597ce98
Merge branch 'v3.7.1' into v3
...
# Conflicts:
# cocos/scripting/lua-bindings/auto/api/CheckBox.lua
# cocos/ui/UICheckBox.cpp
# cocos/ui/UICheckBox.h
2015-08-12 17:59:50 +08:00
bed3640e6c
fixed retro pos.
2015-08-12 15:09:33 +08:00
58b8da9ccb
Merge pull request #13293 from jianglong0156/fixJstestsReleaseError
...
fix js-tests can't use cocos run -p web -m release
2015-08-12 14:24:15 +08:00
zilongshanren