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

792 Commits

Author SHA1 Message Date
Dale Stammen 7794314ef1 added missing libcocos2d project file 2014-10-28 21:02:14 -07:00
Dale Stammen 71048fc906 fixed cclight and cccamera file locations 2014-10-23 08:39:36 -07:00
Dale Stammen 93cac681ab removed DirectX namespace 2014-10-23 08:39:06 -07:00
Dale Stammen 82aad4605e added missing Assets folder 2014-10-23 08:38:42 -07:00
Dale Stammen d88a2fb6f1 added windows 8.1 universal app solution 2014-10-23 07:37:25 -07:00
Dhilan007 8993e490e6 Rolling back default build mode of samples to debug on Android 2014-10-21 17:14:47 +08:00
minggo c255ffd6a6 update release note 2014-10-21 11:18:15 +08:00
Dhilan007 47629aec64 Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d 2014-10-20 16:42:00 +08:00
samuele3hu 634d42775e Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning 2014-10-19 17:00:05 +08:00
samuele3hu 30f375ef07 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine 2014-10-17 17:37:18 +08:00
samuele3hu 1d6128443a Update Mac project setting and some lua test cases about UI and ActionTimeline 2014-10-17 17:35:50 +08:00
minggo 31664d979a Merge pull request #8783 from andyque/adjustUITestProject 
fix scrollView rotate issue
 2014-10-17 14:54:32 +08:00
Dhilan007 d997fdc7f7 Default build mode of samples change to release builds 2014-10-17 14:51:34 +08:00
andyque 8161d2ad34 fix scrollView rotate issue 2014-10-17 11:31:00 +08:00
minggo 064f0d9042 Merge pull request #8708 from dabingnn/v3_updateSpine 
V3 update spine
 2014-10-16 17:50:07 +08:00
Huabing.Xu 644aa19b2d Merge branch 'v3' into v3_updateSpine 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-10-16 16:48:16 +08:00
huangshiwu 0a04da0a10 Add Default-667h@2x and Default-737h@3x launch images to support iPhone6 and iPhone6+'s native resolution mode 2014-10-16 15:53:12 +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 3f667fac85 Update the related AssetsManagerEx files and related project configure 2014-10-16 10:28:52 +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
Huabing.Xu 8135b09c98 Merge branch 'v3' into v3_updateSpine 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-10-15 15:55:17 +08:00
minggo 16ad1977b0 Merge pull request #8706 from SunLightJuly/add_ClippingRectangleNode 
Add clipping rectangle node
 2014-10-15 15:09:29 +08:00
samuele3hu 6c79ce50d2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
	tests/lua-tests/src/AssetsManagerTest/AssetsManagerTest.lua
	tests/lua-tests/src/mainMenu.lua
 2014-10-15 15:07:30 +08:00
samuele3hu a0c8ffb943 Modify Xcode project’s configure 2014-10-15 14:32:11 +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
Huabing.Xu 93158a1cfb update spine runtime and test case 2014-10-15 11:23:02 +08:00
samuele3hu 83d210ce7d Update the Xcode project setting for related test cases 2014-10-15 11:18:22 +08:00
Dale Stammen 0cfe930078 added new WP8 solution 2014-10-14 16:39:41 -07:00
Dale Stammen f0117239a6 added updated WP8 shader compiler project files 2014-10-14 16:38:04 -07:00
Dale Stammen fd638f00b7 removed old WP8 project files 2014-10-14 14:09:52 -07:00
samuele3hu 70aa62a365 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-10-15 02:09:12 +08:00
samuele3hu e0c4ff060a Update iOS and Mac project setting 2014-10-15 00:44:44 +08:00
samuele3hu 735e86788e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_adjust 2014-10-14 21:36:44 +08:00
samuele3hu 3b4fbd8fff Update project setting for lua-tests、lua-empty-test and lua-game-controller-test on the different platform and related test codes 2014-10-14 21:34:55 +08:00
pipu 0a7ddd21d1 Reverting android-build.py 2014-10-13 15:41:55 +08:00
pipu 96c8fde63a 1. Modifying UIButton.cpp 
2.  Modifying protocol directory name to "protobuf-lite" for iOS, mac platform
 2014-10-13 12:49:15 +08:00
