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

761 Commits

Author SHA1 Message Date
minggo 1ebcca8d9f Merge pull request #11417 from super626/terrain 
Terrain
 2015-04-14 10:50:21 +08:00
XiaoYang 37dc4c33d9 Merge pull request #300 from lvlonggame/v3 
fix bug: create single node recursively.
 2015-04-14 09:10:24 +08:00
zhukaixy 6684491249 1: update cube texture for sky box 
2: add mouse-controled camera for test case (skybox)
 2015-04-14 01:39:23 +08:00
yangxiao 284c8e5a97 add to animation cache 2015-04-13 17:14:58 +08:00
lvlong 57a44194f4 fix bug: create single node Recursively. 2015-04-13 11:35:52 +08:00
tangziwen 380d829548 move reset draw polygon state in corresponding position 2015-04-13 10:14:03 +08:00
minggo 952f9da2c1 Merge pull request #11385 from super626/terrain 
Improve Terrain
 2015-04-13 09:18:50 +08:00
tangziwen a7aed360a1 update terrain 2015-04-10 14:22:07 +08:00
minggo 9891a94e87 Merge pull request #11352 from super626/v3 
Fix Sprite3D memory leak
 2015-04-09 13:57:03 +08:00
yangxiao 575d32c5ec correct words 2015-04-09 11:31:56 +08:00
yangxiao 9cefa3a9da weak ref to vertexdata 2015-04-09 10:52:05 +08:00
tangziwen 4ca6b559e6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain 2015-04-09 09:40:22 +08:00
tangziwen 2be309d841 add reload method in case of GL context Lost. 2015-04-08 19:11:46 +08:00
yangxiao a7a39d71f5 modify getAABBRecursively 2015-04-08 16:40:04 +08:00
yangxiao 0d0bad186f resolve conflict 2015-04-08 16:23:35 +08:00
tangziwen dc7cd520b2 update terrain 2015-04-08 15:17:05 +08:00
tangziwen 3ab4e75a71 update 2015-04-08 10:10:05 +08:00
tangziwen a220a8f669 fix wrong attribute location bind, fix memory leak, enable back-face culling 2015-04-07 18:47:19 +08:00
lvlong c9014e12b4 Merge branch 'v3' of github.com:super626/cocos2d-x into v3 
Conflicts:
	CHANGELOG
 2015-04-07 16:40:57 +08:00
lvlong 99ef79f940 modify INT_NEAR 2015-04-07 16:37:51 +08:00
minggo 353c2b0d75 Merge pull request #11288 from perminovVS/v3-dev-optimize-vec3 
Optimize Vec3
 2015-04-07 14:04:57 +08:00
Vladimir Perminov 105bac2d55 Optimize Vec3 
small function Vec3 move to Vec3.inl
Added:
add(float xx, float yy, float zz);
setZero();

Change all code:
_vec3 = Vec3(x, y, z);   ->   _vec3.set(x, y, z);
Vec3 vec3 = Vec3(x, y, z);   ->  Vec3 vec3(x, y, z);
_vec3 += Vec3(x, y, z);   ->   _vec3.add(x, y, z);
_vec3 = Vec3::ZERO;   ->   _vec3.setZero();
 2015-04-05 13:09:50 +03:00
lvlong 4c6eec9ec1 add getAABBRecursively 2015-04-03 18:04:33 +08:00
tangziwen 0193420dfc Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain 
Resovle Conflicts:
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-04-03 15:45:51 +08:00
tangziwen 8a7b318c1a Add some helper function to detect the heightMap size,refact Terrain::Create, fix typo ,add doxygen comment 2015-04-03 13:49:07 +08:00
XiaoYang 63a27d14b7 Merge pull request #282 from lvlonggame/terrain 
fix bug: about minFilter and magFilter
 2015-04-02 17:26:35 +08:00
lvlong 60bed4f461 revert alpha map minFilter 2015-04-02 15:10:51 +08:00
lvlong c3cc8b917c fix bug: about minFilter and magFilter 2015-04-02 15:01:14 +08:00
yangxiao 1b63e5168a add to linux 2015-04-02 14:21:51 +08:00
yangxiao 9e115073a1 fix warning 2015-04-02 14:04:31 +08:00
XiaoYang 984babc9c9 Merge pull request #281 from tangziwen/terrain 
update terrain
 2015-04-02 10:19:11 +08:00
minggo 332ce1a8f3 Merge pull request #11249 from super626/v3 
Release note for texturecube skybox and animtion quality
 2015-04-02 09:39:16 +08:00
minggo 199fb2b694 Merge pull request #11250 from super626/texturecube 
Texturecube Modify
 2015-04-02 09:38:26 +08:00
