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

1941 Commits

Author SHA1 Message Date
pandamicro 88aeaa36f4 Merge pull request #12534 from super626/skybox 
Skybox improvement
 2015-06-26 17:05:17 +08:00
pandamicro d29c5643bc Merge pull request #12559 from WenhaiLin/v3-37-crashfix 
[Cpp-tests-->SpriteOffsetAnchorRotation]Fixed crash when enter `SpriteOffsetAnchorRotation` again after a auto-tested.
 2015-06-26 12:51:07 +08:00
Wenhai Lin 94c0c0c3fc [Cpp-tests-->SpriteOffsetAnchorRotation]Fixed crash when enter `SpriteOffsetAnchorRotation` test case again after a auto-tested. 2015-06-26 12:02:15 +08:00
pandamicro ddb982246f Merge pull request #12553 from VisualSJ/v3-aa 
Encoded into AVC
 2015-06-26 10:15:02 +08:00
pandamicro d2764918b9 Merge pull request #12545 from WenhaiLin/v3-37-removeUInclude 
Remove unneeded include files and fixed warns.
 2015-06-26 09:31:51 +08:00
WenhaiLin 1494f09f06 Remove unneeded include files and fixed warns. 2015-06-25 23:15:39 +08:00
pandamicro 1ab369a70b Merge pull request #12542 from andyque/fix-v3.7-stuio-percent-mode 
Fix v3.7 cocosStudio percent position bug
 2015-06-25 21:37:12 +08:00
andyque 516d45db62 update submodule 2015-06-25 20:16:43 +08:00
VisualSJ 110e51d0bc Encoded into AVC 2015-06-25 19:01:55 +08:00
andyque 8f7b439dfe add cocostudio 1.6 tests 2015-06-25 18:06:45 +08:00
samuele3hu 7feaa18d82 Fix the compile error for cpp-tests based on android studio 2015-06-25 16:08:48 +08:00
yangxiao 63f948c822 modify skybox to projection space 2015-06-25 15:01:39 +08:00
pandamicro 117a72fa07 Merge pull request #12514 from WenhaiLin/v3-37-autotest-timeoutfix 
[Cpp-tests]Fixed cannot start auto test again if the timeout has occurred.
 2015-06-24 23:07:38 +08:00
pandamicro f9db471026 Merge pull request #12495 from super626/v3 
Fix terrain getIntersectionPoint
 2015-06-24 18:36:52 +08:00
WenhaiLin a7632a962f [Cpp-tests]Fixed cannot start auto test again if the timeout has occurred. 2015-06-24 18:24:16 +08:00
pandamicro 6638a53d69 Merge pull request #12509 from xiaofeng11/v3_xiaofeng 
Add a text label to Node3DReader Test, notice user there has no content to show
 2015-06-24 17:10:08 +08:00
Bin Zhang c9c212d0e1 Solve the error when run tests projects with `cocos run`. 2015-06-24 15:33:13 +08:00
XiaoFeng 0846dadbc3 Add a text label to Node3DReader Test, notice user there has no content to show 2015-06-24 14:58:14 +08:00
yangxiao c3593c9d64 merge cocos 2015-06-23 18:29:39 +08:00
yangxiao 251c81d7be Merge branch 'newcode' into v3 2015-06-23 18:25:41 +08:00
WenhaiLin f95245312a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0 2015-06-23 17:08:25 +08:00
WenhaiLin cbb073e905 Fixed Application may be created more than once on Android. 2015-06-23 16:58:38 +08:00
子龙山人 fca9b89a4c Merge pull request #12480 from andyque/fix-rapidjson-assert-error 
fix rapidjson assert error
 2015-06-23 15:34:47 +08:00
andyque 70b709f4a8 fix rapidjson assert error 2015-06-23 13:54:11 +08:00
pandamicro 4823cc3bc2 Merge pull request #12476 from super626/fps 
show fps in scene3d demo
 2015-06-23 13:42:26 +08:00
子龙山人 d8a2695620 Merge pull request #12473 from WenhaiLin/v3-37-ParticleDemo-crashfix 
[cpp-tests] ParticleIssue12310:Fixed crash when tap left/right arrow to move to another test case.
 2015-06-23 13:36:36 +08:00
yangxiao a433d57807 show fps 2015-06-23 11:56:50 +08:00
WenhaiLin a68874d3cb Node: Particles --> ParticleIssue12310:Fixed crash when tap left/right arrow to move to another test case. 2015-06-23 11:00:23 +08:00
andyque 931011809d fixed unintended spaces in string 2015-06-23 10:38:43 +08:00
pandamicro b1e24ee8f2 Merge pull request #12455 from natural-law/v3 
Solve the error when build tests projects with cocos command on win32.
 2015-06-22 13:04:17 +08:00
WenhaiLin 6bd46fcfcc [ci skip]UIRichTextTest:Fixed text don't render properly in the Windows 8.1 Store App. 2015-06-20 17:07:11 +08:00
Bin Zhang 85fe9e8816 Solve the error when build tests projects with cocos command on win32. 2015-06-19 18:32:32 +08:00
WenhaiLin 45de0b650a [ci skip]Fixed resources. 2015-06-19 16:26:03 +08:00
WenhaiLin d32a317ea0 Label:Fixed line wrap error without space. 2015-06-19 13:39:19 +08:00
tangziwen 1989de7a04 fix terraintest and Terrain::getInstersectionPoint() 2015-06-18 12:20:44 +08:00
tangziwen 4187ea2241 fix Scene3D test 2015-06-18 10:17:46 +08:00
pandamicro 4fa1cdc302 Update submodules 2015-06-17 15:43:35 +08:00
Jacky 3c5ab4f518 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2 
# Conflicts:
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-06-17 13:04:24 +08:00
WuHao aeeed0f4ab Merge remote-tracking branch 'origin' into fix_spritepolygon 
# Conflicts:
#	external/config.json
 2015-06-16 11:19:20 +08:00
Dale Stammen 8d8e7d6cb9 Merge branch 'v3' into v3-winrt-librecast 2015-06-15 19:27:40 -07:00
Dale Stammen 0781978788 added librecast. Updated build properties 2015-06-15 18:44:14 -07:00
Dale Stammen e14fdedf67 added missing NavMeshTest files 2015-06-15 18:19:51 -07:00
Ricardo Quesada b167ab3e78 StateBlock() is public 2015-06-15 17:43:37 -07:00
Ricardo Quesada ca3da86da7 StateBlock::restore() is public 
It is possible to restore to default state
 2015-06-15 14:12:44 -07:00
WuHao 27d0f51e9b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_tests.xcodeproj/project.pbxproj
	cocos/2d/libcocos2d.vcxproj.filters
	tools/cocos2d-console
	web
 2015-06-15 16:13:36 +08:00
pandamicro 0216d05eee Merge pull request #12102 from super626/navigation2 
3D Navigation
 2015-06-15 13:39:05 +08:00
yangxiao 97ef7974bb create agent in the onEnter 2015-06-15 11:57:05 +08:00
Ricardo Quesada a8cf72dc43 pass bits to invalidate 2015-06-12 17:14:09 -07:00
Ricardo Quesada 4278bf51b1 Adds RenderState::StateBlock::invalidate(); 
handy function to restore the GL state to the default one.
Only use it if calling GL calls directly
 2015-06-12 16:47:08 -07:00
Ricardo Quesada d9b0b2ca38 more fixes 2015-06-12 15:28:29 -07:00