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

28 Commits

Author SHA1 Message Date
leeda 18a6d8241d update Copyright. might need manual fix later (#18659) 
* Copyright use python script updated. might be fix by manual later

* Revert "Copyright use python script updated. might be fix by manual later"

This reverts commit 49e99418e4da1fd02afda448ddeb16210f5e8c71.

* re modify copyright, consider utf-8-sig encoding

* another situation, add Copyright before  "Permission is hereby granted"

* Revert "another situation, add Copyright before  "Permission is hereby granted""

This reverts commit ee82591d32353c7ce2e146fe51ef447433b47571.

* another situation, add Copyright before Permission is hereby granted

* change "Copyright (c) 2016-2016 Chukong Technologies Inc." to " Copyright (c) 2016 Chukong Technologies Inc."

* script modify copyright, consider is cocos copyright or not

* change "Copyright (c) 2017 Chukong Technologies Inc." to "Copyright (c) 2016 Chukong Technologies Inc."

* manual fix, not fix audio related

* change "2016-2016" to "2016"
 2018-01-29 16:25:32 +08:00
yangxiao 0de2a3b33d add terrain test with light map 2015-08-03 14:02:46 +08:00
WenhaiLin 1494f09f06 Remove unneeded include files and fixed warns. 2015-06-25 23:15:39 +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
Dale Stammen 2a71407501 fixed double to float conversion compiler warning 2015-05-28 15:00:49 -07:00
Vincent Yang 8105e9c714 Fix bug: terrain can't move to other position except origin point. 2015-05-26 17:51:26 +08:00
songchengjiang f25c02f230 fix bugs of terrain 2015-05-11 12:02:32 +08:00
Ricardo Quesada 510d502631 Merge remote-tracking branch 'cocos2d/v3' into xcode_6_3_tests_compiles 2015-04-08 21:59:22 -07:00
Ricardo Quesada 23b0d4d2f6 more fixes with the namespaces 2015-04-08 21:23:47 -07:00
tangziwen 0649f9709c remove unnecessary reload in terrain test 2015-04-09 10:20:06 +08:00
tangziwen 58a9e43c9c update terrain test 2015-04-09 09:39:27 +08:00
Ricardo Quesada 51374eb822 tests compiles on xcode 6.3 
no more USING_NS in the header files.
it creates conflict with xcode 6.3
 2015-04-08 17:37:30 -07:00
tangziwen 0c2c8b072a terrain update terrain test update ,resource update 2015-04-08 15:13:24 +08:00
tangziwen 176f7dd879 slightly modified the camera's default position & terrain's Lod distance in the terrain test 2015-04-07 11:50:09 +08:00
tangziwen 14b94a6aac Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain 
Resolve Conflicts:
	tests/cpp-tests/Classes/controller.cpp
 2015-04-03 17:50:08 +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
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 3a3e1e9ad1 update terrain test 2015-03-27 10:47:52 +08:00
yangxiao 19edeb971b fix warning 2015-02-03 17:51:16 +08:00
yangxiao 3b4f35decd Merge branch 'terrain' of https://github.com/super626/cocos2d-x into terrain 2015-02-03 17:39:02 +08:00
yangxiao 66da4e8096 mac work 2015-02-03 17:38:40 +08:00
tangziwen ca018f9ff2 set appropriate LOD distance value 2015-02-03 17:35:52 +08:00
tangziwen b0f7c232e2 fix test 2015-02-02 16:14:13 +08:00
tangziwen 10eced8b98 bug fix upload new sample texture 2015-01-30 15:46:39 +08:00
tangziwen 9ec366a130 update terrain test add new method to get normal 2015-01-27 15:18:59 +08:00
tangziwen d04b3feb50 add new test, fix memory leak 2015-01-23 18:09:54 +08:00