lvlong 1da7ef121e _aabbDirty = true 2015-04-02 09:33:48 +08:00
tangziwen 6cd1077cb0 update terrain 2015-04-01 18:24:05 +08:00
yangxiao 2cc9814702 modify 2015-04-01 17:58:41 +08:00
yangxiao 4b7ae430a8 Merge branch 'texturecube' of https://github.com/super626/cocos2d-x into texturecube 2015-04-01 17:37:55 +08:00
yangxiao 9540fd590f modify skybox 2015-04-01 17:34:57 +08:00
yangxiao 591fff4046 release note for texturecube skybox and animtion quality 2015-04-01 16:40:40 +08:00
lvlong 72722ba5b0 fix aabbDirty bug. 2015-04-01 10:57:19 +08:00
tangziwen 3247acc0c1 ignore some method ,fix typo 2015-04-01 10:23:53 +08:00
tangziwen 8cde333d36 update 3d doc 2015-04-01 09:47:09 +08:00
minggo cb0c9ad6ee Merge pull request #11233 from super626/texturecube 
Bug fix: ios devices crash on release mode
 2015-03-31 18:21:22 +08:00
minggo c1cd041912 Merge pull request #11221 from super626/v3 
3d animation quality control
 2015-03-31 17:23:58 +08:00
zhukaixy 3835675cab bugfix: TextureCube will be crashed on release environment 2015-03-31 16:56:02 +08:00
lvlong 336e719a2f initialize _forceDepthWrite 2015-03-31 14:41:07 +08:00
lvlong ab2c773c5c clean all action from s_fadeInAnimates, s_fadeOutAnimates, s_runningAnimates!!!! 2015-03-31 14:26:40 +08:00
XiaoYang 45987b6a60 Merge pull request #276 from tangziwen/terrain 
update Terrain, support skirt
 2015-03-31 09:14:27 +08:00
tangziwen 1a93f87a15 update terrain 2015-03-30 18:25:22 +08:00
lvlong cbdfd77400 modify some name. 2015-03-30 17:46:45 +08:00
lvlong 5032194e98 modify animate 3d quality to bool 2015-03-30 15:57:58 +08:00
samuele3hu 6c528c4a42 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test 2015-03-30 15:51:01 +08:00
samuele3hu c3ad458a26 Update comment for Lua 2015-03-30 15:47:47 +08:00
lvlong 6fe9f0d1c8 add comments for 3d animation quality!!! 2015-03-30 14:05:03 +08:00
yangxiao c6a86ac287 move shader to shaders 2015-03-30 13:45:50 +08:00
lvlong ccb5039411 Merge branch 'v3' of github.com:super626/cocos2d-x into v3 
Conflicts:
	cocos/base/CCConfiguration.h
 2015-03-30 11:50:01 +08:00
lvlong b2a7a753c2 add comments 2015-03-30 11:44:30 +08:00
minggo 59441adc2c Merge pull request #11213 from super626/texturecube 
Texturecube bug fix
 2015-03-30 10:48:10 +08:00
yangxiao b469cfa928 merge cocos 2015-03-30 10:28:14 +08:00
yangxiao 7affd8edcf large value for min max 2015-03-30 10:00:06 +08:00
minggo 30db8ab7fa Merge pull request #11159 from super626/v3 
node animation support
 2015-03-30 09:32:36 +08:00
VisualSJ 6285e72d1e [ci skip] Add javascript notes... 
cocos/3d/CCBundle3D.h
  cocos/3d/CCBundle3DData.h
  cocos/3d/CCBundleReader.h
  cocos/3d/CCFrustum.h
  cocos/3d/CCMeshSkin.h
  cocos/3d/CCMeshVertexIndexData.h
  cocos/3d/CCOBB.h
  cocos/3d/CCObjLoader.h
  cocos/3d/CCPlane.h
  cocos/3d/CCRay.h
  cocos/3d/CCSprite3DMaterial.h
  cocos/base/CCAsyncTaskPool.h
  cocos/base/CCIMEDelegate.h
  cocos/base/CCIMEDispatcher.h
  cocos/base/CCMap.h
  cocos/base/CCScriptSupport.h
 2015-03-28 15:11:51 +08:00
zhukaixy 5bff8f5bf3 Bugfix: for glcontext recreated 2015-03-27 17:20:46 +08:00
minggo 8b5a6d9ccc Merge pull request #11196 from tangziwen/doc 
3d fix doxygen add to group
 2015-03-27 17:09:24 +08:00
