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

351 Commits

Author SHA1 Message Date
Nite Luo a98714f6a5 support device without VAO 2013-12-04 17:02:02 -08:00
Nite Luo 792cb5a716 Merge branch 'develop' into newRenderer 2013-12-04 15:23:12 -08:00
Nite Luo 143df8af7d Fix RenderTexture after merging commandpool 2013-12-04 15:13:13 -08:00
darkdukey 4b7d0c290a Merge pull request #4 from dabingnn/newRendererCommandPool 
New renderer command pool
 2013-12-04 15:08:17 -08:00
Nite Luo f423166471 Fix bugs with RenderTexture with NewRender 2013-12-04 15:06:28 -08:00
Nite Luo ae551ae294 Convert RenderTexture to use RenderCommands 2013-12-04 11:54:57 -08:00
minggo 92b180080c Merge pull request #4409 from mlepage/develop 
[ci skip]Fix typos
 2013-12-03 19:13:23 -08:00
Huabing.Xu cd562676f5 use block allocation for commands 2013-12-04 10:39:34 +08:00
boyu0 fd68dc4f9f issue #2771: add condition test to updatePhysicsTransform 2013-12-03 16:28:18 +08:00
Huabing.Xu 757f1abc7f 1. protected render command construction/destruction function. 
2. use renderCommandPool<T> to allocate and deallocate command
3. use releaseToCommandPool interface to push command back to pool
 2013-12-03 14:08:47 +08:00
Huabing.Xu 44f12ce8e4 add RenderCommandPool head file 2013-12-03 11:52:51 +08:00
Huabing.Xu d4b9e0538b refactor: group command use a non parameter constructor and a reentrant init function 2013-12-03 11:24:03 +08:00
Huabing.Xu d33f05b3f0 refactor: custom command use a non parameter constructor and a reentrant init function 2013-12-03 11:17:21 +08:00
Huabing.Xu ace75eebce refactor: quad command use a non parameter constructor and a reentrant init function 2013-12-03 11:11:46 +08:00
Nite Luo 6862d59bb2 Add NewRenderTexture to convert RenderTexture to use new renderer 2013-12-02 17:23:52 -08:00
Nite Luo 8801f508eb Partcle system use the new renderer 2013-12-02 12:13:05 -08:00
Nite Luo fbadb3329a Merge branch 'develop' into newRenderer 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2013-12-02 10:55:31 -08:00
James Chen 9618eb00be Merge pull request #4411 from martell/cmake 
closed #3328: cmake support for windows
 2013-12-02 01:22:57 -08:00
martell 06ff1bc594 Fixed HelloCpp Linking on Linux 2013-12-02 07:10:37 +00:00
minggo d2f235f8b8 Merge pull request #4408 from boyu0/iss2345_add_tga_support_to_CCImage 
[ci skip]issue #2345: add tga support to Image
 2013-12-01 18:18:42 -08:00
minggo 24f7819e99 Merge pull request #4362 from xhcnb/hotfix_android_setAccelerometerInterval 
[ci skip]Fix: on android, Device::setAccelerometerInterval will causes dead loop
 2013-12-01 18:08:58 -08:00
martell f369606d77 fix cocos2d-x for vs2013 2013-11-30 08:05:39 +00:00
martell 79401a7596 quickly added win32 cmake 2013-11-30 06:09:12 +00:00
Marc Lepage 940b0ffd56 Fix typos 2013-11-29 12:09:38 -05:00
Jason Xu 266e4e1654 rename to with Jni suffex 2013-11-29 19:34:36 +08:00
Jason Xu 27c3a459ed rename android native function names. 2013-11-29 17:17:15 +08:00
boyu0 83f855e2ec issue #2345: delete unnecessary include 2013-11-29 15:31:58 +08:00
boyu0 04c3d95005 issue #2345: namespace cocos2d { -> NS_CC_BEGIN 2013-11-29 15:25:21 +08:00
boyu0 dffc12e648 issue #2345: new/delete -> malloc/free 2013-11-29 15:13:16 +08:00
boyu0 86074c23d8 issue #2345: class Image add tga image format support. 2013-11-29 14:31:42 +08:00
minggo 3268da3a4d Merge pull request #4401 from minggo/thread-helper 
[ci skip]add helper funcion to invoke a function in gl thread
 2013-11-27 22:26:11 -08:00
Nite Luo 83972ecf57 Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer 2013-11-27 10:16:34 -08:00
Nite Luo 75381ebc51 Merge branch 'develop' into newRenderer 2013-11-27 10:16:17 -08:00
boyu0 72f2d68edd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-27 17:47:37 +08:00
minggo eded94ef76 don't create a pool, since it doesn't invoke any iOS dependent codes 2013-11-27 17:43:54 +08:00
boyu0 2b43e72e7c issue #2771: fix vs compile errors, change project setting 2013-11-27 17:33:33 +08:00
minggo bcb131262c add helper funcion to invoke a function in gl thread 2013-11-27 16:49:07 +08:00
Huabing.Xu ea46e1c658 change test case 2013-11-27 14:30:38 +08:00
Huabing.Xu 3da196ea43 add Frustum culling to new Sprite 2013-11-27 10:35:12 +08:00
Huabing.Xu 80da1dac3f add Frustum, AABB, ViewTransform 2013-11-27 10:34:30 +08:00
James Chen 6c097fa692 Merge pull request #4389 from minggo/remove-unneeded-codes 
override addChild in Sprite to fix error in binding generator
 2013-11-26 18:14:20 -08:00
minggo 0ac9022201 fix a typo 2013-11-27 10:02:32 +08:00
minggo 85002285c2 override addChild in Sprite to fix error in binding generator 2013-11-27 09:50:47 +08:00
Nite Luo 3123c70153 Sprite are now using NewRenderer 2013-11-26 17:13:04 -08:00
Nite Luo bf53cc116b use updateQuadVertices function to update vertices since update transform is highly customized for BatchNode 2013-11-26 17:01:32 -08:00
Ricardo Quesada b7f7b0dae4 Reports wether the build is DEBUG or RELEASE 
Reports wether the build is DEBUG or RELEASE in Configuration
 2013-11-26 14:36:31 -08:00
Nite Luo 92b57c79ba Merge branch 'develop' into newRenderer 
Conflicts:
	cocos/2d/CCClippingNode.h
	cocos/2d/CCLayer.h
 2013-11-26 11:56:03 -08:00
Nite Luo 61ca4f0137 Fix a bug with NewSprite Update Quad 2013-11-26 11:48:37 -08:00
boyu0 8346fe4b4d issue #2771: edit android.mk, CMakeLists.txt, change PHYSICS_CONTACT_POINT_MAX to PhysicsContactData:POINT_MAX 2013-11-26 18:22:52 +08:00
minggo fcf43823b4 remove unneeded codes 2013-11-26 17:53:34 +08:00