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

3700 Commits

Author SHA1 Message Date
VisualSJ 3da67d3358 change the seek to time 2015-06-18 22:00:55 +08:00
samuele3hu a98b493151 Update UIS9NinePatchTest for jsb 2015-06-18 22:00:55 +08:00
samuele3hu cbfa92d3fd Add a new line. 2015-06-18 22:00:55 +08:00
samuele3hu 496ce50ff5 issue #12414:Add UIS9NinePatchTest for js 2015-06-18 22:00:55 +08:00
samuele3hu 77c3e9bdde issue #12414:Add UIS9NinePatchTest for Lua and js 2015-06-18 22:00:54 +08:00
VisualSJ 0a526875a8 Fixed a bug that xhr cross-domain error 2015-06-18 22:00:54 +08:00
VisualSJ 82c09e8d0c Fixed a bug that xhr cross-domain error 2015-06-18 22:00:54 +08:00
pandamicro cd7252014a Merge pull request #12432 from pandamicro/v3 
Change physics3d api to jsb namespace
 2015-06-18 21:53:39 +08:00
pandamicro 10a8adad53 Change physics3d api to jsb namespace 2015-06-18 20:39:40 +08:00
pandamicro 491d89baec Merge pull request #12429 from natural-law/v3 
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
 2015-06-18 20:28:52 +08:00
jianglong0156 4fe1542d17 add navmesh tests 2015-06-18 19:22:27 +08:00
Bin Zhang d288b13957 Build engine with LOCAL_ARM_MODE=arm when building JS projects for android. 2015-06-18 17:22:30 +08:00
pandamicro aa566a3722 Merge pull request #12424 from pandamicro/physics3d 
Fix Physics3D test and js bindings
 2015-06-18 16:09:49 +08:00
jianglong0156 85c40b6580 Merge pull request #8 from pandamicro/physics3d 
Physics3d
 2015-06-18 14:54:32 +08:00
pandamicro 811173ea3b Fix Physics3D test and js bindings 2015-06-18 14:33:16 +08:00
pandamicro 9dc52ba72f Merge pull request #12403 from VisualSJ/v3-aa 
[ci skip]Fixed some bug
 2015-06-18 12:31:27 +08:00
pandamicro 000be8316b Merge pull request #12415 from samuele3hu/v3_7_ui 
[ci skip]issue #12414:Add UIS9NinePatchTest for Lua and js
 2015-06-18 12:30:28 +08:00
tangziwen 1989de7a04 fix terraintest and Terrain::getInstersectionPoint() 2015-06-18 12:20:44 +08:00
pandamicro 7952477469 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into physics3d 2015-06-18 12:05:01 +08:00
VisualSJ 44c37c676e change the seek to time 2015-06-18 11:54:25 +08:00
samuele3hu 6c749a77f2 Fix the bugs about the Physics3DTest for Lua. 2015-06-18 11:17:08 +08:00
tangziwen 4187ea2241 fix Scene3D test 2015-06-18 10:17:46 +08:00
samuele3hu 7f21731bb1 Update UIS9NinePatchTest for jsb 2015-06-18 10:08:13 +08:00
samuele3hu 31ce264c6a Add a new line. 2015-06-18 09:44:47 +08:00
samuele3hu 8c01d94945 issue #12414:Add UIS9NinePatchTest for js 2015-06-18 09:43:05 +08:00
samuele3hu 31aae38fac issue #12414:Add UIS9NinePatchTest for Lua and js 2015-06-18 09:41:16 +08:00
VisualSJ 400b2d7663 Fixed a bug that xhr cross-domain error 2015-06-18 09:23:15 +08:00
pandamicro 3ffc0e6be6 Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d 2015-06-18 09:20:37 +08:00
pandamicro 3975d44d3b Chain NavMeshTest 2015-06-18 00:58:03 +08:00
pandamicro bcf9659408 Merge branch 'v3' into navmesh 2015-06-18 00:36:37 +08:00
pandamicro 5b23e8b381 Fix resource issue 2015-06-18 00:24:01 +08:00
pandamicro 85e8a407b1 Merge branch 'navmesh' of https://github.com/jianglong0156/cocos2d-x into v3 
# Conflicts:
#	tests/js-tests/project/Classes/AppDelegate.cpp
#	tools/tojs/genbindings.py
 2015-06-17 19:58:24 +08:00