yangxiao a45f0d1a76 merge cocos 2015-03-27 16:50:40 +08:00
tangziwen 56c31845ff fix conflict again 2015-03-27 15:25:16 +08:00
tangziwen 12bcdc8868 fix conflict 2015-03-27 15:08:20 +08:00
tangziwen 68563494ae fix doxygen add to group 2015-03-27 14:10:41 +08:00
tangziwen a2cce0594b update 2015-03-27 13:43:09 +08:00
tangziwen 5a76a628d3 add some utility functions 2015-03-27 11:46:02 +08:00
tangziwen 8b376e511c update Terrain 2015-03-27 10:12:24 +08:00
yangxiao 6cd1697240 config wp8 and add comment 2015-03-26 18:10:42 +08:00
yangxiao 7d3154e2e9 add to linux 2015-03-26 14:34:11 +08:00
yangxiao c23746fbcd modify 2015-03-26 13:05:42 +08:00
yangxiao 000e34c6d0 merge cocos 2015-03-26 12:50:18 +08:00
yangxiao 84535feb0c merge cocos 2015-03-26 11:59:26 +08:00
lvlong 6c29385547 animate quality! 2015-03-26 11:33:16 +08:00
lvlong c999307150 add different animate quality. 2015-03-26 11:30:22 +08:00
zhukaixy aead9e5855 correct for code indent 2015-03-26 09:53:41 +08:00
XiaoYang 11c021881b Merge pull request #263 from lvlonggame/v3 
fix: obj file load material.
 2015-03-26 09:29:58 +08:00
lvlong f93dffdeb0 node frame animation test and resource 2015-03-26 09:25:37 +08:00
lvlong ecfd66cda3 node frame code!!!!! 2015-03-26 09:12:05 +08:00
minggo cb07aa4ae2 Merge pull request #11091 from super626/v3 
fix memory leak
 2015-03-25 16:16:28 +08:00
yangxiao c6af12bcd9 use CC_SAFE_DELETE 2015-03-25 14:33:53 +08:00
zhukaixy 54472497a4 fix comments 2015-03-25 13:43:55 +08:00
lvlong 7efd4c2df6 replace setAdditionnalTransform() 2015-03-25 10:04:51 +08:00
WenhaiLin 9dd778edb0 [ci skip]Update comments 2015-03-24 20:23:51 +08:00
lvlong 5ce4fbe6df merge node transform problem！！！ 2015-03-24 17:59:24 +08:00
lvlong 5c20d49cd7 Merge branch 'v3' of github.com:super626/cocos2d-x into v3 2015-03-24 16:07:42 +08:00
lvlong 6e6b2c1869 fix bug: load *.obj can't load sub-mesh material. 2015-03-24 16:03:51 +08:00
zhukaixy 6eaa78d1cb add reload mechanism for TextureCube and Skybox 2015-03-24 15:43:59 +08:00
yangxiao fad4fb8e6f fix memory leak 2015-03-24 10:22:55 +08:00
minggo dda85fcb02 Merge pull request #11027 from tangziwen/doc 
add 3D doc, fixed typo
 2015-03-23 10:45:41 +08:00
tangziwen 814490ab44 add 3D doc, fixed typo 2015-03-20 17:20:22 +08:00
zhukaixy 0587122ccc Move Skybox.shader from Sprite3DTest to Shader3D folder 2015-03-19 15:11:24 +08:00
minggo 1e271a9d96 Merge pull request #10899 from super626/v3 
Bug fix
 2015-03-17 19:29:21 +08:00
lvlong 3ce0449c97 decompose 2015-03-17 15:17:23 +08:00
lvlong 733a89100e remove old code! 2015-03-17 13:13:03 +08:00
lvlong 080132d072 modify sub node transform! 2015-03-17 12:15:03 +08:00
konopka 0387b13bb6 Adding missing virtual keywords 2015-03-16 16:39:43 +01:00
yangxiao 8b3e116ed6 check running scene 2015-03-16 18:04:50 +08:00
Martin Konopka 2c80b6ae3a Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-15 00:10:08 +01:00
Martin Konopka cd12d08a52 Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-14 19:33:15 +01:00
yangxiao 45bd6180ad fix create bundle using empty path 2015-03-09 17:09:18 +08:00
yangxiao ff3eba6143 refact init 2015-03-09 16:29:57 +08:00
yangxiao d7c1d6b6aa add billboard to transparent queue 2015-03-06 09:57:48 +08:00
tangziwen 840b531a9a update 2015-03-03 14:14:50 +08:00
yangxiao 38636dc8b7 allow transition time to 0 2015-03-03 11:04:34 +08:00
yangxiao 874f7c7f99 fix transparent render bug 2015-03-03 10:42:47 +08:00
yangxiao 56f3f34ee3 add Animate3D::setTransitionTime 2015-02-28 17:40:25 +08:00
minggo c8eaa4aeba Merge pull request #10447 from super626/particle_merge 
add 3d particle (Particle Universe)
 2015-02-15 19:48:18 +08:00
