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

177 Commits

Author SHA1 Message Date
samuele3hu 037c17fe5d Remove vs2012 support in v3 2015-05-05 16:11:26 +08:00
samuele3hu bd5ca083e9 Fix the compile error of SpritePolygonTest on the win32 and wp8.1 2015-04-26 23:08:14 +08:00
samuele3hu 7c77bc9587 Add the PolySprite support and adjust the project setting on the different platform 2015-04-23 00:51:47 +08:00
andyque 484153aff7 remove ui shaders in windows platform 2015-04-20 17:54:49 +08:00
minggo e9cdf333f9 Merge pull request #11246 from xiaofeng11/v3 
V3 reader fix
 2015-04-08 11:46:40 +08:00
tangziwen 0193420dfc Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain 
Resovle Conflicts:
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-04-03 15:45:51 +08:00
pipu 41661830ff Remove CCNodeReader.h/.cpp. 2015-04-01 13:37:36 +08:00
pipu bc7d8f0a09 Add method destroyCocosStudio() for CocoStudio 2015-03-31 19:55:56 +08:00
yangxiao b469cfa928 merge cocos 2015-03-30 10:28:14 +08:00
yangxiao 84535feb0c merge cocos 2015-03-26 11:59:26 +08:00
pipu c72c8e865d To reconstruct object extension data. 2015-03-12 15:47:15 +08:00
songchengjiang 444dbfdf9e replace .mesh with .c3b 
modify ParticleUniverse file structure
 2015-03-05 14:54:32 +08:00
yangxiao 3db3d9ae11 merge cocos 2015-03-03 17:23:33 +08:00
songchengjiang 5c460ebb2d add/update particle files 2015-03-02 13:07:32 +08:00
Ray 83a7b8012c 3DParticle Reader and tests 2015-02-26 09:19:14 +08:00
Ray c66a4f28bc Add CocosStudio UserCameraReader 
fix Sprite3DReader Test
 2015-02-25 14:19:08 +08:00
Ray fbe9e5b767 complate project file 2015-02-23 00:52:50 +08:00
Ray 8eb201797d 工程文件修改 2015-02-19 17:52:50 +08:00
minggo c8eaa4aeba Merge pull request #10447 from super626/particle_merge 
add 3d particle (Particle Universe)
 2015-02-15 19:48:18 +08:00
Vladimir Perminov 9f5efe5153 Fix visual studio project out of date 
Remove 3dExport.h from project.
Change location CCPlatformConfig.h and CCPlatformMacros.h from ..\base\
to ..\platform\
 2015-02-13 11:18:14 +03:00
kompjoefriek a2ef1abef3 Fixed unwanted changes 2015-02-12 23:07:24 +01:00
zhukaixy acc0476f01 Solve compile errors on win32 platform 2015-02-12 19:36:03 +08:00
yangxiao 79a0c0152a add 3d particle (Particle Universe) 2015-02-11 18:14:22 +08:00
Vladimir Perminov bb2d2c9a07 Fix visual studio project out of date 
Remove 3dExport.h from project.
Change location CCPlatformConfig.h and CCPlatformMacros.h from ..\base\
to ..\platform\
 2015-01-30 17:37:19 +03:00
zhukaixy f3536056d8 Simpilify skybox 2015-01-29 19:01:10 +08:00
zhukaixy ee99700ec1 add test case TextureCube 2015-01-29 09:28:14 +08:00
tangziwen 25cd1f4c02 update test 2015-01-20 10:34:30 +08:00
WenhaiLin 2847a940ed Update project 2015-01-06 14:40:15 +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
andyque 29e9ef7edf Merge branch 'v3' into modifyWidgetDefaultBehavior 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
	cocos/2d/libcocos2d_wp8.vcxproj.filters
 2014-12-25 18:08:07 +08:00
youyou f678d1027c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
 2014-12-25 12:09:31 +08:00
