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

508 Commits

Author SHA1 Message Date
Nite Luo 4a440e66c9 Refactor draw command 2015-01-15 14:00:49 -08:00
Nite Luo 15660926d9 Fix Sprite3D not cascading 3D flag 2015-01-14 16:23:35 -08:00
yangxiao 42c40d895f enable disable culling using macro 2015-01-14 14:41:10 +08:00
Nite Luo 4335328e3d Add support for creating empty sprite3D 2015-01-13 16:41:24 -08:00
Nite Luo 45562f3203 optimize based on review commends 2015-01-12 22:52:20 -08:00
Nite Luo 1c10ae43bc Merge branch 'v3' into renderFix 
Conflicts:
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
 2015-01-12 20:43:55 -08:00
Nite Luo a84f521e64 Clean up the debug functions in Billboard 2015-01-12 20:17:00 -08:00
Nite Luo 8591609128 Implement 3D drawing support for Sprite, Label, Particle, BatchNode 2015-01-12 20:06:50 -08:00
Nite Luo fee8bc1b28 Remove Transparent Queue, Move transform calculation of Billboard to visit 2015-01-12 18:17:47 -08:00
Nite Luo 7741daf091 Billboard Render correctly 2015-01-11 22:20:41 -08:00
Nite Luo 6dfc021c02 Merge renderqueue to one 2015-01-09 14:06:21 -08:00
lvlong f9b0c9bc92 fix bug. 2015-01-07 11:09:09 +08:00
yangxiao d23eb83ba1 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-12-31 11:40:37 +08:00
yangxiao 0963b3d86e add comment 2014-12-29 10:51:16 +08:00
XiaoYang 8b95c591b1 Merge pull request #189 from songchengjiang/v3 
read AABB from file(v0.6+)
 2014-12-26 16:15:56 +07:00
yangxiao afb01dcd9a config linux 2014-12-26 16:19:02 +08:00
lvlong f592671df6 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into frustum 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
 2014-12-26 13:42:13 +08:00
yangxiao 64ff6bb51c modify msg word 2014-12-25 17:42:58 +08:00
yangxiao d9d5e1a5cb add release note 2014-12-25 17:40:26 +08:00
lvlong a4a108f766 fix lua binding again!! 2014-12-25 14:04:41 +08:00
minggo 4cac8e2cb4 Merge pull request #9595 from super626/v3 
Do not try to load empty texture
 2014-12-24 10:31:44 +08:00
songchengjiang ceb834b8d4 read AABB from file(v0.6+) 2014-12-24 10:12:31 +08:00
yangxiao 908b9e470d do not try to load empty texture 2014-12-23 15:52:45 +08:00
lvlong 026f0a8b25 modify code format. 2014-12-23 09:57:46 +08:00
lvlong db9f4a23fe feedback commit. 2014-12-22 18:13:07 +08:00
yangxiao 1ba826ea17 modify code style 2014-12-22 17:40:02 +08:00
lvlong 2058742e4a Merge branch 'frustum' of github.com:super626/cocos2d-x into frustum 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/CCCamera.cpp
	cocos/2d/CCCamera.h
	cocos/3d/CCFrustum.cpp
	cocos/3d/CCFrustum.h
	cocos/3d/CCPlane.cpp
	cocos/3d/CCPlane.h
	cocos/3d/CCRay.cpp
	cocos/3d/CCRay.h
	cocos/3d/CCSprite3D.cpp
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
 2014-12-22 17:37:00 +08:00
lvlong 63ebf20026 modify code format. 2014-12-22 15:51:10 +08:00
lvlong 7291e6e94a modify about feedback. 2014-12-22 15:23:41 +08:00
songchengjiang f5f95c5693 fix errors on Windows 2014-12-19 11:30:51 +08:00
lvlong 13cae3c480 deal tab 2014-12-19 10:25:59 +08:00
yangxiao d1a35fe47a make bundle thread safe 2014-12-19 10:21:30 +08:00
yangxiao c788a1892d make it thread safe 2014-12-19 10:20:44 +08:00
yangxiao 37f4d67a49 make it thread safe 2014-12-19 10:20:37 +08:00
yangxiao 549ec2adab make bundle thread safe 2014-12-19 09:48:20 +08:00
lvlong f6bea9b6bb 1.add camera culling. 
2.add camera culling sample.
3.fix bug: load .obj file material.
 2014-12-18 17:18:22 +08:00
lvlong 73a2a6385a add frustum culling. 2014-12-16 16:34:35 +08:00
yangxiao 5ad408530c merge cocos 2014-12-15 17:47:05 +08:00
XiaoYang a59d4ab2a3 Merge pull request #171 from tangziwen/v3 
let billboard can rotate in the Z axis
 2014-12-08 09:34:58 +07:00
yangxiao a1ec27d0b1 calculate aabb if not exist 2014-12-08 10:30:06 +08:00
yangxiao 2a445ef1d9 correct unsuitable word 2014-12-05 16:44:49 +08:00
yangxiao 11d9f27c00 createAsync comment 2014-12-05 16:11:14 +08:00
yangxiao 3439b7f68d refactor async load callback funtion 2014-12-05 15:48:46 +08:00
yangxiao c99185b755 add async load test 2014-12-05 15:01:30 +08:00
yangxiao bc57e47ddb add async task callback dipatcher, call it in the main thread 2014-12-04 18:31:10 +08:00
tangziwen 8605595a5b let billboard can rotate in the Z axis 2014-12-04 15:19:41 +08:00
yangxiao f17df4b0bc add createAsync 2014-12-03 17:40:27 +08:00
minggo f13f649a7b Merge pull request #9306 from super626/v3 
refactor bundle
 2014-12-03 14:04:59 +08:00
lvlong 82241a74dd fix bug: if the material's content that version 0.1 is empty. 2014-11-27 17:31:22 +08:00
Ricardo Quesada 33a2d0451c Code conforms with the cocos2d-x c++ guidelines 2014-11-25 17:53:52 -08:00