minggo d5e82521de Merge pull request #10359 from flamefox/3dattachnode 
getAttachNode should failed when there is no bone with name
 2015-02-15 19:03:52 +08:00
yangxiao 9b117bf87c resolve conflict 2015-02-13 15:46:19 +08:00
yangxiao 8f290b2d24 modify according to minggo 2015-02-12 16:09:08 +08:00
yangxiao 79a0c0152a add 3d particle (Particle Universe) 2015-02-11 18:14:22 +08:00
kompjoefriek 00edc542cb Merged with upstream/v3 
Merged with upstream/v3 and resolved merge conflicts
 2015-02-10 21:27:20 +01:00
flamefox 4b405db77d fix tab to space 2015-02-04 10:36:16 +08:00
flamefox c2e17d6b1d getAttachNode should failed when there is no bone with name 2015-02-04 10:32:44 +08:00
yangxiao 19edeb971b fix warning 2015-02-03 17:51:16 +08:00
yangxiao 66da4e8096 mac work 2015-02-03 17:38:40 +08:00
yangxiao 265e6fec1a fix index 2015-02-02 16:54:55 +08:00
yangxiao f608377bdb make vao work 2015-02-02 15:44:47 +08:00
zhukaixy 806a5011e5 solve the problems noted in comments 2015-01-30 17:23:30 +08:00
tangziwen 10eced8b98 bug fix upload new sample texture 2015-01-30 15:46:39 +08:00
minggo dff7d6f639 Merge pull request #10277 from super626/v3 
fix bug on loading .mtl
 2015-01-29 19:21:31 +08:00
zhukaixy f3536056d8 Simpilify skybox 2015-01-29 19:01:10 +08:00
tangziwen 89cff149fc add new ray intersection method ,add new Doc to explain the terrain 2015-01-29 18:06:00 +08:00
yangxiao 3eeeaf051f fix load mtl 2015-01-29 17:54:22 +08:00
kompjoefriek 89152b2856 Tabs to spaces 
Changed indenting tabs to spaces
 2015-01-29 10:40:00 +01:00
zhukaixy ee99700ec1 add test case TextureCube 2015-01-29 09:28:14 +08:00
kompjoefriek 0c70660551 Fixed warnings 
- signed/unsigned mismatch
- printing enum with %d
- using int as bool
 2015-01-29 01:36:22 +01:00
Nite Luo c0ff8d1177 Don't clear depth between queues 2015-01-28 15:28:14 -08:00
Nite Luo 94d5810efd Merge pull request #10254 from super626/fixbillboard 
Tested locally fix the billboad testcase
 2015-01-28 14:06:53 -08:00
yangxiao fc1dbf49fb fix billboard 2015-01-28 15:21:57 +08:00
Nite Luo be6ca1b6d2 add force depth write 2015-01-27 17:05:51 -08:00
tangziwen 9ec366a130 update terrain test add new method to get normal 2015-01-27 15:18:59 +08:00
tangziwen d6c3320d49 fix memory leak 2015-01-23 18:14:44 +08:00
tangziwen d04b3feb50 add new test, fix memory leak 2015-01-23 18:09:54 +08:00
minggo 44bcee60c7 Merge pull request #10182 from super626/v3 
Fix bug on loading .obj's .mtl file
 2015-01-23 12:02:00 +08:00
kompjoefriek ca48c5e5dd Fixed lots of compiler warnings 
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
 2015-01-23 02:02:33 +01:00
lvlong 662117e878 mtlPath 2015-01-22 17:33:24 +08:00
lvlong c5f955466a fixbug: load obj file's material. 2015-01-22 17:28:35 +08:00
minggo 954f372775 Merge pull request #10156 from vovkasm/fix-warnings 
Fix warnings
 2015-01-21 20:23:00 +08:00
Vladimir Timofeev 4e25ffbc7f Fix "field 'XXX' will be initialized after 'YYY'" warning in Xcode by reorder initialization sentences. 2015-01-21 12:59:53 +03:00
minggo 335f69d95d Merge pull request #10110 from super626/v3 
Fix Animate3D speed bug and add parameter to Ray::intersects
 2015-01-21 14:11:11 +08:00
lvlong 7934d36e24 modify function description. 2015-01-20 10:46:00 +08:00
tangziwen 25cd1f4c02 update test 2015-01-20 10:34:30 +08:00
lvlong fc0c4bae7a modify by colleague for cocostudio. 2015-01-16 13:23:03 +08:00
Nite Luo 4a440e66c9 Refactor draw command 2015-01-15 14:00:49 -08:00
tangziwen 130c18bde0 fix LOD indices capacity,refactor the code ,add some comments 2015-01-15 15:54:12 +08:00