lvlonggame 805b248af3 modify win-project 2014-12-24 15:06:58 +08:00
kaile.yin 942abfc654 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-12-24 10:53:09 +08:00
yusheng.lu d543f8f6a2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader 2014-12-23 16:12:50 +08:00
andyque d8f726bc4f modify widget default behavior 2014-12-23 15:03:31 +08:00
yangxiao 3d77c7535d merge cocos 2014-12-23 10:35:35 +08:00
yusheng.lu 02b9269cff completed multiplatform projects 2014-12-22 19:39:10 +08:00
yusheng.lu b0bfc2906a change armature codes files path 2014-12-22 18:26:50 +08:00
yusheng.lu 62c5df2d9d armature node reader done (projs incompleted) 2014-12-22 17:35:39 +08:00
kaile.yin b924dafe83 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
 2014-12-22 11:14:31 +08:00
WenhaiLin 4366fb7230 Fix compile error on WIN32. 2014-12-19 11:49:40 +08:00
songchengjiang f5f95c5693 fix errors on Windows 2014-12-19 11:30:51 +08:00
kaile.yin 9f9c4782f1 change file name 2014-12-04 18:51:32 +08:00
kaile.yin a6653c7d8d change name 2014-12-04 18:50:00 +08:00
kaile.yin 743166f50b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
 2014-12-04 15:32:25 +08:00
zhounan 7ffc6f9784 Modify that cocos/2d/libcocos2d.vcxproj, cocos/2d/libcocos2d.vcxproj.filters 2014-12-01 13:18:57 +08:00
zhangcheng 0c89db7675 Add WidgetCallbackHandlerProtocol.h, WidgetCallbackHandlerProtocol.cpp 2014-11-27 18:32:35 +08:00
zhangcheng 32ce3dca2e 1, Update windows project. 2014-11-21 18:12:46 +08:00
kaile.yin bbd971d910 create ActionTimelineNode 2014-11-17 21:05:20 +08:00
Dhilan007 a5f838496c Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d 2014-10-20 16:25:24 +08:00
Dhilan007 4586954e0a fixed miss sqlite3 for release build on window. 2014-10-17 11:39:06 +08:00
andyque f3f15c58fe remove UIWebView.cpp in win32 2014-10-16 16:46:49 +08:00
samuele3hu d997f72be2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager 
nter
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-10-16 10:59:58 +08:00
samuele3hu 064e159c70 Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/platform/CCFileUtils.cpp
	tests/lua-tests/project/CMakeLists.txt
	tests/lua-tests/project/Classes/AppDelegate.cpp
	tests/lua-tests/project/proj.android/jni/Android.mk
	tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
 2014-10-15 13:41:27 +08:00
SunLightJuly f2286eaf94 added ClippingRectangleNode 2014-10-15 13:38:14 +08:00
pipu 72f5808678 Modifying libcocos2d.vcxproj,libcocos2d.vcxproj.filters 2014-10-13 14:48:10 +08:00
pipu 779e73dad0 1. change config.h in win32. 2014-10-12 15:27:41 +08:00
pipu 10e390557e Modifying libcocos2d.vcxproj,libcocos2d.vcxproj.filters 2014-10-12 15:07:37 +08:00
pipu 583a756d33 Reverting build/cocos2d-win32.vc2012.sln 
Reverting cocos/2d/libcocos2d.vcxproj
 2014-10-11 14:13:56 +08:00
SunLightJuly a36dbf5362 ClippingRegionNode --> ClippingRectangleNode 2014-10-11 11:49:01 +08:00
pipu b732ce378e Merge branch 'v3_pipu_protocol_buffers' into merge_test 
Conflicts:
	cocos/ui/UIScale9Sprite.cpp
 2014-10-11 11:08:46 +08:00
pipu efe22a0dd7 Modifying protocol buffers for win32 version 2014-10-10 21:55:59 +08:00
SunLightJuly ba064167a8 modified project files and make files 2014-10-10 18:43:40 +08:00
pandamicro a26e91f839 no message 2014-10-09 18:30:39 +08:00
SunLightJuly 1062dec335 modified project files and make files 2014-10-08 18:44:58 +08:00
Dhilan007 02fcb6488a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/proj.win32/cpp-tests.vcxproj
 2014-09-30 14:19:27 +08:00