samuele3hu 683812d817 Update Physics3D test for js. 2015-06-17 18:50:55 +08:00
jianglong0156 b265033a41 add testcase and manual bindings 2015-06-17 18:38:18 +08:00
jianglong0156 897b5fd0e9 add navmesh test project file and binding file 2015-06-17 18:37:19 +08:00
VisualSJ 010cb23ead Fixed a bug that xhr cross-domain error 2015-06-17 17:10:31 +08:00
pandamicro 4fa1cdc302 Update submodules 2015-06-17 15:43:35 +08:00
pandamicro ddc820eb42 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-06-17 15:33:34 +08:00
子龙山人 fd508a0198 Merge pull request #12381 from VisualSJ/v3-aa 
[ci skip]Fix some simple bug
 2015-06-17 15:11:08 +08:00
VisualSJ 0a223adf7c After exiting should restore settings 2015-06-17 14:43:41 +08:00
子龙山人 dc33a8d66e Merge pull request #12243 from Wu-Hao/fix_spritepolygon2 
Fix spritepolygon
 2015-06-17 14:40:30 +08:00
VisualSJ fba76b11cd Fixed path bug 2015-06-17 14:07:07 +08:00
pandamicro 3a076b6508 Merge pull request #12387 from samuele3hu/v3_navigation 
[ci skip]Update the Physics3DTest for js and Lua by synchronizing the API.
 2015-06-17 14:01:21 +08:00