pipu e7385cd634 Merge branch 'v3_pipu' of https://github.com/pipu/cocos2d-x into v3_pipu 2014-10-12 17:53:07 +08:00
pipu 7d21dcb095 1. fix git error 2014-10-12 17:51:34 +08:00
pipu 9503253a17 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu 2014-10-12 17:44:28 +08:00
pipu 86aee1e548 Modifying cocos2d_lib.xcodeproj, cocos/Android.mk, cocos/editor-support/cocostudio/Android.mk 2014-10-12 15:39:22 +08:00
pipu a6d17d1c1b Remove '-' character 2014-10-11 15:53:09 +08:00
samuele3hu 9b9b9d9700 Fix the lua-tests compile error 2014-10-11 14:14:08 +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
minggo 4d084496a3 Merge pull request #8578 from SunLightJuly/Lua_LoadChunksFromZIP 
added  LuaStack::loadChunksFromZIP()
 2014-10-10 22:14:55 +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
pipu d699b5809b Modifying libprotocolbuf.a as protocolbuffer.a 2014-10-10 12:52:42 +08:00
samuele3hu f97a7ae52d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 2014-10-10 09:52:29 +08:00
samuele3hu 115d81574c Add CameraTest、OBBTest and related lua bindings 2014-10-10 09:49:25 +08:00
pandamicro a26e91f839 no message 2014-10-09 18:30:39 +08:00
pipu 752eb839c7 Add protocolbuf.a 2014-10-09 18:28:09 +08:00
Ricardo Quesada d326db427f removes the `3d_export.h` file 2014-10-08 18:30:23 -07:00
SunLightJuly 763b54e5cb added LuaStack::loadChunksFromZIP() 2014-10-08 17:30:14 +08:00
martell c3172bef50 Finalise Windows cmake support for mingw-w64 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:22:09 +01:00
yangxiao d680e58f80 merge cocos resolve conflict 2014-09-30 08:32:37 +08:00
Ricardo Quesada 7a1dac5aa6 Fixes audio issues when using CMake on Mac 2014-09-29 14:07:11 -03:00
samuele3hu f00187d3bb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 
Conflicts:
	tools/tolua/cocos2dx.ini
 2014-09-29 09:48:35 +08:00
yangxiao dbf564208b move light from 3d to base 2014-09-28 16:02:12 +08:00
yangxiao 98d9cea774 merge cocos 2014-09-26 15:14:57 +08:00
minggo ebf0562b84 remove armv7s support on iOS 2014-09-26 10:35:50 +08:00
yangxiao ca9eb3d203 support ambient light without normal & optimaze code 2014-09-25 18:32:33 +08:00
samuele3hu 38530772ae Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 2014-09-25 15:26:03 +08:00
minggo 2620592d62 Merge pull request #7975 from newnon/v3_openUrl 
openUrl function for all platform but on windows RT empty function
 2014-09-25 13:41:08 +08:00
yangxiao 56313aa895 merge cocos 2014-09-25 11:05:02 +08:00
samuele3hu 2cc48d1f81 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D 2014-09-25 10:40:31 +08:00
minggo fdb30f1ee7 Merge pull request #8115 from Dhilan007/v3-audio903 
New Audio Engine -MAC
 2014-09-24 15:00:53 +08:00