yangxiao d680e58f80 merge cocos resolve conflict 2014-09-30 08:32:37 +08:00
Dhilan007 f2f1331026 New Audio Engine[Win32] 2014-09-29 10:15:41 +08:00
Dhilan007 d52144d1e0 fix linker errors on WIN32 2014-09-28 21:45:09 +08:00
songchengjiang 39deb73c3a move light from 3d to base(Windows) 2014-09-28 17:23:25 +08:00
yangxiao 98d9cea774 merge cocos 2014-09-26 15:14:57 +08:00
yangxiao 56313aa895 merge cocos 2014-09-25 11:05:02 +08:00
andyque 3c434ec354 remove Win32InputBox.cpp/.h, move them to UIEditBoxImpl-win32.cpp 2014-09-24 17:47:38 +08:00
Jeff 2ffbe23c50 The files name: modify underline to hyphen 2014-09-19 10:24:17 +08:00
Jeff e4e2cea97a link error 2014-09-18 19:59:22 +08:00
Jeff 476ede6ccb link error 2014-09-18 19:56:53 +08:00
songchengjiang 3c67515378 Finished light reconstruction 2014-09-18 16:38:35 +08:00
Jeff 1dffbd0a7b fix link errors 2014-09-18 01:52:08 +08:00
yangxiao 584284c847 merge cocos and rename lighttest 2014-09-17 14:26:57 +08:00
yangxiao 3cfc36591c merge cocos 2014-09-11 10:13:57 +08:00
yangxiao bb6f5a6be5 Merge branch 'newcode' into billboard 2014-09-10 16:27:59 +08:00
yangxiao a980a2efa4 merge cocos 2014-09-10 10:28:59 +08:00
andyque acae8a2535 Merge branch 'v3' into addChipmunkStaticLib 
Conflicts:
	CMakeLists.txt
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/cocos2d_wp8.vcxproj.filters
	cocos/CMakeLists.txt
 2014-09-10 10:00:15 +08:00
Ricardo Quesada 4d57e991ea Compiles in Win32 2014-09-09 18:07:24 -07:00
andyque 6a4397a3eb change toolset from 12.0 to 4.0 2014-09-09 15:57:21 +08:00
andyque 08c7f32627 add chipmunk static library for win32 2014-09-05 15:38:12 +08:00
yangxiao 8da7a4b2de merge cocos reslove conflict 2014-09-04 17:40:14 +08:00
minggo 43e2b39bc0 Merge pull request #7921 from dabingnn/v3_trianglesCommand 
V3 triangles command
 2014-09-04 13:58:50 +08:00
minggo 6539ff293d Merge pull request #7940 from andyque/fixVs2013CompileError 
Fix vs2013 compile error
 2014-09-04 13:41:15 +08:00
Huabing.Xu 4ae2d6fc90 Merge branch 'v3' into v3_trianglesCommand 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-09-04 11:27:12 +08:00
andyque 87af0ecdd6 add back libbox2d and libspine project to our solution 2014-09-03 17:37:34 +08:00
yangxiao bb90fe48ef merge cocos 2014-09-03 16:54:17 +08:00
andyque 2e27a6865f update project to vs2013 2014-09-03 14:10:38 +08:00
minggo eee9ac626a Merge pull request #7815 from andyque/mergeExtensionEditBox 
merge extension EditBox to ui module
 2014-09-03 11:25:10 +08:00
andyque dafbf28283 fix release mode compile error 2014-09-02 16:42:23 +08:00
andyque fadfa87afd fix vs2013 compile error 2014-09-02 16:42:04 +08:00
andyque 6dc45f86e4 fix windows compile error 2014-09-02 10:05:22 +08:00
Huabing.Xu 6824453804 windows work for trianglesCommand 2014-09-01 15:08:09 +08:00
songchengjiang 701d70fb6c Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-08-29 10:58:04 +08:00
yangxiao 74f98b36d6 merge cocos 2014-08-28 09:22:57 +08:00