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

32229 Commits

Author SHA1 Message Date
子龙山人 8e01326cfa Merge pull request #13387 from WenhaiLin/v3-replace-tab-withSpaces 
Replace tab with spaces
 2015-08-17 11:29:03 +08:00
子龙山人 4000cff902 Merge pull request #13399 from WenhaiLin/v3.8-beta2 
DownloaderAsyncTest:Fixed crash cause by double-click `start download` button.
 2015-08-17 11:28:43 +08:00
pandamicro 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
pandamicro c0eea61109 Merge pull request #13375 from ZhangMenghe/v3-effectAdvance 
[ci skip] Fix abnormal effects in effectsTest
 2015-08-17 11:18:27 +08:00
子龙山人 8ce3c04874 Merge pull request #13401 from CocosRobot/update_cocosfiles_1439778134 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-08-17 10:29:22 +08:00
CocosRobot 2f0b3c1515 [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-17 02:22:15 +00:00
pandamicro 1700230213 Merge pull request #13379 from ZhangMenghe/v3-rtexture 
[ci skip] Modify renderTexture stencilDepth test
 2015-08-17 10:20:22 +08:00
pandamicro 6d7c05f0b7 Merge pull request #13356 from VisualSJ/v3-updateIndex 
[ci skip] Update js-test
 2015-08-17 10:18:59 +08:00
WenhaiLin aeca6ae024 DownloaderAsyncTest:Fixed crash cause by double-click `start download` button. 2015-08-17 10:16:04 +08:00
Vladimir Perminov 9c729e1953 More FileUtils::getFileExtension 
check .material in CCPU
check .zip in AssetsManager
 2015-08-16 15:01:15 +03:00
Vladimir Perminov a16d04fb53 CCUtf8ToUnicode and CCUnicodeToUtf8 deprecated 2015-08-16 13:08:00 +03:00
Vladimir Perminov d70a21aa25 Correct use and convert unicode from utf8 
Move StringUtf8ToWideChar and StringWideCharToUtf8 to CCWinRTUtils(
Replace CCUtf8ToUnicode)
Use StringUtf8ToWideChar for convert utf8 to unicode
Use StringWideCharToUtf8 for convert unicode to utf8
 2015-08-16 12:51:41 +03:00
pandamicro 487c99e632 Merge pull request #13378 from jianglong0156/fixNodeGrid 
[ci skip]add NodeGrid bind
 2015-08-15 21:43:00 +08:00
子龙山人 6d630152c8 Merge pull request #13381 from zilongshanren/fix-radiobutton-disallowselection 
fix RadioButton disallow selection issue.
 2015-08-15 19:20:18 +08:00
江龙 06ab98b0ac improve the comment 2015-08-15 17:04:32 +08:00
WenhaiLin a0c270234b Replace tab with spaces 2015-08-14 21:17:51 +08:00
ZhangMenghe 06864479f3 Avoid to trigger touch event multiple times 2015-08-14 18:34:46 +08:00
andyque d45897ec53 fix RadioButton disallow selection issue. 2015-08-14 18:07:13 +08:00
ZhangMenghe 61ef51849c Modify renderTexture stencilDepth test 2015-08-14 17:53:48 +08:00
jianglong0156 ae8332eb85 add NodeGrid bind 2015-08-14 17:46:34 +08:00
子龙山人 7787c29946 Merge pull request #13377 from natural-law/v3 
[ci skip] Solve the error effect of lua portrait project created from template.
 2015-08-14 17:23:29 +08:00
子龙山人 83de0e798e Merge pull request #13365 from WenhaiLin/v3-label-ignore-r 
Label:ignore '\r' character.
 2015-08-14 17:22:33 +08:00
zhangbin 38edfea28a Solve the error effect of lua portrait project created from template. 2015-08-14 17:20:21 +08:00
子龙山人 a4a26ccdbe Merge pull request #13357 from ZhangMenghe/v3-effectsTestcase 
[ci skip] Modify effects testcases
 2015-08-14 17:02:02 +08:00
ZhangMenghe 45f6c16d72 Fix abnormal effects in effectsTest 2015-08-14 15:58:31 +08:00
子龙山人 4acb4ab571 Merge pull request #13373 from CocosRobot/update_lua_bindings_1439537643 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-08-14 15:44:25 +08:00
CocosRobot 76897d433d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-14 07:38:29 +00: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
子龙山人 6f1cb049e7 Merge pull request #13368 from CocosRobot/update_cocosfiles_1439526294 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-08-14 15:27:25 +08:00
子龙山人 e28e540d8a Merge pull request #13371 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-08-14 15:26:48 +08:00
fusijie 77ef03d696 Fixed JS-Tests TiledMap VertexZ bug. 2015-08-14 15:13:08 +08:00
zhangbin 6628dc47cb Update the reference of submodule cocos2d-console. 2015-08-14 15:12:58 +08:00
minggo 1e415a0b5b Merge pull request #13364 from WenhaiLin/v3-Scheduler-eloopfix 
Fixed `Scheduler::update(float dt)` can lead to an infinite loop when the value of `dt` is zero.
 2015-08-14 15:11:09 +08:00
WenhaiLin d855722c20 Fixed `Scheduler::update` can lead to an infinite loop when the value of `dt` is zero. 2015-08-14 15:05:25 +08:00
CocosRobot 4abb67592c [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-14 04:24:55 +00:00
pandamicro 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
子龙山人 9e5db70e3d Merge pull request #13366 from CocosRobot/update_cocosfiles_1439522827 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-08-14 11:54:57 +08:00
子龙山人 ac5f8d0f4c Merge pull request #13367 from CocosRobot/update_lua_bindings_1439522923 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-08-14 11:54:38 +08:00
子龙山人 f36d6a5c8c Merge pull request #13363 from GammaEspeon/v3 
[bugfix] SimpleAudioEngine misreporting whether music is playing when paused/resumed
 2015-08-14 11:54:12 +08:00
CocosRobot 9b003c9cfc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-14 03:34:30 +00:00
CocosRobot e532dcfd13 [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-14 03:27:08 +00:00
Ricardo Quesada 6d5d6b3ecc Merge pull request #13355 from ricardoquesada/downloader_decouple_squash 
Downloader improvements (squashed)
 2015-08-13 20:25:08 -07:00
WenhaiLin d25decb414 Label:ignore '\r' character. 2015-08-14 11:07:34 +08:00
Ricardo Quesada 5baa90c79e libcurl.h not included in the header to avoid... 
too many dependencies
 2015-08-13 19:28:38 -07:00
James Windiate fa02751e45 fixed whitespace 2015-08-13 19:24:41 -04:00
James Windiate 61a2e0d2ad Added _playing flag switching on pause and resume 
Issue # 13254
 2015-08-13 18:52:32 -04:00
Ricardo Quesada d2e8cf53be don't generate bindings for `getCocos2dThreadId` 2015-08-13 11:18:51 -07:00
Ricardo Quesada 7047e0fbdb Merge branch 'v3' into downloader_decouple_squash 2015-08-13 11:07:49 -07:00
子龙山人 c4af7b8c45 Merge pull request #13360 from CocosRobot/update_lua_bindings_1439456784 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-08-13 17:25:26 +08:00
CocosRobot 2de6b4ed4c [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-13 09:11:00 +00:00