Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
32,304 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

32304 Commits

Author SHA1 Message Date
Neo Kim 3656ce99bd Fix an issue regarding non-bouncing scroll view 2015-09-01 15:13:18 +09:00
pandamicro 91769c3feb Merge pull request #13632 from xiaofeng11/v3.8 
Fix missing config.json notice when simulator start to run a cocostudio project
 2015-09-01 12:57:40 +08:00
WenhaiLin 5fdb041856 Use string::empty() to check whether string is empty. 2015-09-01 11:26:09 +08:00
Neo Kim 129f4b3186 Implement the inertia scroll using auto scroll feature. Consolidate them into one. 2015-09-01 11:52:05 +09:00
Neo Kim ecd947d9f4 Change auto scroll feature to receive callbacks to remove dependencies. 2015-09-01 11:45:42 +09:00
Neo Kim 137a05a2aa Rectify the wrong indentations in switch statements 2015-09-01 11:45:42 +09:00
Neo Kim 69d23eb00c Extract the touch move speed calculation logic from inertia concept. 2015-09-01 11:45:42 +09:00
Neo Kim 81795f6d73 Add a guard statement in setInnerContainerPosition(). 2015-09-01 11:45:42 +09:00
Neo Kim 96a78f687c Remove redundant codes 2015-09-01 11:45:42 +09:00
子龙山人 2e9e660cbb Merge pull request #13220 from zilongshanren/testEditBoxWin32 
Improved EditBox implement for platform win32
 2015-09-01 10:40:11 +08:00
pandamicro 7f04a191c7 Merge pull request #13635 from super626/v3.8 
Enable depth write for transparent object
 2015-09-01 10:30:50 +08:00
pandamicro 3be083680a Merge pull request #13639 from WenhaiLin/v3.9-beta0 
Sync v3.8 to v3
 2015-09-01 09:49:43 +08:00
子龙山人 ca2ee10e2d Merge pull request #26 from wohaaitinciu/v3-remote 
revert to the original state when user cancel input
 2015-09-01 09:47:24 +08:00
子龙山人 59c1b21d0b Merge pull request #13634 from WenhaiLin/v3.8-textreader-refine 
This is a small optimization about TextReader.
 2015-09-01 09:40:52 +08:00
Jeff Wang b8105349c7 revert to the original state when user cancel input 2015-09-01 00:06:18 +08:00
Jeff Wang 426061dffd Merge pull request #2 from zilongshanren/testEditBoxWin32 
keep synced with zilongshanren-test branch
 2015-08-31 23:56:28 +08:00
WenhaiLin a3b5becb45 Sync v3.8 to v3 2015-08-31 22:05:37 +08:00
andyque 367a105a48 refactor EditBox iOS&Android implementation 
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/13616#issuecomment-135742727
 2015-08-31 18:36:27 +08:00
yangxiao 030ab8858d enable depth write for transparent object 2015-08-31 18:34:09 +08:00
XiaoFeng 4cd3683e5b Use solution path as root path 2015-08-31 18:14:38 +08:00
pandamicro 0c94e48248 Merge pull request #13631 from geron-cn/v3.8 
fix bug: bone can be see by other cameras
 2015-08-31 17:36:17 +08:00
WenhaiLin df383de894 This is a small optimization about TextReader. 2015-08-31 17:06:11 +08:00
XiaoFeng be2be30162 Fix missing config.json notice when simulator start to run a cocostudio project 2015-08-31 16:16:10 +08:00
geron-cn e7c7b248d6 fix bug: bone can be see by other cameras 2015-08-31 16:04:17 +08:00
pandamicro 4ad78778a8 Merge pull request #13630 from pandamicro/release-note 
[ci skip]Update engine versions
 2015-08-31 13:53:02 +08:00
pandamicro 8f6f5c1191 Update engine versions 2015-08-31 13:52:15 +08:00
pandamicro d174a2a60e Merge pull request #13619 from super626/v3.8 
fix render state
 2015-08-31 13:39:05 +08:00
