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 |
minggo
|
16ad1977b0
|
Merge pull request #8706 from SunLightJuly/add_ClippingRectangleNode
Add clipping rectangle node
|
2014-10-15 15:09:29 +08:00 |
SunLightJuly
|
f2286eaf94
|
added ClippingRectangleNode
|
2014-10-15 13:38:14 +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 |
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 |