minggo
ac3e6428bb
Merge pull request #15612 from MSOpenTech/v3-winrt-fix
...
V3: Win10 UWP removed missing files from project
2016-05-11 15:05:25 +08:00
minggo
aef85fe05e
Merge pull request #15615 from minggo/update-release-note
...
[ci skip]update release note
2016-05-11 15:02:02 +08:00
minggo
1c77d8fd5c
update release note
2016-05-11 14:59:15 +08:00
Dale Stammen
cf305a56b1
removed missing files from project
2016-05-10 21:41:39 -07:00
pandamicro
1023c8730e
[JSB] Made cc.log overwrite-able
2016-05-11 11:58:24 +08:00
pandamicro
1cbbde5d8b
Fix android LocalStorage return null for empty string value
2016-05-11 11:57:54 +08:00
minggo
48937ca3e6
disable new JSB memory model by default
2016-05-11 11:10:11 +08:00
minggo
bb5d1a5e97
Merge pull request #15607 from minggo/iss-15413
...
remove Content-Type limitation
2016-05-11 10:57:34 +08:00
minggo
8b0c2110fd
Merge pull request #15606 from minggo/websocket-test-issue
...
fix crash when back to parent test case
2016-05-11 09:28:42 +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
minggo
7e37879c52
Merge pull request #15610 from cocos2d/culr-to-curl-in-readme
...
change Culr to Curl
2016-05-11 09:27:48 +08:00
Slack-Moehrle
c4f3ad7e47
change Culr to Curl
2016-05-10 17:38:56 -04:00
pandamicro
85812b4f5b
Remove client_no_context_takeover extension in WebSocket (not working on Android/iOS/Mac)
2016-05-10 20:35:02 +08:00
pandamicro
05dd3bb608
Fix web engine issues in test cases
2016-05-10 20:34:35 +08:00
minggo
fd160a1611
remove Content-Type limitation
2016-05-10 18:15:57 +08:00
minggo
a1ddb53b06
Merge pull request #15605 from minggo/node-enumerate-issue
...
reduce loop times to be quicker on low performace devices
2016-05-10 18:01:49 +08:00
minggo
b2a592ce36
fix crash when back to parent test case
2016-05-10 17:55:36 +08:00
minggo
04f52d0e21
update deps version
2016-05-10 16:39:24 +08:00
minggo
96e269715e
Merge pull request #15603 from minggo/update-deps
...
update deps version
2016-05-10 16:38:35 +08:00
minggo
d7fea4b08b
reduce loop times to be quicker on low performace devices
2016-05-10 16:19:58 +08:00
minggo
27060e43b7
Merge pull request #15590 from ntotani/v3
...
add missing lua const values
2016-05-10 14:55:53 +08:00
minggo
1ab81a5e40
update deps version
2016-05-10 14:47:09 +08:00
minggo
7bf7083227
Merge pull request #15601 from CocosRobot/update_cocosfiles_1462848081
...
[AUTO][ci skip]: updating cocos2dx_files.json
2016-05-10 14:11:39 +08:00
minggo
36ad79761f
Merge pull request #15596 from dabingnn/v3_fix_animation3D_bug
...
fix animate 3d bug
2016-05-10 14:11:01 +08:00
minggo
f4a7ba836c
Merge pull request #15599 from Naruto/feature/fix_build_error_using_fileutils-apple
...
fix build failed using FileUtilsApple on Application code.
2016-05-10 12:07:16 +08:00
CocosRobot
530d890c6c
[AUTO][ci skip]: updating cocos2dx_files.json
2016-05-10 02:41:22 +00:00
minggo
c32c2d050b
Merge pull request #15600 from minggo/updtea-release-note
...
[ci skip]update release note
2016-05-10 10:38:41 +08:00
minggo
aa94836190
update release note
2016-05-10 10:36:14 +08:00
Naruto TAKAHASHI
79b9a191d0
declare explicitly FileUtilsApple destructor
2016-05-09 21:50:52 +09:00
minggo
d086965683
Merge pull request #15598 from minggo/android-package-name
...
[ci skip]set correct package name
2016-05-09 18:17:28 +08:00
minggo
2a712a0c3b
set correct package name
2016-05-09 18:14:53 +08:00
Huabing.Xu
e8acf38212
fix animate 3d bug
2016-05-09 15:21:19 +08:00
minggo
81f37ab4ae
Merge pull request #15591 from mogemimi/prevent-shadow-warnings
...
Prevent variable shadowing warnings
2016-05-09 14:59:23 +08:00
TAKEDA Yutaka
d17fdfe3cc
CCSprite::createNode bug fix.
2016-05-09 15:42:39 +09:00
mogemimi
bbbb7e498d
Prevent variable shadowing warnings
2016-05-08 12:32:36 +09: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
halx99
fc9880ab49
Add captureNode for cocos2d::utils ( #15558 )
...
* Add captureNode for cocos2d::utils
Add captureNode for cocos2d::utils and fix CC_DLL syntax.
* Add test case for utils::captureNode
Add test case for utils::captureNode.
* Store captured image to disk with RGB.
* Trigger jenkins check
2016-05-07 22:10:53 +08:00
minggo
c4b2f6ff35
Merge pull request #15584 from VisualSJ/v3.11_bugs
...
loader test bug
2016-05-07 22:07:49 +08:00
minggo
a3d737f2ad
Merge pull request #15585 from zilongshanren/fix-videoplayer-issue
...
fix tizen videoplayer issue of tizen
2016-05-07 22:07:19 +08:00
pandamicro
1980311204
Fix OpenGL test issue on web
2016-05-07 17:31:58 +08:00
Naoyuki Totani
04ebba425f
add missing lua const values
2016-05-07 16:23:23 +09:00
pandamicro
d0fc3ec4c4
Add cc.game.end to close game window
2016-05-07 14:37:36 +08:00
pandamicro
25b9f787fc
update web engine ref
2016-05-06 22:10:38 +08:00
zilongshanren
e4d91f5577
fix tizen videoplayer issue
2016-05-06 18:43:26 +08:00
minggo
76d8f81771
Merge pull request #15582 from minggo/issue-isnan
...
update bindings-generator to fix compiling issues on ubuntu 16.04
2016-05-06 17:55:49 +08:00
ViusualSJ
cb8cde63b1
loader test bug
2016-05-06 17:19:33 +08:00
minggo
f34acca188
Merge pull request #15575 from stevetranby/capturescreen-drain-autorelease
...
Prevent memory leak: force drain on autoreleased `data`.
2016-05-06 16:57:29 +08:00
minggo
dfd488a8f9
Merge pull request #15581 from minggo/issue-15571
...
revert correct search path
2016-05-06 16:48:32 +08:00
minggo
ba83b6f740
Merge pull request #15580 from minggo/remove-invalid-search-path
...
not add invalid search paths
2016-05-06 16:24:04 +08:00
minggo
086df25fdc
update bindings-generator to fix compiling issues on ubuntu 16.04
2016-05-06 16:19:48 +08:00