samuele3hu 9c550e0a11 Update the Physics3DTest for js and Lua by synchronizing the API. 2015-06-17 13:58:05 +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
VisualSJ 6669f1df5e Fixed widgetFromJsonFile bug(#20035) 2015-06-17 11:49:27 +08:00
子龙山人 0915565b8d Merge pull request #12373 from samuele3hu/v3_navigation 
Add the Lua bindings for NavMesh and the related test case.
 2015-06-17 11:36:52 +08:00
VisualSJ d855066472 Fixed a bug that control's default resource error #20037 2015-06-17 11:19:06 +08:00
VisualSJ 164fb3a058 If json have the back button, then use this button 2015-06-17 11:16:44 +08:00
samuele3hu 2da760b655 Update the NavMesh test case 2015-06-17 09:49:31 +08:00
VisualSJ ab34c1de89 Change the path(UIVideoPlayerTest.js) 2015-06-16 17:30:48 +08:00
pandamicro d51fd2397c Fix js test ES6 usage issue 2015-06-16 15:01:52 +08:00
samuele3hu a547d6aa33 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_navigation 
Conflicts:
	tools/bindings-generator
 2015-06-16 11:36:11 +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 74f4d29fa9 added missing librecast 2015-06-15 20:06:54 -07: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
pandamicro ccd15b3da7 Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into spritepolygon 2015-06-16 00:56:58 +08:00
pandamicro 4f8bd25a83 Add js test cases for sprite polygon 2015-06-16 00:56:08 +08: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
Hao Wu b4ca8c1489 Merge pull request #15 from pandamicro/spritepolygon 
Add SpritePolygon JSB bindingsJSB bindings
 2015-06-15 15:47:02 +08:00
pandamicro 0216d05eee Merge pull request #12102 from super626/navigation2 
3D Navigation
 2015-06-15 13:39:05 +08:00
pandamicro cd7f39d823 Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into spritepolygon 2015-06-15 13:22:38 +08:00
pandamicro 34954c2600 Add PolygonSprite Test1 2015-06-15 13:21:49 +08:00
yangxiao 97ef7974bb create agent in the onEnter 2015-06-15 11:57:05 +08:00
pandamicro 852b9b42b9 Remove jsb_cocos2dx_experimental_manual 2015-06-15 10:46:57 +08:00
jianglong0156 5ff0825468 modify android res copy 2015-06-15 09:55:10 +08:00
jianglong0156 393ad49481 add win32 project resource copy 2015-06-15 09:55:05 +08:00
jianglong0156 6310f74533 modify resource to res/resjs 2015-06-15 09:54:00 +08:00
jianglong0156 f9df298401 modify copy resource to res/resjs 2015-06-15 09:53:53 +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
pandamicro 9806c09b0e Merge pull request #12299 from WenhaiLin/v3-label-cropped 
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
 2015-06-12 21:33:09 +08:00
pandamicro f9057b3f32 Merge pull request #12284 from pandamicro/v3 
Fix template android compilation issue on physics3d
 2015-06-12 21:10:40 +08:00
子龙山人 c01d1fe00a Merge pull request #12310 from WenhaiLin/v3-particlefile-key 
Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner.
 2015-06-12 16:44:12 +08:00
Jacky 29c108bdef Merge remote-tracking branch 'origin' into fix_spritepolygon2 
# Conflicts:
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-06-12 16:28:41 +08:00
pandamicro f3765a4c5f Fix physics 3d macro include issue 2015-06-12 15:58:43 +08:00
pandamicro e9d648f151 Fix physics 3d macro include issue 2015-06-12 15:41:46 +08:00
WenhaiLin 4d97d5075b Add test case for issue12310. 2015-06-12 15:39:57 +08:00
pandamicro c3aba0392d Update auto conversion for sprite polygon 2015-06-12 13:00:49 +08:00
子龙山人 7a9b48bd83 Merge pull request #12214 from andyque/optimize-ui-memory-usage 
Optimize ui memory usage
 2015-06-12 10:11:21 +08:00
pandamicro 1a9056cf14 Merge pull request #12300 from jianglong0156/textFieldShowString 
[ci skip]add textfield show textString
 2015-06-11 19:33:21 +08:00
WenhaiLin 5aa31ea83a Label:the texture of character have not cropped if character cross the axis-aligned bounding-box. 2015-06-11 17:16:44 +08:00
pandamicro 902f1696e8 Merge pull request #12290 from jianglong0156/issue#2928texture2d 
[ci skip]add pr#2928 test case, load same remote img. can callback the function
 2015-06-11 16:51:59 +08:00
子龙山人 43555272d5 Merge pull request #12236 from WenhaiLin/v3-box2d-compilefix 
Fixed compile error cause by enable CC_ENABLE_BOX2D_INTEGRATION.
 2015-06-11 16:34:45 +08:00
yangxiao 44c2b0d5ad merge cocos 2015-06-11 15:54:42 +08:00
WenhaiLin aff2f8c2c4 Fixed compile error. 2015-06-11 14:42:03 +08:00
samuele3hu 1b20e463d8 Update the Lua binding about the Polygon and update the test case. 2015-06-11 14:38:38 +08:00
jianglong0156 f97955682a add pr#2928 test case, load same remote img. can callback the function 2015-06-11 11:11:51 +08:00
jianglong0156 96ce3ec22c add textfield show textString 2015-06-10 16:15:09 +08:00
Jacky b41c60dbdb Merge remote-tracking branch 'origin/v3' into fix_spritepolygon2 
# Conflicts:
#	external/config.json
 2015-06-10 10:23:43 +08:00
Huabing.Xu 10352c40b2 Merge branch 'v3' into v3FrameBufferObject 
# Conflicts:
#	cocos/2d/CCCamera.h
 2015-06-10 10:16:42 +08:00
Huabing.Xu 3e331128c6 file rename CCFrameBufferObject->CCFrameBuffer 2015-06-09 15:32:12 +08:00
Huabing.Xu 97b387560b revert some accidental changes 2015-06-09 14:06:11 +08:00
Jacky 562d4b9a78 fix on the windows. 2015-06-09 11:23:37 +08:00
Huabing.Xu 9acab65e4f rename FrameBufferObject->FrameBuffer 
Move FrameBufferObject related class to experimental namespace
 2015-06-09 10:59:43 +08:00