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

49 Commits

Author SHA1 Message Date
mogemimi df24911a23 Fix minor typos in naming (#17280) 2017-02-06 15:13:20 +08:00
mogemimi bebd11f853 Correct spelling of "intersect" (#17194) 2017-01-16 11:20:07 +08:00
effolkronium f5a90765fc fix type conversion warnings (#17061) 
* Fix conversion warning

from unsigned int to float

* Fix type conversion warning

* Fix type conversion warning

* change the return type of getOutlineSize to float

* fix typo
 2017-01-04 12:01:07 +08:00
mogemimi 63b3043dc0 Remove extra semicolon after member function definition (#16595) 2016-09-20 14:43:48 +08:00
mogemimi 2443e09d29 Fix typos and other mistakes in docs 2016-07-04 00:42:10 +09:00
mogemimi 948f64631f Use const references whenever possible 2016-05-17 13:17:56 +09:00
mogemimi f280a31323 Fix typo in documentation and comments 2015-12-09 01:48:24 +09:00
xiaofeng11 18666a9b41 Merge pull request #14393 from xiaofeng11/v3_combine_3d 
Combine Studio change for 3d components
 2015-12-02 09:47:12 +08:00
XiaoFeng eb644ee79f Combine Studio change for 3d components 2015-11-16 15:05:43 +08:00
yangxiao 39a6f1e8f1 char* to string 2015-11-12 18:08:29 +08:00
Martin Taylor e592a1a02d fix typos 2015-09-09 11:37:41 +08:00
yangxiao fc4c25c51e add comment 2015-08-03 13:30:30 +08:00
yangxiao 8a6c49b5a3 merge cocos 2015-08-03 09:54:29 +08:00
jianglong0156 dcda083efa rename the initTerrain to initWithTerrainData 2015-07-31 18:35:47 +08:00
jianglong0156 4439b02a84 rename the init function name 2015-07-31 15:21:54 +08:00
jianglong0156 b016b642ce add Terrain support constructor 2015-07-30 17:17:57 +08:00
tangziwen cee43ccebb update terrain again 2015-07-29 14:32:36 +08:00
tangziwen e4cf89e1c4 terrain update: can set Light direction manually, set light map, fix a bug which height map is not exist cause crash when destructing. 2015-07-29 13:24:12 +08:00
yangxiao 7546bfe9af make getChunkByIndex protected 2015-06-24 10:56:46 +08:00
tangziwen f71ca4f179 Using ray-triangle intersect test instead of the newton method 2015-06-23 14:27:19 +08:00
tangziwen 1989de7a04 fix terraintest and Terrain::getInstersectionPoint() 2015-06-18 12:20:44 +08:00
子龙山人 c5ba7eef8b Merge pull request #12019 from super626/v3 
getIntersectionPoint failed when there is no intersection on the terrain
 2015-06-08 11:26:19 +08:00
yangxiao 2e27bfd6c7 add comment 2015-05-28 12:40:16 +08:00
yangxiao a5976a43f7 code style 2015-05-27 18:19:44 +08:00
tangziwen fb1a7f1e8b fix Terrain::getIntersectionPoint 2015-05-22 09:07:57 +08:00
Ricardo Quesada 5924a917a1 Terrain uses StateBlock 
cleaner code, conforms to new way of setting the state
 2015-05-19 17:18:44 -07:00
Dale Stammen 351a898a70 removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
yangxiao 2391558c96 add physics3d support 2015-05-08 15:49:33 +08:00
tangziwen 2be309d841 add reload method in case of GL context Lost. 2015-04-08 19:11:46 +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
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
yangxiao 9e115073a1 fix warning 2015-04-02 14:04:31 +08:00
tangziwen 6cd1077cb0 update terrain 2015-04-01 18:24:05 +08:00
tangziwen 1a93f87a15 update terrain 2015-03-30 18:25:22 +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
tangziwen 840b531a9a update 2015-03-03 14:14:50 +08:00
yangxiao 66da4e8096 mac work 2015-02-03 17:38:40 +08:00
tangziwen 10eced8b98 bug fix upload new sample texture 2015-01-30 15:46:39 +08:00
tangziwen 89cff149fc add new ray intersection method ,add new Doc to explain the terrain 2015-01-29 18:06:00 +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
tangziwen 25cd1f4c02 update test 2015-01-20 10:34:30 +08:00
tangziwen 130c18bde0 fix LOD indices capacity,refactor the code ,add some comments 2015-01-15 15:54:12 +08:00
tangziwen 201ae6f321 add terrain 2015-01-15 11:45:06 +08:00