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

32033 Commits

Author SHA1 Message Date
Ricardo Quesada d5d1be93cc make it compile on win32 2015-08-26 10:16:50 -07:00
Ricardo Quesada dfed33f6f2 Adds `PrimitiveCommand` test 2015-08-25 15:07:03 -07:00
pandamicro 24282e6e55 Merge pull request #13397 from perminovVS/v3-dev-winrt-correct-unicode 
Correct use and convert unicode from utf8. WinRT
 2015-08-24 11:36:30 +08:00
子龙山人 3ca13a755a Merge pull request #13529 from zilongshanren/fixJenkinsCompile 
[ci skip]fix Jenkins template compile
 2015-08-24 10:28:13 +08:00
andyque c2fae3987b fix Jenkins template compile 2015-08-24 10:26:12 +08:00
pandamicro 9fe278b31f Merge pull request #13459 from MSOpenTech/v3-winrt-fix 
V3: fixed typo in WindowsPhone 8.1 cpp template file names
 2015-08-19 13:39:01 +08:00
Dale Stammen fef0a1bb81 fixed typo in WindowsPhone file names 2015-08-18 20:33:53 -07:00
pandamicro ce9eb762fa Merge pull request #13452 from MSOpenTech/v3-win10 
V3: Windows 10 UWP and WP8.1 app certification fixes
 2015-08-19 09:36:35 +08:00
Dale Stammen 47b72ba30e Merge branch 'v3' into v3-win10 2015-08-18 11:07:38 -07:00
Dale Stammen 8493365be7 updates to pass Windows App Certification tests 2015-08-18 11:06:47 -07:00
子龙山人 fb55c2cd63 Merge pull request #13398 from perminovVS/v3-dev-use-more-get-file-extension 
More FileUtils::getFileExtension
 2015-08-18 17:27:11 +08:00
pandamicro f54791c13d Merge pull request #13445 from ZhangMenghe/v3-shader 
[ci skip] Fix shader position abnormal
 2015-08-18 17:21:00 +08:00
ZhangMenghe 9fbc45171e Fix shader position abnormal 2015-08-18 17:07:08 +08:00
pandamicro d2bc03f80f Merge pull request #13424 from WenhaiLin/v3.8-rc0 
Label:Fixed display not as expected(Redmine issue:22133).
 2015-08-18 10:00:36 +08:00
pandamicro b16dc7b425 Merge pull request #13427 from songchengjiang/v3_backup 
performance optimization and bug fixing
 2015-08-18 09:59:24 +08:00