pandamicro c1da4eb893 Merge pull request #13629 from natural-law/v3.8 
Update the reference of submodule cocos2d-console.
 2015-08-31 13:37:50 +08:00
zhangbin 2520e16cc0 Update the reference of submodule cocos2d-console. 2015-08-31 12:04:18 +08:00
frranck 8e195723e6 Update CCImage.cpp 
When you're creating a sprite (e.g. with Sprite* Sprite::create(filename))
There's no way to test the file before, without getting "a unsupport image format!" thrown.
 2015-08-30 09:40:15 +02:00
yangxiao bc07d7954a fix render state 2015-08-28 23:00:45 +08:00
pandamicro 28fcc4bceb Merge pull request #13614 from perminovVS/update-authors-v3.8 
Correct contribution in v3.8
 2015-08-28 17:19:10 +08:00
Vladimir Perminov 8a1b74125b Correct contribution in v3.8 2015-08-28 11:35:29 +03:00
子龙山人 20d7abe6f3 Merge pull request #13612 from zilongshanren/improve-github-issue 
[ci skip]rename contribute.md to contributing.md
 2015-08-28 14:12:37 +08:00
pandamicro 9d72d6a924 Merge pull request #13496 from ZhangMenghe/v3-notification 
[ci rebuild] Notification effect enhancement
 2015-08-28 14:10:42 +08:00
andyque 6a7922caf1 rename contribute.md to contributing.md 2015-08-28 14:10:41 +08:00
pandamicro 3dcdf791c9 Merge pull request #13608 from super626/v3.8 
Skybox: enable depth write
 2015-08-28 13:33:19 +08:00
pandamicro 07a6557a07 Merge pull request #13607 from VisualSJ/v3.8-index 
[ci skip][js-tests] Update Socket.io test
 2015-08-28 11:52:29 +08:00
VisualSj 2d77609fb7 Update socket@1.3.6 and web index 2015-08-28 11:48:58 +08:00
yangxiao 6fa6f1f0da enable depth write 2015-08-28 11:46:11 +08:00
子龙山人 4fe9517ec7 Merge pull request #13592 from neokim/fix_13591 
Fix #13591
 2015-08-28 10:19:20 +08:00
pandamicro d23d9677a1 Merge pull request #13602 from perminovVS/v3.8-overwrite-wint-unused-code 
commit v3.8 overwrite this unused code
 2015-08-28 09:36:03 +08:00
pandamicro 1264863b2f Merge pull request #13598 from zilongshanren/fixSliderConstructor 
fix Slider create missing res type.
 2015-08-28 09:28:19 +08:00
pandamicro fd68669a15 Merge pull request #13596 from liamcindy/v3.8_reader 
update for reader
 2015-08-28 09:24:25 +08:00
Liam 69da65d7a4 update for jsb_opengl_constants 2015-08-28 08:42:55 +08:00
Vladimir Perminov b5688f504c Desktop and WinRT use correct keyboard codes 
Desktop:
GLFW_KEY_ENTER equals KEY_ENTER ( GLFW_KEY_KP_ENTER = KEY_KP_ENTER)
WinRT:
VK_PRIOR equals KEY_PG_UP ( not KEY_KP_PG_UP )
 2015-08-27 23:46:24 +03:00
Vladimir Perminov 104013aebe commit v3.8 overwrite this unused code 
From commit #13397
 2015-08-27 23:19:30 +03:00
andyque 40492e6169 fix Slider create missing res type. 
fixed https://github.com/cocos2d/cocos2d-x/issues/13575
 2015-08-27 23:34:39 +08:00
Liam ed49250b9b update for reader 
1.update for sprite3d cullface
2.sync js code
 2015-08-27 18:29:45 +08:00
pandamicro 18beea11ff Merge pull request #13594 from VisualSJ/v3.8-index 
[ci skip] Update web index
 2015-08-27 17:48:15 +08:00