Sergey Perepelitsa d8216149de precompiled headers improvements for iOS & Mac 2014-09-23 23:19:25 +04:00
Sergey b8b5397e4e Tests for Mac/iOS android Linux & Windows 2014-09-22 17:54:49 +04:00
Dhilan007 1651c6ab23 update project 2014-09-22 15:58:50 +08:00
Dhilan007 936c3b3f79 New Audio Engine -MAC 2014-09-22 15:38:12 +08:00
samuele3hu f0608a6d70 Update lua bindings for Mesh and add a Sprite3DHitTest 2014-09-22 15:29:38 +08:00
yangxiao 41caef878b refactor light 2014-09-17 17:59:10 +08:00
yangxiao 584284c847 merge cocos and rename lighttest 2014-09-17 14:26:57 +08:00
Dhilan007 51c19d4b06 update project for lua bindings of AudioEngine 2014-09-14 23:17:39 +08:00
huangshiwu f1f6373b6e fix Cocos2dShaderCompile's compile error --use chipmunk static library 2014-09-12 15:29:10 +08:00
yangxiao 5274b4f958 merge cocos resolve conflict 2014-09-11 16:02:07 +08:00
yangxiao 9901cad113 merge cocos 2014-09-11 15:55:00 +08:00
yangxiao df9ab144fe light work 2014-09-11 15:46:32 +08:00
minggo e0df8114fa Merge pull request #7968 from Dhilan007/v3-audio903 
New Audio Engine[ios/android]
 2014-09-11 15:23:17 +08:00
yangxiao 3cfc36591c merge cocos 2014-09-11 10:13:57 +08:00
Ricardo Quesada e46fa14be9 Fixes Xcode 6 warnings 2014-09-10 12:01:35 -07:00
Dhilan007 336c85e88e update project for audio engine on IOS. 2014-09-10 17:13:51 +08:00
yangxiao bb6f5a6be5 Merge branch 'newcode' into billboard 2014-09-10 16:27:59 +08:00
Dhilan007 fc27c5e32a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-09-10 14:35:33 +08:00
yangxiao a980a2efa4 merge cocos 2014-09-10 10:28:59 +08:00
andyque 182a76a0f5 add chipmunk config for iOS & mac 2014-09-10 10:08:38 +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 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
Ricardo Quesada 0ead7b6307 Squashed commit of the following: 
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 09:34:40 2014 -0700

    Compiles luasocket on Mac

commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 09:12:30 2014 -0700

    disables luasockets

commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Sep 9 08:10:48 2014 -0700

    Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx

    Conflicts:
    	cocos/3d/cocos3d.h

commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 23:21:03 2014 -0700

    compiles on Linux

commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 23:16:46 2014 -0700

    all projecs compiles with CMake

commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 21:47:27 2014 -0700

    CCUserDefualt.mm better includes

commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 21:26:36 2014 -0700

    cpp-tests compiles and works on Mac using CMake

commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 20:12:09 2014 -0700

    Adds missing files to CMakeLists.txt

commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 19:52:34 2014 -0700

    Adds more box2d missing files

commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 19:39:54 2014 -0700

    Adds missing box2d files

commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Sep 8 18:44:15 2014 -0700

    Initial CMake support for Mac
 2014-09-09 12:18:31 -07:00
yangxiao cf9094207a merge cocos 2014-09-09 16:00:55 +08:00
Dhilan007 f2b7bd62d5 update Xcode project for audio engine 2014-09-09 11:41:17 +08:00
Ricardo Quesada 33a4cd396d Adds missing xcshared data for missing projects 2014-09-05 14:32:14 -07:00
andyque 59dc56bfcb remove chipmunk dependency 2014-09-05 21:59:30 +08:00
yangxiao 8da7a4b2de merge cocos reslove conflict 2014-09-04 17:40:14 +08:00
yangxiao ed63f01c7e seperate billboard test from Sprite3D test 2014-09-04 16:27:18 +08:00
minggo 43e2b39bc0 Merge pull request #7921 from dabingnn/v3_trianglesCommand 
V3 triangles command
 2014-09-04 13:58:50 +08:00