Commit Graph

3 Commits

Author SHA1 Message Date
songchengjiang 88012cf86b Merge branch 'v3_new' into v3
Conflicts:
	tests/lua-tests/src/Sprite3DTest/Sprite3DTest.lua
2014-10-09 15:49:50 +08:00
yangxiao c087f31e94 modify return type of getDirection and getDirectionInWorld 2014-10-09 10:12:52 +08:00
yangxiao dbf564208b move light from 3d to base 2014-09-28 16:02:12 +08:00