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

77 Commits

Author SHA1 Message Date
mogemimi 10418676ca Remove duplicate header includes in cocos2d.h 2016-06-13 19:11:05 +09:00
minggo 103bdb3d37 fix conflict 2016-05-27 14:22:03 +08:00
minggo 072592d6e3 update version 2016-05-26 10:18:45 +08:00
minggo a5602cc732 merge v3.11 back to v3 2016-05-04 16:02:23 +08:00
zilongshanren 482788c933 Add tizen support (#15518) 
* add Tizen Support

* fix linter error

* fix tizen audio engine lua bindings config
 2016-04-28 09:49:55 +08:00
xpol 1e70fb5eb5 Remove include of cocos2d.h (#15435) 2016-04-18 15:09:21 +08:00
lunhao.guo b2e5e480fe update cocos2d-x's version to 3.11 2016-01-29 14:49:05 +08:00
XiaoFeng 4815ec8b9a Update version number to v3.10 2015-12-14 10:32:29 +08:00
肖峰 2d97647177 update framework number 2015-11-18 10:55:10 +08:00
WenhaiLin a17a702cd1 Refine components to improve performance 2015-09-18 14:34:02 +08:00
yangxiao 572ee3adb2 merge cocos 2015-09-17 14:24:01 +08:00
minggo 8326ed6535 add physics component 2015-09-08 09:54:01 +08:00
pandamicro 2739be06bb Update COCOS2D_VERSION 2015-09-07 11:45:04 +08:00
yangxiao 5cabc592e0 add motionstreak3d to cocos2d header 2015-09-01 11:34:35 +08:00
yangxiao 7dcc3dd982 Move CCTextureCube From 3d to renderer to solve compilation issue 2015-08-24 14:01:50 +08:00
pandamicro 350182c1aa Refactor BackGround to Background 2015-08-21 10:43:59 +08:00
yangxiao 3e2001bdb1 Add CCCameraBackgroundBrush 
including Color, Depth, SkyBox brushes

Squashed from https://github.com/cocos2d/cocos2d-x/pull/13490
 2015-08-21 10:43:59 +08:00
Jacky 29c108bdef Merge remote-tracking branch 'origin' into fix_spritepolygon2 
# Conflicts:
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-06-12 16:28:41 +08:00
Huabing.Xu 3e331128c6 file rename CCFrameBufferObject->CCFrameBuffer 2015-06-09 15:32:12 +08:00
WuHao a67e570ef7 deleted more leftover comments, placed polygon test further down the tests 2015-06-08 15:40:18 +08:00
Huabing.Xu b5e76c7521 Merge branch 'v3_origin' into v3FrameBufferObject 2015-05-29 15:59:38 +08:00
子龙山人 039c0036be Merge pull request #12072 from iris-wy/v3 
Add enhance service  API
 2015-05-29 15:32:06 +08:00
iris-wy bbfc33dfd2 format 
format
 2015-05-28 11:03:49 +08:00
Huabing.Xu f96e704f7d Merge branch 'v3' into v3FrameBufferObject 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/cocos2d.h
	cocos/renderer/CCGLProgramCache.cpp
 2015-05-18 13:48:50 +08:00
iris-wy 68ec7c8ca1 Add enhance service API 
Add enhance service  API
 2015-05-15 14:29:22 +08:00
joshuastray 4699b0cfb5 fix script binding code generation 2015-05-13 17:51:30 +08:00
Huabing.Xu 42514ee62f FrameBufferObject works 2015-05-13 14:24:53 +08:00
Ricardo Quesada d23ff0ea2c Adds support of VertexAttribBinding per Pass 2015-05-12 19:58:09 -07:00
Ricardo Quesada 1937431596 Material uses new file format 
The new file format is easier to read and less error prone
It also fixes many bugs and adds new test cases
 2015-05-11 21:31:33 -07:00
Dale Stammen 351a898a70 removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
Ricardo Quesada fe59b093b5 adds love to header files 2015-05-05 21:48:05 -07:00
minggo 295b6d7044 [ci skip] update version 2015-04-07 10:35:49 +08:00
yangxiao 827231f5c9 add to cocos2d 2015-04-02 14:29:02 +08:00
yangxiao 000e34c6d0 merge cocos 2015-03-26 12:50:18 +08:00
zhukaixy 52280e6376 add 3d test case(skybox and texture cube) for lua project 2015-03-20 17:53:05 +08:00
minggo 39d2f0629c [ci skip] update version 2015-02-26 10:40:30 +08:00
minggo 0709d9f2e9 [ci skip]update version 2015-01-13 16:35:45 +08:00
lvlong 4d1ca0966c lua binding 2014-12-24 15:09:26 +08:00
Dhilan007 a5f838496c Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d 2014-10-20 16:25:24 +08:00
minggo 8eed0811fa Merge pull request #8717 from MSOpenTech/wp8-dll 
New version of WP8 for cocos2d-x v3.3
 2014-10-16 09:33:43 +08:00
SunLightJuly f2286eaf94 added ClippingRectangleNode 2014-10-15 13:38:14 +08:00
Dale Stammen d3aa4c0475 updated winrt included 2014-10-14 14:22:41 -07:00
SunLightJuly a36dbf5362 ClippingRegionNode --> ClippingRectangleNode 2014-10-11 11:49:01 +08:00
SunLightJuly e0b9878e58 added ClippingRegionNode 2014-09-29 15:07:05 +08:00
yangxiao dbf564208b move light from 3d to base 2014-09-28 16:02:12 +08:00
yangxiao 02489ecad6 add light to cocos2d.h 2014-09-25 22:18:50 +08:00
yangxiao a980a2efa4 merge cocos 2014-09-10 10:28:59 +08:00
Ricardo Quesada 4d57e991ea Compiles in Win32 2014-09-09 18:07:24 -07:00
Ricardo Quesada 6f3ca63f00 Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
Ricardo Quesada 9082ca18c3 Platform fixed 2014-09-09 16:50:02 -07:00