songchengjiang 6008c8352b performance optimization and bug fixing 2015-08-18 09:51:26 +08:00
Dale Stammen ee7b9377de removed old wp8 code that breaks Win10 WACK tests 2015-08-17 18:40:07 -07:00
Dale Stammen 9259696847 disable Downloader test for Win10 UWP. No CURL support yet 2015-08-17 18:37:54 -07:00
Dale Stammen d297c0f381 update version to v3-deps-72 2015-08-17 18:36:47 -07:00
Dale Stammen 97ecec1d64 updated Win10 UWP app asset files 2015-08-17 18:35:42 -07:00
pandamicro 2deae3aa23 Merge pull request #13425 from CocosRobot/update_lua_bindings_1439823683 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-08-18 08:09:10 +08:00
Vladimir Perminov 24d06bb1c9 More use StringUtf8ToWideChar and PlatformStringFromString 2015-08-17 23:04:05 +03:00
CocosRobot 24a63e12ec [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-17 15:08:00 +00:00
pandamicro 81d5a8377f Merge pull request #13418 from jianglong0156/fixTMXTileFlagsError 
Remove duplicate function definition, Add function adaptation
 2015-08-17 22:56:59 +08:00
pandamicro de5810a9ac Merge pull request #13423 from pandamicro/gamenode3d-parser 
[ci skip]Fix gamenode3d parse failed error
 2015-08-17 22:55:08 +08:00
WenhaiLin 990a25f759 Label:Fixed display not as expected(Redmine issue:22133). 2015-08-17 22:46:19 +08:00
肖峰 0473b08dbb Fix gamenode3d parse failed error 
- Fix the parser issue
- Add GameNode3DReader to win8 universal project
- Add GameNode3d reader to Android & Linux project

Squashed from https://github.com/cocos2d/cocos2d-x/pull/13369
 2015-08-17 22:42:21 +08:00
pandamicro b4ec30cc47 Merge pull request #13416 from WenhaiLin/v3.8-beta2 
cpp-tests[win32 project]:Fixed link errors in release mode.
 2015-08-17 22:32:42 +08:00
pandamicro 22925c2710 Merge pull request #13413 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2015-08-17 21:48:32 +08:00
pandamicro 40581c1c25 Merge pull request #13422 from VisualSJ/v3-pb-21865 
[ci skip] Change ActionManager test name
 2015-08-17 21:47:20 +08:00
pandamicro 8d0359cac1 Merge pull request #13419 from pandamicro/v3 
[ci skip] Permit webp image loading and Add default viewport meta to js templates
 2015-08-17 21:46:05 +08:00
VisualSJ be93b6bf2e Change ActionManager test name 2015-08-17 20:35:38 +08:00
pandamicro 2d1fcecfa5 Add default viewport meta to js templates 2015-08-17 18:56:10 +08:00
pandamicro be165ef900 Permit webp image loading 2015-08-17 18:55:53 +08:00
jianglong0156 b19e02bdf6 Remove duplicate function definition, Add function adaptation 2015-08-17 18:18:38 +08:00
pandamicro f2edb1c8f9 Merge pull request #13410 from ZhangMenghe/v3-retinaEffect 
[ci skip] Fix invisiable testcase of effects
 2015-08-17 17:51:04 +08:00
WenhaiLin ae836bd364 cpp-tests[win32 project]:Fixed link errors in release mode. 2015-08-17 17:43:36 +08:00
pandamicro e380b0cffa Merge pull request #13415 from VisualSJ/v3-13359 
[ci skip] Update JS parser
 2015-08-17 17:29:12 +08:00
ZhangMenghe eaa5643c7c Fix invisiable testcase of effects 2015-08-17 17:26:25 +08:00
VisualSj c52a81a2c2 Update JS parser 2015-08-17 17:25:17 +08:00
pandamicro f1cbd00b30 Merge pull request #13414 from liamcindy/V3.8_reader 
fix code informal
 2015-08-17 17:21:01 +08:00
Liam b40ef51337 fix code informal 2015-08-17 17:16:26 +08:00
zhangbin 3f6816f2f7 Update the reference of submodule cocos2d-console. 2015-08-17 17:16:21 +08:00
pandamicro 559305646b Merge pull request #13411 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2015-08-17 17:13:12 +08:00
pandamicro d0580f09e8 Merge pull request #13383 from geron-cn/3.7.1 
add blendfunc cascade to its skin in BoneNode
 2015-08-17 17:12:04 +08:00
pandamicro 096410a31a Merge pull request #13406 from xiaofeng11/v3_reader_update 
Add BlendFrame supporting to Skeleton Animation
 2015-08-17 17:09:25 +08:00
pandamicro 66d99d392c Merge pull request #13409 from liamcindy/V3.8_reader 
fix userCamera flag error with old version files
 2015-08-17 17:01:59 +08:00
pandamicro 9db78b2bb7 Merge pull request #13407 from liamcindy/v3.8 
fix the skybox display error from editor files
 2015-08-17 16:57:32 +08:00
XiaoFeng 442669d6f1 Remove unused easing data processing in blend frame parsing 2015-08-17 16:19:29 +08:00
zhangbin deaf50e803 Update the reference of submodule cocos2d-console. 2015-08-17 15:41:56 +08:00